4794 files changed, 38103 insertions, 59694 deletions

diff --git a/Manifest b/Manifest
index 8cff5104bc10..02bea165eba7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28821 BLAKE2B 9f106b93618280d2eff43324dd47b553972f3bd984d756b9b56b84b426e0ef0d62d577a2b7d08aa920ce1656cb8ad1c0e7699c21110951730b4df4889398f07a SHA512 abb5d1f98c6999488f5f77ef7e40771e03bc2440f3f3be6086eb3a1cf72033cdde1383cb19ba1519e0cc0b01c2a9810f2c72994afe5755817bcd147174dc4dfb
-TIMESTAMP 2018-01-21T18:08:29Z
+MANIFEST Manifest.files.gz 28817 BLAKE2B 74f7fb0ac4f05cd6153e6104aaaad327988fdb3b0d87e9ab531cccb4b806ac1bab5ecd599cd31c1c1b61cfc372f39db9a6d3cdb13db48e0677fb42ad58e41234 SHA512 bb06dc9a18ca8ec14c0b33100fd18ba385c5c0eeefe7869b9c2423b597e14aa89800aa5ef501972a82e33d703d75840d2f955d192e7e7b3c133c4da0fa929c5d
+TIMESTAMP 2018-01-26T14:38:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpk1x1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBg1g//VtCZHgQJhZsZEpfAPqS64K3VFxfeYDeXkGFWFps0iDgdLC09zNtVayMy
-d3XZfTOCSdUOp1oNXIOyAG1SL5VnozWtRTjBE5tQz8G+cN5tTlNbtWhA5b/o49Wx
-/wmeRXlHfWcr4L06BfIvpie8p3P3J64BYArSIXVgo+ANF2WAg+zDM/H9Kx+IkvQX
-WS2BbaR1tx8t+AdBTJ3skyt6qGePYLjUGblDu6GxEjrrSZSwZNPCneTvz2c27TM0
-yfkjtlO/YOjRc8/sMFK7bbGxIbrlC0JUpYCRLkYyGKm2tt2cAB4VYSSk/P0lyrDU
-gKF9bSG0g6fPA/C1TiXH8oO7yJDRWvzn3X8vCcSREhdCR0bPB49GUxCOm/MdvKfQ
-u27RtVSa9JN1kvkBSKcVb4U7LiE2kzilbc+l059Rx+f9mSL6ckT+QRLpaoMNsxfw
-hRHh9Xpl9YfE0CsDHr0JcBOr5icLBxFjxKXWdECTE2zUObhE4XJ1lY5MGFbVO6+i
-8YPaxQVOCNeZePqLzvV7qQ1WO+z+5lKdBJNi0rLmgNNZuYNJMLP1tLTUppVqphkS
-1j4WAzxK2s6rNDUsprTy6g8mytwfU0ngJuLF7fFGtHqK4JOvhdjnEQawvC3tmjFE
-hqrgG8Lp28by2/ozf7orDOVJzuzMDKzxP/5TqmX0q8eK60zLIQ4=
-=7DbQ
+klDCjQ//UCoJCl4laSwcz0SNJ+4GZWS43u/WxtXvAB+ce8c/eYMRVdNEd3vGsDIj
+jE7v7i3fU1nOxbndCRT2dI8sJKF/T5Vi/WbbS75jl3wDo8GdsBNh1cHgTPM0UdRu
+nCoCydLHiNkBPyLMmnhL736CknYc8AUErfRcITIcnavuawMkcxYmvMuzOLTNrgph
+5aRsOXV+798ZpX9HQhsWcgEyO4q3PMIxPjJPu6nYV7QiCqkSHXJs56Mhekut+i0I
+9zMZw/QL3yfprn3lRKKWC6uf2rkEyBs/ULjOdc478+dzwD4OvMSsDLj08pvmua0C
+Zp0UhXhULLW2ZSFoKc6xBd+HM+LoaKJC3Pvu0AD+MkD9HR8D2yi4YHD8l9GZMFHq
+GH1O5s30Ir14idplMPT84YELXY4qTZiW7gXC3A3QvGp39HrD2NkhX6rF6LiR//EP
+8Gz2bXMviYKg5jCjzZ0XvSRHZvpp8YES9czi8cIBNEtRoq2ITXOZtA90y+ERR4pO
+/6vizBKSRSy5t1yjBrcP80qiFd+1zO3CNXMXgH7jKvl7hx1aoVovck/AKfIo/plJ
+0tyjsjmzIPSRTMHYI1NcBRjDRSr6tv5u/zLEYqV1ktOxkG9yI23gH1ME4f9zpyWK
+mQazJJu3ACf2TmSKCvfinnTApiU7Jp7zxBSU+itjpBRXLJKuXNw=
+=bhYp
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 710da3f25da6..515e546eda1c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 48718166f65f..79175d05f91f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index e4e158e29009..712af27d2118 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,8 +4,8 @@ DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b93
 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
 DIST httpd-2.4.28.tar.bz2 6553163 BLAKE2B 27ccb0bda7fae6977a7e44ec220fc6ad8c027bbe14449bb5b7a560a4707c71da7cfd09923b66da9ead1d424c5062cc4a168cb53c6088ac4ff378d1b3617b3186 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a
 DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
-EBUILD apache-tools-2.2.34.ebuild 1989 BLAKE2B ddee9c85cbcd7cc4ed6daf9b9187712bad1ae09f2216885da535897b4f61c8b332057135de2e7c19d0a4049d575df7ce4c6b7eaf59433a9cea4eade649c8b71a SHA512 1041e7e11bb9fab007fc2e013d23b35732be287e67513fcbbb318988b224260993654e272d4ec9d76075e1dd449140c28a28c0009a49407fe880e33114743dc7
-EBUILD apache-tools-2.4.27.ebuild 2665 BLAKE2B f6e1974fbc2cb4d19ab550480b8d17c4567ae8f0c24246f5f9dc1d8d8c4f8fedda5e1b1c6ac8aff2953f0a7c36b96f8126d3a369f76ec15e27e9d7fcf4b28148 SHA512 a6fb3773dddad5cc2f9ef78dd84b716c18194a77b25c4f096d7b3fbb8feac40d6c48ab1dabad7fdf065e4a25624a6ea9d8e2c092b05a711e8a1b980503863435
-EBUILD apache-tools-2.4.28.ebuild 2674 BLAKE2B 4072269477ac6ff14821a210f7e2d5dda730aa097b0c91499f3459bd83b07fab4b9d57b21659b2a611bac0a35d0cde8ed1212c10a3762404046e543a62a56609 SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f
-EBUILD apache-tools-2.4.29.ebuild 2674 BLAKE2B 4072269477ac6ff14821a210f7e2d5dda730aa097b0c91499f3459bd83b07fab4b9d57b21659b2a611bac0a35d0cde8ed1212c10a3762404046e543a62a56609 SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f
+EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
+EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
+EBUILD apache-tools-2.4.28.ebuild 2662 BLAKE2B 3325d9c0db98729d7c4d40b36ea9ecd7f15c62e0a311dc669b568b446df138766b68bbd0de0b1e76244d8f756556b4e4044c80312f6c06ae8ac5f35c66d559c5 SHA512 a23613fc1a875850df29a905f5b9f21e34ce34101779fc1e40883d1ba3c9825b9a4f60b21219fc1d330d397081cb3fccd03f14a39d6e1dd50cba907854eaa5a0
+EBUILD apache-tools-2.4.29.ebuild 2662 BLAKE2B 3325d9c0db98729d7c4d40b36ea9ecd7f15c62e0a311dc669b568b446df138766b68bbd0de0b1e76244d8f756556b4e4044c80312f6c06ae8ac5f35c66d559c5 SHA512 a23613fc1a875850df29a905f5b9f21e34ce34101779fc1e40883d1ba3c9825b9a4f60b21219fc1d330d397081cb3fccd03f14a39d6e1dd50cba907854eaa5a0
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
index 2b4760c96f25..e7272e344834 100644
--- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.34.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="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.27.ebuild b/app-admin/apache-tools/apache-tools-2.4.27.ebuild
index d1a471c0e14a..706e3a0d036d 100644
--- a/app-admin/apache-tools/apache-tools-2.4.27.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.27.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="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+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 ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.28.ebuild b/app-admin/apache-tools/apache-tools-2.4.28.ebuild
index efe38de48918..0100117927c1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.28.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.28.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="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+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 ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
index efe38de48918..0100117927c1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.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="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+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 ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5fc9b71d5844..2904b3799a52 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc SHA512 5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
-DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
+DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87 SHA512 10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
 EBUILD calamares-3.1.11.ebuild 1978 BLAKE2B ff0120d844b300801e503d463726c225971e004c4b21a2c034b6075de79867ec49e2378f0c69e7586952628ef9150f20091f50b7be405189d6cb599100084c98 SHA512 41985191e83e6450fdae964e382449facbe1c331b82a723ed15165f1cd483912f2afcc331ea52eb5d58bcd8a65eb52292ddce8baecb3fd740740abce4026193d
-EBUILD calamares-3.1.7.ebuild 1978 BLAKE2B ff0120d844b300801e503d463726c225971e004c4b21a2c034b6075de79867ec49e2378f0c69e7586952628ef9150f20091f50b7be405189d6cb599100084c98 SHA512 41985191e83e6450fdae964e382449facbe1c331b82a723ed15165f1cd483912f2afcc331ea52eb5d58bcd8a65eb52292ddce8baecb3fd740740abce4026193d
+EBUILD calamares-3.1.12.ebuild 1978 BLAKE2B ff0120d844b300801e503d463726c225971e004c4b21a2c034b6075de79867ec49e2378f0c69e7586952628ef9150f20091f50b7be405189d6cb599100084c98 SHA512 41985191e83e6450fdae964e382449facbe1c331b82a723ed15165f1cd483912f2afcc331ea52eb5d58bcd8a65eb52292ddce8baecb3fd740740abce4026193d
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.7.ebuild b/app-admin/calamares/calamares-3.1.12.ebuild
index 80d1eb1af83d..80d1eb1af83d 100644
--- a/app-admin/calamares/calamares-3.1.7.ebuild
+++ b/app-admin/calamares/calamares-3.1.12.ebuild
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 74995367d4d1..45d710ae7a33 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,14 +1,19 @@
 AUX collectd-5.6.0-gentoo.patch 4294 BLAKE2B 99274b5a2734910a35ab6a0003d6fe257e239fc0a3b1f3ca398c82b0e28b9365729980999af0db417b3818c7b4de47f48c0118eea88a43f8de162ae40eeb68be SHA512 088f65e2d90c29092621693847f165be7024caa2237a2129dbffcedba3c1f93baa8169de9d3c2979c709219ec12ee0d3b6dd36586ede92062d1a14a28b8611c8
 AUX collectd-5.6.2-CVE-2017-7401.patch 1823 BLAKE2B b723cbe76f0e5b3a6671f9bc385cf1b122dfe919c8ebbf24b82eba0d5b0d49eaac294c0ec5d5961757d688e00e6812c131dc5c051888f2e058970e7f05e7d1f4 SHA512 731fc3d8af2459425ff779325cf1dc9f633521ed539932cb8b254fc49cb5ab2ccae4350d197e479a333658cfc405f4dfcc0a7289bdb9f93e2341c64ee0c772e4
 AUX collectd-5.6.2-issue2303.patch 1349 BLAKE2B ab96687595437f1d6644cba941c2d67ed2ed2ce73dd5f8f2910b33ec4dd7c7a82137317442802a1f05d1577b301d7cf72f33f9c1edf616f19009876012f274e0 SHA512 6d46020d2fad43e1e624c7058d5ea5962bdf647bcd8f4c282ea83a0c57d026408be5efea8190c301fc45e134cb6e52ba02c88c02a693204dc3a917a750813965
+AUX collectd-5.7.2-CVE-2017-16820.patch 1326 BLAKE2B 0dbd15e6c52531423b47d25b0fab0319c867482fbcd7f9e5a59c9ae6908ce1844f9ed41590a048ff247acf2bfdb8ddd34723dd289074269fb8bd7133ae324d40 SHA512 13e7ad198c88538a8bdcdd1d0ee8ed3ebe7b8ac00df98341a1248a4e5fd02b44b24d239c6c3ac70fce6492674163371755f126e2f4a0099159032514a842ea0b
 AUX collectd-5.7.2-issue-2443.patch 4628 BLAKE2B 357f4171c4cc5e13e43da0709bcecff8d9c7d529c1c2c910e14ec2502ea4abd3df2e1be591b2d98b06d6dd5f984e9dd5615f7cd7e14cad79d49adc6f369cf37b SHA512 16c7bc99a6401c96fb3b2cda5ad6e540024ae13d66268b4d5ada4c65c456a5dbd210ea58d116463381dbac953f9f8d4907d2185a24195a304e0f5a645829755e
 AUX collectd.confd-r1 1742 BLAKE2B fd6b1909bdfae7ee8c63d8c6659651af8318313800a60bdff932202616b8455e7b6459119b590f498dd0720229670ba0fbd2ae0a1f99a5eae6e1a8fc975fb8d1 SHA512 31fc083a5c3a1e16246fc767c24d23d4b4763621ad2b2464f6d333fb3e327150caaf26905ab1c7aae5f6ec503882fc823e05fb272e2941af903f2b5b71aa788d
+AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
 AUX collectd.initd-r1 2118 BLAKE2B 1824662e55640e09cfeddd982bcc048e17815570af3a603f815195a8515e4e0887fb9e3c9df311e6998badf3b368faf6aeda33b386f9b0f9ba294f94d7fa1162 SHA512 556b0255e5d7ab93e934693431c02ef96d7a3a8df5ec6eb0c1e946f54eac822a1fbdf2a1784c617634cf60c2348681dc639b8c80cab041517a4ac39f18f6ae98
+AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
+AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.6.2.tar.bz2 1806969 BLAKE2B 2311b6cc51297264e1bfc705553c728ad2ae3355ce8b5fb25b8ac91aaef4b78921235c675ff26535e3388c1b1af37aec4d810b2e6c6b60fcc3d79e0149841989 SHA512 81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61
 DIST collectd-5.7.1.tar.bz2 1797725 BLAKE2B 5a24d74ff26ed8745d3b50d3b22db0a939aedc6048ff279880f892572d5e5799b1e3b4630250ebb9066325b2583f99b441a42d0bd0ab4a3c20b1aba82b9d16f2 SHA512 f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164
 DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
 EBUILD collectd-5.6.2-r4.ebuild 19013 BLAKE2B 01d5c6d9c6258f7956d115e562e8166c3efbe59e4e99a19ed4ee58c4751c1e0c0f896bbd6a0e3a65f562ed404446ebbafef4d728ca0116e4a90896062090b423 SHA512 b5f7790378a0c78c1c7bb052f52d8736fe52b4f7046083a55df33b4139f78b67110a4ca63391f8d5748a8d3085ac24dc141fa47c17b88b3e7431e33b1250e7f1
 EBUILD collectd-5.7.1.ebuild 19243 BLAKE2B 419ca67a4e4ad7526305101feeacd723a11b4ec0807f81e23aa9f0fcb44375798a4e400b5e4c1b5a361a4fdb6b418073069957675dbc0f0f47b1f0d5af366018 SHA512 608a21594c5d608be74f3ab55e206c0ead06e3ae8444bee34e6131a981959de9d01a41ca5ce3664986513873f872da02ce58546d593e52ff44da3275bd98bbba
+EBUILD collectd-5.7.2-r1.ebuild 19331 BLAKE2B a057460c4ad4de502693e5ed405ecfaa4a640f4c15e3c5cd07115768521d9f8637187b2981d6657f3bef3178f8f752ea8117b60fe39bad4102b5f37fe5069c34 SHA512 d138224a5aedeefd98c2b42108902077be8c135e2837b647526ff07f0e6e275c0ede02e493d2582f1bc00638baf74a8b28fd03d17ae5eb76e6890a3c833bf626
 EBUILD collectd-5.7.2.ebuild 19197 BLAKE2B 2696638e0bc1b82d5522040ec654cf720acaa16b947d3248d6b9c5f7eeba61840103e6757271ef561ad3c4cb0d353b0d34b0ddf4be18c97b8dc7e2d8542a51e0 SHA512 810a8f73af91f7cd03caedc361eb421c912bc6ca1386c87527d9e20b8bfba7f25e0064fb5fec52ee00dff264f0756d64a7cc2aa78569ebecca427512f40c5075
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild b/app-admin/collectd/collectd-5.7.2-r1.ebuild
new file mode 100644
index 000000000000..57b4bf62aef5
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -0,0 +1,541 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero:       Requires aerotools-ng/libaquaero5
+# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkstat:      Requires dpdk
+# grpc:          Requires libgrpc
+# intel_rdt      Requires libpqos from intel-cmt-cat project
+# lpar:          Requires libperfstat (AIX only)
+# mic:           Requires Intel Many Integrated Core Architecture API
+#                (part of Intel's  Xeon Phi software)
+# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf:            Requires BSD packet filter
+# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
+# tape:          Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms:          Requires libxmms (v1)
+# zone:          Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
+	intel_rdt lpar mic netapp pf pinba tape write_mongodb
+	write_riemann xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+	csv curl curl_json curl_xml dbi df disk dns drbd email
+	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+	hugepages interface ipc ipmi iptables ipvs irq java lua
+	load logfile log_logstash lvm madwifi match_empty_counter
+	match_hashed match_regex match_timediff match_value mbmon md
+	memcachec memcached memory modbus mqtt multimeter mysql netlink
+	network network nfs nginx notify_desktop notify_email notify_nagios
+	ntpd numa nut olsrd onewire openldap openvpn oracle perl ping
+	postgresql powerdns processes protocols python python redis
+	routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd
+	swap syslog table tail tail_csv target_notification target_replace
+	target_scale target_set tcpconns teamspeak2 ted thermal threshold
+	tokyotyrant turbostat unixsock uptime users uuid varnish virt
+	vmem vserver wireless write_graphite write_http write_kafka
+	write_log write_prometheus write_redis write_sensu write_tsdb
+	xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libltdl:0=
+	perl?					( dev-lang/perl:=[ithreads] )
+	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
+	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
+	collectd_plugins_apache?		( net-misc/curl:0= )
+	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_curl?			( net-misc/curl:0= )
+	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
+	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
+	collectd_plugins_lua?			( dev-lang/lua:0= )
+	collectd_plugins_lvm?			( sys-fs/lvm2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_modbus?		( dev-libs/libmodbus )
+	collectd_plugins_mqtt?			( app-misc/mosquitto )
+	collectd_plugins_mysql?			( >=virtual/mysql-5.0 )
+	collectd_plugins_netlink?		( net-libs/libmnl )
+	collectd_plugins_nginx?			( net-misc/curl:0= )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
+	collectd_plugins_notify_email?		( net-libs/libesmtp )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
+	collectd_plugins_openldap?		( net-nds/openldap )
+	collectd_plugins_onewire?		( >=sys-fs/owfs-3.1:= )
+	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
+	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
+	collectd_plugins_ping?			( net-libs/liboping )
+	collectd_plugins_postgresql?		( dev-db/postgresql:= )
+	collectd_plugins_python?		( ${PYTHON_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
+	collectd_plugins_smart?			( dev-libs/libatasmart )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
+	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
+	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+	collectd_plugins_write_prometheus?	( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
+	collectd_plugins_write_redis?		( dev-libs/hiredis:= )
+	collectd_plugins_xencpu?		( app-emulation/xen-tools:= )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
+		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
+		collectd_plugins_load?		( sys-libs/libstatgrab:= )
+		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
+		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
+		collectd_plugins_users?		( sys-libs/libstatgrab:= )
+	)"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )
+	!<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
+	collectd_plugins_smart?			( udev )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+	"${FILESDIR}"/${PN}-5.7.2-issue-2443.patch
+	"${FILESDIR}"/${PN}-5.7.2-CVE-2017-16820.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then
+					return 0;
+				fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	if ! linux_chkconfig_present PROC_FS; then
+		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+	fi
+
+	if ! linux_chkconfig_present SYSFS; then
+		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+	fi
+
+	# battery.c: /proc/pmu/battery_%i
+	# battery.c: /proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c: /sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# drbd.c: /proc/drbd
+	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+	# conntrack.c: /proc/sys/net/netfilter/*
+	collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+	# fscache.c: /proc/fs/fscache/stats
+	collectd_plugin_kernel_linux fscache FSCACHE warn
+
+	# nfs.c: /proc/net/rpc/nfs
+	# nfs.c: /proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c: /proc/tty/driver/serial
+	# serial.c: /proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c: /proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c: /proc/acpi/thermal_zone
+	# thermal.c: /sys/class/thermal
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# turbostat.c: /dev/cpu/%d/msr
+	collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+	# vmem.c: /proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# vserver.c: /proc/virtual
+	collectd_plugin_kernel_linux vserver VSERVER warn
+
+	# uuid.c: /sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c: /proc/net/wireless
+	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	if use collectd_plugins_java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	use collectd_plugins_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	default
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	# fix installdirs for perl, bug 444360
+	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+	# Adjust upstream's systemd unit
+	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+	#   - Add User=collectd to run collectd as user "collectd" per default
+	sed -i \
+		-e '/^EnvironmentFile=.*/d' \
+		-e '/^\[Service\]/aUser=collectd' \
+		contrib/systemd.${PN}.service || die
+
+	if use collectd_plugins_java; then
+		# Set javac -source and -target flags according to (R)DEPEND.
+		sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+	fi
+
+	ebegin "Removing bundled libltdl"
+	rm -rf libltdl || die
+	eend 0
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk
+		drbd entropy ethstat hugepages interface iptables
+		ipvs irq ipc load memory md netlink nfs numa processes
+		serial swap tcpconns thermal turbostat users vmem wireless
+		zfc_arc"
+
+	local need_libstatgrab=0
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	local myconf="--disable-werror"
+
+	# Do we debug?
+	myconf+=" $(use_enable debug)"
+
+	# udev support?
+	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+	if use udev; then
+		myconf+=" --with-libudev"
+	else
+		myconf+=" --without-libudev"
+	fi
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	if [ "${need_libstatgrab}" -eq 1 ]; then
+		myconf+=" --with-libstatgrab"
+	else
+		myconf+=" --without-libstatgrab"
+	fi
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Python
+	if use collectd_plugins_python; then
+		myconf+=" --with-libpython=yes"
+		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+	else
+		myconf+=" --with-libpython=no"
+	fi
+
+	# XFS support
+	myconf+=" $(use_enable xfs)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+		$(use_enable static-libs static) \
+		--localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	perl_delete_localpod
+
+	find "${ED}"usr/ -name "*.la" -delete || die
+
+	if use collectd_plugins_java; then
+		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+	fi
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog README
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	if use filecaps; then
+		local caps=()
+		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
+		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
+		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
+		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+		if use collectd_plugins_dns || use collectd_plugins_ping; then
+			caps+=('CAP_NET_RAW')
+		fi
+
+		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+			caps+=('CAP_SYS_RAWIO')
+		fi
+
+		if [ ${#caps[@]} -gt 0 ]; then
+			local caps_str=$(IFS=","; echo "${caps[*]}")
+			fcaps ${caps_str} usr/sbin/collectd
+			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+			elog "  ${caps_str}+EP"
+			elog
+
+			local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+			if [[ -e "${systemd_unit}" ]]; then
+				caps_str="${caps[*]}"
+				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+				elog "CapabilityBoundingSet in '${systemd_unit}'"
+				elog "updated to match capabilities set above."
+				elog
+			fi
+		fi
+	fi
+
+	elog "Note: Collectd is only the collector."
+	elog "      You need to install 'data' sources (applications) locally or"
+	elog "      remotely on your own."
+
+	elog
+	elog "Collectd is configured to run as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+
+	if use collectd_plugins_smart; then
+		elog ""
+		elog "If you are using smart plugin and don't run collectd as root make sure"
+		elog "that the collectd user is allowed to access the disk you want to monitor"
+		elog "(can be done via udev rule for example) and that collectd has the required"
+		elog "capabilities set (which is the default when package was emerged with"
+		elog "'filecaps' USE flag set)."
+	fi
+
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch b/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
new file mode 100644
index 000000000000..0090f2940bf6
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
@@ -0,0 +1,39 @@
+CVE-2017-16820: Fix double free of request PDU
+
+https://github.com/collectd/collectd/commit/d16c24542b2f96a194d43a73c2e5778822b9cb47
+
+--- a/src/snmp.c
++++ b/src/snmp.c
+@@ -1357,11 +1357,13 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
+     if (oid_list_todo_num == 0) {
+       /* The request is still empty - so we are finished */
+       DEBUG("snmp plugin: all variables have left their subtree");
++      snmp_free_pdu(req);
+       status = 0;
+       break;
+     }
+ 
+     res = NULL;
++    /* snmp_sess_synch_response always frees our req PDU */
+     status = snmp_sess_synch_response(host->sess_handle, req, &res);
+     if ((status != STAT_SUCCESS) || (res == NULL)) {
+       char *errstr = NULL;
+@@ -1376,8 +1378,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
+         snmp_free_pdu(res);
+       res = NULL;
+ 
+-      /* snmp_synch_response already freed our PDU */
+-      req = NULL;
+       sfree(errstr);
+       csnmp_host_close_session(host);
+ 
+@@ -1492,9 +1492,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
+     snmp_free_pdu(res);
+   res = NULL;
+ 
+-  if (req != NULL)
+-    snmp_free_pdu(req);
+-  req = NULL;
+ 
+   if (status == 0)
+     csnmp_dispatch_table(host, data, instance_list_head, value_list_head);
diff --git a/app-admin/collectd/files/collectd.confd-r2 b/app-admin/collectd/files/collectd.confd-r2
new file mode 100644
index 000000000000..835936d5bce2
--- /dev/null
+++ b/app-admin/collectd/files/collectd.confd-r2
@@ -0,0 +1,49 @@
+# Distributed under the terms of the GNU General Public License v2
+
+# Nice value used to launch collectd, to change priority of the process. As
+# you usually we want to run it in background, a default of 5 is used.
+#
+#COLLECTD_NICELEVEL=5
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#COLLECTD_CONFIGFILE="/etc/collectd.conf"
+
+# File used to store the PID file. Usually you won't need to touch it.
+# If you are going to change PID file location make sure that *only*
+# root is allowed to write into that directory.
+#
+#COLLECTD_PIDFILE="/run/collectd.pid"
+
+# User to run collectd as (default is collectd, change to root or give
+# collectd user appropriate privileges if you use one of the plugins that
+# require it, as e.g. ping or iptables plugins)
+#
+#COLLECTD_USER="collectd"
+
+# The default collectd UNIX socket location in /run/collectd is now
+# maintained via tmpfiles service. Therefore, the COLLECTD_GROUP setting
+# isn't used anymore.
+# If you are going to change UNIX socket location or change COLLECTD_USER
+# setting above, make sure you overwrite /usr/lib/tmpfiles.d/collectd.conf
+# via copy in /etc/tmpfiles.d/collectd.conf to match your setup.
+#COLLECTD_GROUP="collectd"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#COLLECTD_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#COLLECTD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# Options to collectd
+# See collectd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+#COLLECTD_OPTS=""
diff --git a/app-admin/collectd/files/collectd.initd-r2 b/app-admin/collectd/files/collectd.initd-r2
new file mode 100644
index 000000000000..0a4ca71494f6
--- /dev/null
+++ b/app-admin/collectd/files/collectd.initd-r2
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+COLLECTD_CONFIGFILE=${COLLECTD_CONFIGFILE:-"/etc/collectd.conf"}
+COLLECTD_PIDFILE=${COLLECTD_PIDFILE:-"/run/collectd.pid"}
+COLLECTD_NICELEVEL=${COLLECTD_NICELEVEL:-5}
+COLLECTD_USER=${COLLECTD_USER:-"collectd"}
+COLLECTD_GROUP=${COLLECTD_GROUP:-"collectd"}
+COLLECTD_SSDARGS=${COLLECTD_SSDARGS:-"--wait 1000"}
+COLLECTD_TERMTIMEOUT=${COLLECTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+COLLECTD_OPTS=${COLLECTD_OPTS:-""}
+
+command="/usr/sbin/collectd"
+command_args="${COLLECTD_OPTS} -C \"${COLLECTD_CONFIGFILE}\" -f"
+command_background=true
+command_user="${COLLECTD_USER}"
+start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL}"
+pidfile="${COLLECTD_PIDFILE}"
+retry="${COLLECTD_TERMTIMEOUT}"
+
+extra_commands="configtest"
+description_configtest="Run collectd's internal config check."
+
+required_files="\"${COLLECTD_CONFIGFILE}\""
+
+depend() {
+	use dns
+}
+
+_checkconfig() {
+	if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then
+		if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
+			. /etc/env.d/50oracle-instantclient-basic
+			export ORACLE_HOME
+			export TNS_ADMIN
+		else
+			ewarn "Unable to set Oracle environment, Oracle plugin wont work"
+		fi
+	fi
+
+	local test_command="${command} -t -C \"${COLLECTD_CONFIGFILE}\""
+
+	eval ${test_command} 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your configuration:"
+		eval ${test_command}
+	fi
+
+	return $ret
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	_checkconfig
+	eend $?
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
diff --git a/app-admin/collectd/files/collectd.tmpfile b/app-admin/collectd/files/collectd.tmpfile
new file mode 100644
index 000000000000..4524a56ec183
--- /dev/null
+++ b/app-admin/collectd/files/collectd.tmpfile
@@ -0,0 +1 @@
+d /run/collectd 0770 collectd collectd
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 8b4085547e93..5a5444a11d48 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,10 +1,8 @@
-DIST eselect-1.4.10.tar.xz 177212 BLAKE2B 25f548d56ecfdc5ccf18167ebdeb50cccc77fbdc65ab8683e293242de0083e6036714ae9d173f507da0404dbad0e48f2ac09d542dbdf92d8a5d7e9868b31fa07 SHA512 09e4196959cfb42e0fe4536939ad8e0d1a49d500e3d42634cd959c544f2ed5beaa006100fffaf10eaba121901d36a42721da42504d496de8d157690b7ab7f9fb
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
+DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
-DIST eselect-1.4.9.tar.xz 176776 BLAKE2B 0e30f1d55470c49ee9c93da294cc66dbfb5638a3aa0677665936a5eb6f1d253c38736b4037c8676da526a01c75dec86f09fe37cebae954d41f2ae9b6955a088d SHA512 88e9d81086596849ef6daf87da3f782886286b1b829d0d6378c3c3c7d9f044a2eb2dc4e1596c2f49eb2ee4e443eebaab3be4bdb223a36bb5f7b66ac0686e2640
-EBUILD eselect-1.4.10.ebuild 1659 BLAKE2B 08caf31182bf2c672d82031328e3068f30465a68a5f2fa1883cac6b744b1c8be69f27d35ba70b528798482f699680c1e922d9706e6b372fc11793d9118578aed SHA512 1e9d9c9b857ca698882210565b9a178cfac83553e1b90a22485ab866891e2eeabda2fe9ef6c6514555db10024ca30bd665d0f0c9c38908fa3f1fec8812b4ac70
-EBUILD eselect-1.4.11.ebuild 1652 BLAKE2B 27cb05b182937931a4bbb942f24f5f795f17e515439c5032e01f707cf4bf3f99706a068092c328099424d5c7f21aa2c2c81202a9a330a4a868daea7f474f4fc6 SHA512 9fe5bded673bfbc1b5cb243630e79b60eb5c626880fe492f3afe610bba0fe5a9946e7e10b1251446e24be35b5bc37afa22bfe9dc8934d08130c11501dddbd67c
-EBUILD eselect-1.4.8.ebuild 1653 BLAKE2B e8b465b071afd54478dad7b15672289deba1c5aebb34a01c065d35557149e9a840dac359d87922c1afc9bf136989aa7739a4fe34059a295b119b0199cade51ba SHA512 2511797662024b62a8fbb3286f7671785e09a29a2efd79a0631f1d46574ab03d71b9bf58328985e0043d04cfedc349af35a2695cdcc3b2848f9bfaec0e39b0b3
-EBUILD eselect-1.4.9.ebuild 1666 BLAKE2B 50d5f7993886cc9321667996626b1a9f63ab0aab3183a5a931efd230ed85763cdea503eeea3234aeabcc8e2d0b93f8f24cf1e0ba175c88ee5c978c6b2c873b3f SHA512 37ff35a9765872c8d96fa2129f1e7632106d40d6439dc85da2cd612fba4d198f47c4911ec1096a5ae199f0ef2315c4eb38fa9be04760e6469b975587060b66c7
+EBUILD eselect-1.4.11.ebuild 1640 BLAKE2B 9428490db13290dfd4740570469b012e1b5af18e30f4f677eab3e158aa1161b6e480dacd7301a8e8c7ddcfce7fb75427c5b85a8469d267c2687804ca50f83876 SHA512 5815a229db38d199abf072ce1933c1d8e30dd9774fe940d4249b47271c01e182f5a77b3334420e898e01c3ce434ad5981aa347d78fed2cbb55f1866eb16f689b
+EBUILD eselect-1.4.12.ebuild 1647 BLAKE2B d8dece0d1f857c5282ce3cbe97239881fbfd7762a0903e1bed9b2dae72cb9c5c7f06cb9cd84cd6b6b0ce337649759605dfb90db12fb83c9031b5968ceb3a8173 SHA512 2f39fe3845cee90e304591ade02b935118be3840fa07f1913741e28914fc0f99b7e41d240afe87006c7c8c65440c9759fe22aef0458b856f7beeb05fcd481e53
+EBUILD eselect-1.4.8.ebuild 1641 BLAKE2B 3bef4d6f93da92e36d99ae5fdcae1fb121cdbd41e1fb1b6a1d0c616a04e5919247872d3164867daa2b16f6f18d128fcdca72fbdf51fa81e4df6bb064ae58bac6 SHA512 3b45491ae813cf8cc99c9103392b2c4ab9e84b4f22f3035affac93e8bf08f3b9e130927333c5cb3bc8874ea90d8a089b542013f86c36c68a09b8a03eb0bdc8d6
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.10.ebuild b/app-admin/eselect/eselect-1.4.10.ebuild
deleted file mode 100644
index 9d5ea613a470..000000000000
--- a/app-admin/eselect/eselect-1.4.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.11.ebuild
index 5bb95e8f4cf7..a3d8be1c47b9 100644
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
new file mode 100644
index 000000000000..2403e8dc5a8d
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
index 5b4e177ff175..c3904da9fc27 100644
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ b/app-admin/eselect/eselect-1.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.9.ebuild b/app-admin/eselect/eselect-1.4.9.ebuild
deleted file mode 100644
index 40722df6b35f..000000000000
--- a/app-admin/eselect/eselect-1.4.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index b95ab5dbe3d8..8e0dc68ac21d 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2664 BLAKE2B 5fa822f7f539918bd60d6284e2a474c7ec73d4866e8b44f179b0b8c3a418ec4373c307675b4583d3550116ac5e68749d6d42ce303e2ec744b989d25641c2967a SHA512 56b91a5835716984c15b245690be43c40fbca3218a872060c08923c48132d2eab092c963fe6ca6b7b0439801dbf0936191c22ab0ba1480059f4b616e6a25023a
+EBUILD gam-server-0.1.10-r2.ebuild 2652 BLAKE2B 766c90d107c0133a11d97054713229138e8e1e371da59147342bf1b58b6766e9f780f6ce407c9ddd887f54f859d04332ea25fc754314223b7fd519a2376b733f SHA512 3ab8af16cd39aba455f12216dbae2c40b79e89876a8a3945bbb8b6d237b232375ec5a5379e504495090507607dbe63b671bd94ecc91fba4721402c26d38e6fd3
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 1e702f0edf80..856dcad4185f 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-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="5"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index a04e482ba198..33eab152fba7 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamin-0.1.10-r1.ebuild 627 BLAKE2B 63a80a29d720d3e01505d5afa08d57224a098736ab88c8a5f710de96d1b9d9d4e163888f2d4b211d2e584a15a633cb986a6766c7901096479eeeb067ee4073cf SHA512 067f2d8c924dd8125db5e4ae3fcda1c31b2dcae72cecafc45871e666176d262f73fd107bb45580c6253dd215cc896d32e25aa9c8fcdf86c4fd013a397209a3e9
+EBUILD gamin-0.1.10-r1.ebuild 615 BLAKE2B 68247a3c711fb6c343d02d8c0bed5248a5c1eac05df2458cfa52a8025bf26cc9c5f7c17e887e18aa7554564e845a6a57866a9ee526ec191726bd6755e8540507 SHA512 4103ebc7f6a5a64ac7a1625ac7f468c61f4612ae82a5838a74c243c6abfe6dd761acc3ae7b80992f81c2405a3ecb644be6c218d96593bcd33e61db3a8277c45b
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 3c16ea2b1317..141ea5442b52 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-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
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!app-admin/fam
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index a5bc4fdb567b..506ae7bf7df2 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,13 +1,17 @@
+DIST github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz 20757 BLAKE2B fb024665eb8d49579b9ae67f706e524dfedab3b0f212f18516ba720e5f5d991609fb3a37eb6c960881d4dfeb83a001c8a345de222978222f276232a742a55224 SHA512 a70922a199719936c0d7801a5750bd6893f5e119bd7c592af096d9d82a3f4aab859649126eae60faf70a908e8a28c0cb7b54e8288365276eecf7ce8c6dabdbf4
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
+DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
 DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
+DIST github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.tar.gz 37580 BLAKE2B 8df1660308b0be42e76511842c092caa1222e92698a64875dec24240f8d66515b056af2181c950fd3d05c82645086b2b66afd5a61afed706d69964b52177a72c SHA512 9decb828c62865f09c0efac5eae8a536ad1a7e33aa6389be2af0c58017a20b08714a77b5bdde6e69ae1fa0c21e67d251fd2718d564195be7f058a286e1c6f2c4
 DIST github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz 35366 BLAKE2B ddde73c2c0a6fa6f80ac9a135bae99030b72b94cebe6efa3e42c1a4792f344d31d7d76309004b533c9687d4729a68bb19f3b39d179e2e41d7ad4d55356a9fcab SHA512 daf9dc30aab277192244af9f207b31e772457c5d9600f69b30780b2f267f4f45ee778136d6f8e27b41a47593623a4b21a2af960678e1a8f2ec6aa16cc7060275
 DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz 13236 BLAKE2B 2d3e63d314dce19c07f056fc2691595e0509819c244393964a4f792fc6b0512dc9989cb147aa6c174504034d30548cadddc6f42c0d0001e46153c35f394335c7 SHA512 1276f5284433e748b870215c11422cc632fca84d3d05466374516ecaea135e9595240a93d5b2e2e9bb4846ef3c2523452a876d369f0c7316a3e1a7b2a0370e41
 DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
+DIST github.com-aws-aws-sdk-go-760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz 7332345 BLAKE2B fa457299e8b84b0d9cb616358d9b98f5441dfe5fbacde2cc4e2124e6503c4102c32c8054c0bf0e9e7a02021c19caced79064ca7a695bd20c9d3448b68a5d115b SHA512 7fdd33271c751a912d21c7b55c33d52889fa7230906963fcb697607df43a29bd598e2c045d93a7d3855889d8a5b739177d81866669ac423ae9558ae06b876236
 DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz 812639 BLAKE2B a3cb2d79cdbf31ec9bc965299af47f000bbc984b0d403d2ceb47a5f7d321c11e919945748e644b9259678dcfda283a0188c2c4b5b6591cb3c10e9c9b422336db SHA512 0a9be08cc5ef1662deb3d4df226401b5aaeb3fb2905af3ce2b47f81c4fab22f0bc68a8ea3eb98a5f5b42dabd0c97bf3e96f8516a9c6d730fbf3c90a02cac1aaf
 DIST github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz 3393 BLAKE2B a63a65e8dac54a2220aed0c23024b0c2897c72f172f55c9ba319cd913bfd3f8be87935735e1b42c96f6f7abedde09c84b5eea4adc1fca0b13c018276d52eb04a SHA512 b6e5eb124d073a22e6177b80dfadc835baae69ea88061d761b0ccdbe28f43614d74ce11025fbe8b8d9fd63107606e411b1f6305e8ecc28e9038dcffa3b78e0d3
@@ -25,11 +29,14 @@ DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.ta
 DIST github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz 2994 BLAKE2B 2c684342854093e6fea90287d6cd2e56cd5e180f2e452a9d56a73d0c51df3649bb3c15771b6274a200cd1928424298cd119ea3849f279f3a6094fd84e6a73c18 SHA512 a27f645aaeb46891568f1ea0223fae23d00a46918947446fa9e452fdb0b5d1f20bef543ba0be536f586eccd23e0bb413a33bc74b932cc05c6fcb74aa94ce80e7
 DIST github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz 18976 BLAKE2B bfdcc567253a24f882f5e524ad7516356024f8d0a1f81958161cc9f450438d26f6df8d5db55bf9e9fb62b88a2339e09cbb4b0594fbfa8ded12c4cf3c72034eff SHA512 e2faaf999792a930991cb99b8bea916dda5a4d0ee8503fc597581a1caefd9835e513555844d7d8a7818dd3b17fb532dd2387b9277fd4adda34fa7881f397247a
 DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
+DIST github.com-go-gcfg-gcfg-27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz 27804 BLAKE2B cd233a16f8ee490a65331ec6a4057cb5573cb3f55bc2e24a57e532efe632f5779e5d911a3ac295130f0e08ae58ce7b1011d89c4fef979fdb1f9a3a93bf2bf68c SHA512 e70ebe0daa65220846b74ed1984a82e7449b09122522bc90c67a94efcf921f65558b01698c8578e16b2e25c748ee8e79d688a8fecf803a83523b122528bc0209
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
+DIST github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz 37301 BLAKE2B 64c2452aa01d14ed39ecdd49f631bd9dbe180f3d0b1fafa171189a3258aff2de6d3902c11cb011dff360d0b4780ab17c14ff6de5e3810c654c2c1cf16428b43a SHA512 fb16c6fb95e1fbe20a2c41576bf029d8ac51d93c4f52dbb084f14c8ba431e30df43f3bdd54a8f4586e193ee15732edbb32261b56ced64f86878a0b722eb3c45f
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
 DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
 DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
+DIST github.com-go-warnings-warnings-8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz 3715 BLAKE2B 2b8ca2cac1aafc6ee411e7c56666dc24b4b501dd1829cd1d52e9b7610f50dd97f43c28b616af41aaedc972d5c642eee82c2bac56503866a8108f157b8ad586d4 SHA512 4597d093124952a0e4ce49d02a424f06e35549f715c560c0b72fab6a6ac2e819ac103d39ff83488921a6b052fb75b949ff5d230ae6a36844e3cc4abaffe6f450
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz 25066 BLAKE2B 3560652d11e0048723a132111e168249bec29c10b2102c921763ca3db29d4981c39bca78a2665455e32fac1281baf843ea7308345de5b4ecad1b5553651fa8d0 SHA512 f4df44130776dba33d4b3879be4de1900815eb6320ec588781e180864dbfa827514b36dd74c1a310442c4fe0a0642a91b79b216541ac433efd87747641eced6c
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
@@ -50,12 +57,14 @@ DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961
 DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
+DIST github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz 334844 BLAKE2B 6b1025e0248b427840eace218538e34a21338990436a74f6e7c29da7415ddaa343a262b8f9b87a2f6c82d91d66dc192465a8ab4f283b4427f63e0bc98020df62 SHA512 124bf026d11a15aeb512f94807765e0b8f12815f551eaed14d634e0966122c1b18c0b9a2e06330aa6911ec9d923ae2e9e88ecac94d77874bc2ff850f2708fb0e
 DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz 48285 BLAKE2B 3dd3d6729fef9fa3f5f7aa09fb9114267202a90d5beb44f996406f9a45c02a281d8a1eae3f5125d03ff267b9eee874b6415891fad21bfaf4e3d7e09125d90419 SHA512 e5c1e322b1f9506edcc1f1bb4efc2d3a6fa440abff16fa3557f4ecb3e82b0be1cb9511712d3ece32e7c247c58ea3aa07197bab0ae2e7aef262aa97adf83dc253
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz 1291393 BLAKE2B 184358098449fa3fabc46fba82a48f7037cd769c983acbbf8371437daad6170f0faebc9cee7babc776ecd8c9234c0108f0159360330eda9c186eca23538c3254 SHA512 f61563caa01c1d08c0c49cc3cd26d94aa44d6848c515091153235e92bddbe41b9621637479fe2256a01e722d0ac61f3534ec0b6ab953bde668ccaff4fd9a6781
@@ -63,13 +72,17 @@ DIST github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c8
 DIST github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz 1485046 BLAKE2B 51a95498e0ba00b19e0731604feb001779d2798d73a3c64a7193c07fde01ec71a6a9e4a3605bcd50be33ec55c92be71c15039ac70b0f9cd88a566c908acdb11a SHA512 12f63a76fce8465d2c294e65c2b16a30fc5c2ede65d63e75f3a7b143e6c5acfa2abe673508a9b792b0b5819ae534ae1018edfece1431f573e731e33d5e244807
 DIST github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz 3869160 BLAKE2B 7e3fcafce1ee62a7e95b1c09814a3e5efb7efb20642214e0f2b093e11e797d8ddc312c18f7369b0745d344470cf1fc9d3ce9e582a6998f2df8f139cdad812427 SHA512 8f5cef4f90fa6ef9d64fb3ae21c68f3b7785e758bbc4f85dd2b7f2ec07f281a3df66ac1705f291b834513341f8a2c20ae1601ab65e337f313c156f5c4e9b481d
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
+DIST github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz 84447 BLAKE2B fa2ad0affd97fd0874b9bc4723f522d78c0ede1c6d43ed22ac151aaa3423f3dc180dd5578378bf95f747ef5eb18140414787349ab062c3974f71901c58fc00a2 SHA512 45867a30bc4877b4376d69787c4d20943fe21dfda20d6eefeda729b808668bc37b12e5a7c0869d13bb6b3481b798ef990d66d6b4e733331651d8a4db323c4cb5
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz 23391057 BLAKE2B 1925ef02958542f4da3f95fa1acf0002ca454acee73439d73bcce28f381738fcf69a3cdafe76546815df390096ee76f7e2b532bc7412e7a2c0b0d510f1a40648 SHA512 fd54ae65260e8b62ab203fe41dc1a9ea9982ea1e986ce7c49971769aed0552d1f0baa162946d94207445ab5a5d0a08806663a496dd4fb00da451a86d72519ac5
+DIST github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz 23382404 BLAKE2B f6d6b9a67d90470d8c30a17c60cd24bfa075d36a580a3ab6f985d96f53d08b0971569c33c0c508e542148022ca3be0cf5fdc60707070da6e9b71c8ba3605e8fc SHA512 05f046d3a4ad5844b05b4b579bbdf2448bfac05197c8fb3a47ca19ff91bd5482972e763c32af84f99e66ccbbcb9c9102d4a5968981f9fd183ecc68c718183af7
 DIST github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz 57396 BLAKE2B 31de627b9805d3fe647d2918a839655fd164b45da063fb4d11710b65354d6f2b447d7ac6dae558b12512a15d92494cb4647fe859bea69b4544520452a206ff62 SHA512 f0988a6846a8ce9a003cc8898f0777994c162f678ea5986986163af0db366682d8a98a39029c486535c330f577539be39c34be2fe0c0113c7895fc94a1235eec
 DIST github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz 7540 BLAKE2B 7ce585f807a952e11c316f212b7d348485213f94ebd558fe1b4c228c84d3adfe7273d5ae5393e17408b357a0f37967e806e15bb66c2d8139bb5e33281cc7f1e8 SHA512 cc2eaf7e71b8012635ef6d02b00595d5e7d2a321772699199d61813e3ef1e1ca3c3239de264ab2b719be5a452fb183baf4fd5f87e988a15c51064423d6f2d9b6
+DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
+DIST github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz 2740 BLAKE2B 10127381356aff4d25d3b5da3d2db5f4565c8e5c4e16ffae18e481fcedc0616039cf3907fdb3c204d5f743bb5163bf437d549dea9fd46cc9141d8ef88cb36e21 SHA512 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
 DIST github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz 6142 BLAKE2B 0d210f98f23ebf6f0a4ce27341aa204018d26f2bda017694cb856b6dac2fabe9865369ff80c73bed4801f4cc6c1c2fd7a6567835b80e42ce20a46cff296f6426 SHA512 cef5fa3926a464cfc655345d429644f1082211b003de64e4f2de5809fbee68c4935c2474ad502b56112132149c87a66c9cc353523c526359bf46bdfe0a766fbd
 DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz 18386 BLAKE2B c484694b778f0e71b94628ffebcaff6fec311f033540d2a27202b8e1bc6224b1a48a8670f6f7ecf10bc2f406a9cfed98f0c9565215e4a297786f041e940996d6 SHA512 3061c0372815652836db5245519ec2b0a2f71eac1af7c23a419edfa64063e6f39e91a1aae2ee1ccf1e97a96de620e15684ee660f9039e694c7b9b4ffac27879d
 DIST github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz 136692 BLAKE2B 99eecdd38938c9ca5febb494e1a102ae60fefa9b8074ca9422c7b10295caa09a50f66dd6a02c6c8bfc61513d23144ba660f383684c077caf5791111ec1c9c92d SHA512 cfddcfc6863fc9ee9fe5ea59ed0da8bce7c8299117155e404f135b4ed2f7cec00881b8d70273a865ab84a0bed601f191f328b357b7c50d204016e81ac8c47fb5
@@ -82,10 +95,13 @@ DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.g
 DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz 69591 BLAKE2B af6a9dd3e0a9186bb6f96b73faf03ce69d15083fd664f212cee1aea8288094dd9a3a158da07d4a27a44a0c14f03fab50837f3cb517b0727b77ba8297651805be SHA512 616af6fc95fc5e4825413ec6590fded0cc837af3887cbab814828ffe9a55f27d212f0a67080b867d7051cca2a45266da8f8886360249451fd983cefd340f0023
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
 DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
+DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
 DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
 DIST helm-2.7.2.tar.gz 823059 BLAKE2B 3c4b3270055931e92bdafa29dcb182524e08744b3631bedb384bc34c3fd71dfd3aa60a9754b270d8b69999824166314439e14b53f9659543d69ff30ac7dc8116 SHA512 8ab947faa891102d89f229d79b6e78992b7a37d9bccc2a7c882482dc8143619acb1409d5643717d8d10fbd7e0df9da07a1ee18019bdb6befa4ce189112001b4e
+DIST helm-2.8.0.tar.gz 1124564 BLAKE2B 3d5179047dc15b15dc61221f30d42478a473507b4c43ce00ea695827a9b7a96acd4b6c8bdb1d1e9a54b33a0fba59531e95bbd02cd8bb4e00e6fae67ccabde883 SHA512 408bf32048df094fd5a1cd348f2f10fa2afd043f51f6c4efada2329e4c22e035d8ba82754b03c7b3844639e0508c92c81df9727a86cf73e5c6eea1f0691788cd
 EBUILD helm-2.7.2-r3.ebuild 8508 BLAKE2B 15436e77f2f071806a25300957ab28c3de02f5c7508a10dc2d7adcd441e6341e2340e4873228395fca0f802873f439ef52713bbc4776af3e396739fc9cda7143 SHA512 09d6367a5a9e5a4ef6c58d792569c9df5b456cac38dff5163855136f917fd85d9965fffefb32a445856640e751761d29566255c613aeff05cf95e3dace4fea44
+EBUILD helm-2.8.0.ebuild 8958 BLAKE2B fdbdbfc0c9f7b1f3ebf8787bf10eb930602a7709c05bf7170c5b2c267c2e8087b5969f51b4b32d8d350c8d86b00373f7eb610e8400d2b905a82cab1c04b05697 SHA512 d3cf9b42da67033bb0a831b623c8f6fa0fc9cb1d170dea443f36c6eb07b19ae8891599002c89bd296941fffcfa2b74977ce5a6113523cab6c1477fd0e4300d43
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.8.0.ebuild b/app-admin/helm/helm-2.8.0.ebuild
new file mode 100644
index 000000000000..4636b6823eba
--- /dev/null
+++ b/app-admin/helm/helm-2.8.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/aws/aws-sdk-go 760741802ad40f49ae9fc4a69ef6706d2527d62e"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-ini/ini 300e940a926eb277d3901b20bdfcc54928ad3642"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig b217b9c388de2cacde4354c536e520c52c055563"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/gcfg.v1 27e4946190b4a327b539185f2b5b1f7c84730728 github.com/go-gcfg/gcfg"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/warnings.v0 8a331561fe74dadba6edfc59f3be66c22c3b065d github.com/go-warnings/warnings"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery"
+"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 3a1c9449a956b6026f075fa3134ff92f7d55f812 github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="14af25f1de6832228539259b821949d20069a222"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	./scripts/setup-apimachinery.sh || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 33f223f64bc4..cf8fea10056e 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,22 +1,36 @@
+DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
 DIST github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz 588446 BLAKE2B 0e3acbea72d4e6d14964c53a13eac4ddb4299f86045bc4751498c1e80ee997f3392b3236f1f7fa872ceef73edf0c4e87154d5cc1605d5637ae090979596f1906 SHA512 9c7a1f5d67e0c8da788624a24ec42a9a1504f497840590e50b8fe9204dde5511be00a94645c2e9326dba23a8514adffdc242192abb270021c37e231636bafc71
 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
 DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 64826 BLAKE2B 47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7 SHA512 429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
+DIST github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz 64831 BLAKE2B 23c8a4141bcfb9c4b4e384a9ad372cc0761c006705384eef8a05c5491e62997df13aa19318f500d6dc39ae95e61298d1a9b491b7ea9a6f0ac51d9f28359d2c0f SHA512 3bf310558b53a724f93d228947cb5f1fe152313e90e78559d4b57b9b6db2e668ffe0358dcb74a40159dce9057e4872d905f8490bba4c19cd7a8e0301439df96b
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-sys-b8f5ef32195cae6470b728e8ca677f0dbed1a004.tar.gz 787670 BLAKE2B 87927d110e2aceec2b1745aa8b8d28bf2b38cc6fc679a72b7336e7f59bc07dba90e008228096e3e56798e76056804782893b1902bb508b21149a21346f150263 SHA512 ffbeab6ba7a9ce8ac192c3b1b560e7886ff3248d056e92334bdf180a506cdf8fde52b6446622a3076eded808cd2564774d430f82c62664509da90b7a3d5f9983
+DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761
 DIST github.com-golang-text-3b24cac7bc3a458991ab409aa2a339ac9e0d60d6.tar.gz 5693588 BLAKE2B fe989eaa037c382168f4c580317858fb842a3f12b66868cf2983314146b546088a850dceb9b22a52239468c41988f637196bc0e4d117e8f21a4d0cdd2fecaef1 SHA512 17ac801e5a35b0fd5c8c650846778803da1e25cc970136c943d251a89cfacf611fbcdce0527ca2730c6291891738333b29ec9b5339ecb4a18069ea3c6e44b106
+DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jinzhu-gorm-0a51f6cdc55d1650d9ed3b4c13026cfa9133b01e.tar.gz 80567 BLAKE2B 3ab0a7fa8acde2dac0901cca66ef600f0187febb0a4950695f35b5d9db1675acde303b9d4bc0b89d0dd3ac6032b9e8e39953e4fbcbfc328cdba9f40767595cd2 SHA512 8d86fccddd59ea227fc571e46cd64ac02d80cc261832c4d64dafbee3eed861220be34e14ff73707118f272814469bae047da2a67b435f839a579b84554e720b3
+DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
 DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
 DIST github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b
 DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
+DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
+DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
 DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
+DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea
 DIST github.com-pelletier-go-toml-4e9e0ee19b60b13eb79915933f44d8ed5f268bdd.tar.gz 55245 BLAKE2B 11d696edf77495d1d78968daab59b7fce4b79d4360aa237d27d849d701392e96ebd63f2628d8b05cf05c6866ac30707e9901d474aac67ab37918988de4998b5b SHA512 0cd167d35e7f5c596088211e4b7d33f46338a2bc547086d99945bb52084fb9a20c4ff8f3713cea747efb3bc5a25094c70462efb4b2175be8799e42be25f3e82c
+DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b
 DIST github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz 43475 BLAKE2B 024f8754e4ef6af0a2fd8ce274e82ab46c12ac4b81ebbfd5c93c1c44327ead58bf71242714eebaaca5f2adafed63ebf112ad5b2eae125895514bffe8e21b117c SHA512 900ce0ed04dab86bc7f33a0ec94f2b49a7d91dd1bbca65a6be50bd4575ff1ad5fcbb4f02bb0fb0b7b2d1b2473b3e6512fe5f8c877947c11819a4aa5d763a6d2c
 DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
+DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
 DIST github.com-spf13-cobra-ccaecb155a2177302cb56cae929251a256d0f646.tar.gz 99213 BLAKE2B 0abb03f6409ae50832b41e5c3d16a35df315a99a562c7a95795e0524ef00f5db3537ce1aebf2c6bc9c7ec2a48bc3c5ee7daa522719f30cf99ee18e7b5d8cf1b9 SHA512 94c70d46a11a156406ee17a1607cade576bc27b6cbbaa0e0a061e16a488b166dbe719075e3cb78d24c53140f85472b33e08dfd8000636163884c71306ae85a80
 DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz 32229 BLAKE2B 95b1ed58026f177674a452e531ad445582a8cdafc1e86293918e3b8a8e81f71644b66873c621621655eb87c0cfb67f8e2b089b02bb74bdb30a714b92fdae0cc3 SHA512 004f7cb37ce692cb86b3f793afe5ade9dd478ffdceb23ac8da667c626539503e199f424d6b3183c8907257186eb1a16552ba36979bcdaf363482a6f19cc98d89
+DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST kube-bench-0.0.6.tar.gz 172957 BLAKE2B e6ce4ab094ac38790d802e0df0c9c8c19a2b85d00bbdd6a968d7e680a3b2bc465bcc7f24ff8b68d85043fa82b15cba835e72c6e4da4f43c4d6786a0ad994ed98 SHA512 f1aacd90090c39cf521b73bbdaf4fed4440b2d011b8e1cf40837522e1f696575ef7c03cab9592ad68766e3bed5b4ae890692a4aa25c42e296704ce1a9260ac5a
+DIST kube-bench-0.0.7.tar.gz 174301 BLAKE2B de73c5b6a8160eddd62d88372eb5094b7b252b99c2ecfd81fe2993051b7432ffe752b560d46064bfb9961bf5bde671d7381da905dff5155cac03047c5aa57b75 SHA512 92009356c7b87aa39c61bfefcf0ff5b44754ee930bbdc1a26579057b49c075126b114b72011cf85f5ad904ddaa5b9662c5c860dd8b101d8be0a6026b7a418ce6
 EBUILD kube-bench-0.0.6.ebuild 2155 BLAKE2B 9dca74dd4386464cac48a3a8ea3fa26aefd77d76753ff235b5b0459090734fb4cf9dd3c2bdbc3484783c28a7f92b5d004544f9abb6e0c8c2566551c1f88e50d5 SHA512 620edabb299486cfc99ebfa58c3d514ff5334542a0b5d97f579f24164ddc85377dc8651b4fbb5817a566248fd029ec9a2e7d46c78038f291cd62ddd3227e4fd3
+EBUILD kube-bench-0.0.7.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.7.ebuild b/app-admin/kube-bench/kube-bench-0.0.7.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 51092101d2b0..689636fb2799 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -4,5 +4,5 @@ AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac6
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-3-r2.ebuild 1483 BLAKE2B d5f308a9cc2f07a33e808b289eada00b20f60588f58572e78a5c23e406dc6965a8e86cffb846ccfa0774475051231d27b894d81e996143cc4afa60c65a1a7be1 SHA512 94dc6013f6bfc417353e76005e66e972bd7f837e56a444ed4dd72b0e6a49822659a5e92a22414666e99825071b2056be9c1a04dadb45ca0d6a9dcea55dddb2dd
+EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index 657afdf1224f..a3b3bc3dceb9 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index 5b297da28d4d..12d01b509796 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.1.tar.xz 62340 BLAKE2B 21e25b2b840a123273f65dd030459e2d9ef6da30fbb56157f54be079b05429392cc6149eb2d5557ccbd883295ff8f249348136b3490690d8dc31299a43880a4e SHA512 2ba2ebc80c90454bbab1da3c43c2cfc87135f838f381e2616eef7c36b0c1de01e491cf587a666bb052d6dfd475fa429bc8fd82b0269325bd2b70afbb897b923e
-EBUILD pass-1.7.1.ebuild 2041 BLAKE2B 5a5e2794bdb2f5aaeed129a22fe48ded902a2803788bb761ce0e6f3ec4fc3e1e71d345baeff792a1cd92168ac49ae233342c37537705fcf4231ba6399e246e78 SHA512 d038b93b391e2395eac0834b1589c650f87ce0247c0d69ed84d9508af960e280ab91a16a3836f35d91071f6f10c328fe159ab9e391dd1d64417bd4a817e143bf
+EBUILD pass-1.7.1.ebuild 2046 BLAKE2B a4d64d41ef4b07b84e974ad169fa3c61ad6a1e06fc90433f790f72db00e13dcfabd995d6fa6f407156cefdcfed45ca59648f77b4f0e144ac411fb93004ad113c SHA512 b09afa669bb60136edf781b637b01714af9526665afc4d31b999805f4208863304752ad74a30a6d868433a5632d9c837e9ec3e92606535a0133ba2dc8238ec80
 EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.1.ebuild b/app-admin/pass/pass-1.7.1.ebuild
index 7aef97b57dd3..710fc5a1d86d 100644
--- a/app-admin/pass/pass-1.7.1.ebuild
+++ b/app-admin/pass/pass-1.7.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 ~arm x86 ~x86-macos"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index b9b22d5d60c1..4db6022f3fcc 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,3 +1,5 @@
 DIST passwordsafe-1.02.1_beta.tar.gz 14068085 BLAKE2B 7a1bff0f2db798e08377436020473a8c6c46f9e64fa85629b6545f70954a3ad05735ee101bea021308589d523724f70fce24447837ee25cf1b897a7703873757 SHA512 c83a0c757f9f74906ffaebf650fd3f422a29f838c7f5430b3d3e32852b35dd92dc413a1c920320af9812d7960f0648e8df8a9d145828f8669e824e9972038067
+DIST passwordsafe-1.04_beta.tar.gz 14329263 BLAKE2B 17f4b0cd0b34f8907530a7da43dfbceab56c9aefd65f2d0ba0356b5a1820e8b4273c68655229a07947693fd6d320bc654065f790c86daff31679b565a57145fe SHA512 5f2d0634be3d3932991f77e96b7b40fee3984407ec8620d82caea089bba49df69444cdf8d2cf431aace43636c5034892a672c338ee98df06473d2569953bdab3
 EBUILD passwordsafe-1.02.1_beta.ebuild 2276 BLAKE2B 51d55af680ca670d0747b809b5db84aafc85eab319e6f902dcad0a30962b9289639037739df54154818d91a242e9093752b478e5fa802c97d576430e1c489d0c SHA512 6ac4ec9137b7e246237d12714d1700a0e0d877c8f4d1ff0556349ef8d2fb384a72d270715e80e32ac82e077adc3e520b3e8edabf4bfd9a512970118cf8f38039
-MISC metadata.xml 664 BLAKE2B 3a1f7900f12f0d1262724755129809a67b02e64be1129a411bde6d12d1a522c0c819ec1e9aa5c64594a47210edc8cb8c282f1699ab9fc7881ca3d27aab7d10d0 SHA512 af244a427e45d97e9e6ab5484e6827afb0f9346d69fed5660925e5d3aa4fb2d2cff4383b8bd92cefc8d0a544d288bdea402b4de9311d647d86e7844b91d67b43
+EBUILD passwordsafe-1.04_beta.ebuild 2238 BLAKE2B 8488518028d38ecfabbf6a67c420bbe9454e6214a11743fb0e0739980b457ef7c87f963bf50875f11d8d1871a62efa924efef303f58d3331b90e01a3e7ba63cb SHA512 4c0e09150fe4f24dc49e2955c3bb790f7ab61a4143c3cff9ddc7b9266f48d6b1f0b574bf83ccef84c7c2b9b62d0dd1d582bea82e67965135bb8b0035e80d7ab1
+MISC metadata.xml 778 BLAKE2B 5387ae1a60b8de35a2a845146c8016d8677e2b7381d9f1f2f7eb8c18b794969f2d1448b591885b978c7641a7b9ebf751c660fffe8780fbcd5089111c88918674 SHA512 29e765d326b3c165c0a649da8ba5e6be57a0dfdaa12a5b25ba8bac44c868638a24a6a9c8bbb27638d7f215841548577658e139d9abee0f3c61d1e96c3dffdacf
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index 36988d4359d5..cd092820b048 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -11,10 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
+		<flag name="qr">Enable QR code password display</flag>
 		<flag name="yubikey">Enable support for Yubikey</flag>
 		<flag name="xml">Enable XML import support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">pwsafe/pwsafe</remote-id>
+		<remote-id type="sourceforge">passwordsafe</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
new file mode 100644
index 000000000000..14da0d36f2c9
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit eutils flag-o-matic wxwidgets cmake-utils
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal test qr yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+	qr? ( media-gfx/qrencode )
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	!minimal? ( !!app-misc/pwsafe )
+	yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	sys-devel/gettext
+	test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/pwsafe-${MY_PV}
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
+	# instead. Perform required changes in linking files
+	sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
+	sed -i docs/pwsafe.1 \
+		-e 's/PWSAFE/PASSWORDSAFE/' \
+		-e "s/^.B pwsafe/.B ${PN}/" || die
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	if use minimal; then
+		newbin pwsafe ${PN}
+	else
+		dobin pwsafe
+		dosym pwsafe /usr/bin/${PN}
+	fi
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	# The upstream Makefile builds this .zip file from html source material for
+	# use by the package's internal help system. Must prevent
+	# Portage from applying additional compression.
+	docompress -x /usr/share/doc/${PN}/help
+	insinto /usr/share/doc/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.md README.LINUX.* docs/{ReleaseNotes.txt,ChangeLog.txt}
+
+	insinto /usr/share/pwsafe/xml
+	doins xml/*
+
+	newicon install/graphics/pwsafe.png ${PN}.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 318ef69c35ac..904effa836ee 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -4,10 +4,10 @@ DIST perl-cleaner-2.23.tar.bz2 6495 BLAKE2B 4e0b4dcbe22c0642e753dc999ba3fec4daa4
 DIST perl-cleaner-2.24.tar.bz2 7161 BLAKE2B 41f7b02a7de3f0b5dd1e6c28e9db51df6f4d5e3a36ecb924ffc93d8a3883a2133ece40eb3133faef6e5adf5b26f4cf3638741b586d874a193995e55704f78ed5 SHA512 c6e32aa3123064e9e2fb02823a8b228e3c77720f5c471e9be51f2a4b2765a6c83dcc2ac24fbffae077f4882c70054eb0a3ca0243677a5ac970cb7a64e8b9c265
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.26.tar.bz2 7462 BLAKE2B 3e651503da847275b452d7eedcecc820b9572890d7ef1b3c421ac170a1daf8ae712a9b62f6c9fd4705d973566b59190638f980962f145741f5ae47eefed836f9 SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821
-EBUILD perl-cleaner-2.20.ebuild 1217 BLAKE2B ac482a431a6243da13f2864678cb3180d1e8ddbadf7119629da220d25308c1de18cfd1988521eb2eb724e2ce5963da8e6e6ebb0636a90c382665841c14d9cf06 SHA512 c7498e07c74a7a42a3c9eebb7c6820bb6f5fb6e776aee4d81305f9f0a3df0c12da829061b61fe76119db9236480ca8e91bdfa0b4a15a9042bee4366dd0728935
-EBUILD perl-cleaner-2.23.ebuild 1077 BLAKE2B 0c5aa13688e8b73efacb1b1c9d1b55ad8a956fc928f7b6ea1495b1d672f4cf64a3d0adf2735c9cf457fe010a4ac30ccb5db6a146d2159018e8aae7033066c4d5 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232
-EBUILD perl-cleaner-2.24.ebuild 1077 BLAKE2B 0c5aa13688e8b73efacb1b1c9d1b55ad8a956fc928f7b6ea1495b1d672f4cf64a3d0adf2735c9cf457fe010a4ac30ccb5db6a146d2159018e8aae7033066c4d5 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232
-EBUILD perl-cleaner-2.25.ebuild 1064 BLAKE2B 0f3106f3fbfa368c49ac1a9d58e0c5c9e8a41e729f90c09654de79d7fde97f1771406af25dcfd3e39746e961f11a2e3b742f8f22dbf11181c24a13db39267c16 SHA512 9bbb13862cdbd3bc68883ee271313d2acf402256ae89c3b7e88d337edb745c9c931290755b2f2e1f7b77d680155af11a331d3989a51103c5947d0f9a17683651
-EBUILD perl-cleaner-2.26.ebuild 1077 BLAKE2B 0c5aa13688e8b73efacb1b1c9d1b55ad8a956fc928f7b6ea1495b1d672f4cf64a3d0adf2735c9cf457fe010a4ac30ccb5db6a146d2159018e8aae7033066c4d5 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232
-EBUILD perl-cleaner-9999.ebuild 1077 BLAKE2B 0c5aa13688e8b73efacb1b1c9d1b55ad8a956fc928f7b6ea1495b1d672f4cf64a3d0adf2735c9cf457fe010a4ac30ccb5db6a146d2159018e8aae7033066c4d5 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232
+EBUILD perl-cleaner-2.20.ebuild 1205 BLAKE2B d327574484b14e3576dade1325862c5b757796b6b06540801523b83ea754f6658788feb4822af64934b8584e4565e2a2bad3611ef81cccf5dbf8fcc45a1c46bb SHA512 66c007b244ee7bb36f888330c88cb29efb99892e013a3f34a3e68642b3802cef3c49fb23642cf8976af84e2916678844b99715565aad466b44c4f73f6105c15e
+EBUILD perl-cleaner-2.23.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
+EBUILD perl-cleaner-2.24.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
+EBUILD perl-cleaner-2.25.ebuild 1052 BLAKE2B 9ec3cfc3c17e3ea15805c9587d4120eee87cafbe8664300f7bf1ccf871ceecee63cd5c83fc6c3fd63e4f1750dc0bbc3aa0f786c3b33731f4e8211edd989c40db SHA512 5cf28cf372371dfc165d64ea4fdfc989ea153357ff678b6f97716d7870df4d2a8e0140e33ba02762c62befb0bb647b1b0655e3cdcc0ea9c7f231f9be4b00e04c
+EBUILD perl-cleaner-2.26.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
+EBUILD perl-cleaner-9999.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
 MISC metadata.xml 399 BLAKE2B ec91f9a21ef927507e92919c8d97318c75aa59be28a6f596ba4c2982e3e8d3cb26ab7b6c60b7a7e7418079f1478eb8b540d26d84f8c0860fff56906d69e78aee SHA512 14f0bc2bedc501060c0f30537b742d485ee883bb18929366a7400f69b759f48dc630cb379a68405bb66fdb5002beb3551b37d5fa24f6c67bea5795dbaafa6d32
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
index dd4dcd26b039..7ec93d91073c 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.20.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
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
index 46945c3d0b0f..c0b5fb735ad6 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.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 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
index 46945c3d0b0f..c0b5fb735ad6 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.24.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 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
index 7838c88dd9bb..07906d19f3bc 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.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 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild
index 46945c3d0b0f..c0b5fb735ad6 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.26.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 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 46945c3d0b0f..c0b5fb735ad6 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-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
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4ad8dc3669b9..e2904700b9f7 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -8,12 +8,10 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec3c3314a3586b485ddafbfd9609e6f589472cd7c12b234e9ca1fa3cf492c1649b03c371ad29384df6555 SHA512 cb8b63aecee163c680449edfa63f9070582d3c1c924e3692dc7c18a7f84e166e9e4d88abae44d6e828eb3d4ab57b0d3a1f64e3a69453fa30d5559e4ae1716975
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
-DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
 DIST puppet-5.3.3.tar.gz 2843386 BLAKE2B dc96282ff2d6bb6719362cd9b2e856537019bd888af8ba897e37fc97584cd76c1d4179b3b629d2bb20d1dade0f84ec88ab41dd0d66cccd2c850a87f96ccf4b65 SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe
-EBUILD puppet-4.10.1.ebuild 4911 BLAKE2B 9b7b3b8cb8a6aae28b460efadda66f84df31ed7458e9055e1242eb99854c817039e0ddf6874ede9c9204d2bc3bdb2c62adae2faf14778eec3c71140de024bf84 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa
 EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74
 EBUILD puppet-4.10.9.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
 EBUILD puppet-5.1.0-r1.ebuild 3823 BLAKE2B 19a08621366ab57b447b76c1209b288736b40861eb6703d84166581bdb19c22c212b9d4247d33bcd39134748b186b13a8bfafede5a57d73c64b49045cd7cf43d SHA512 8ec7cdf210c22563867716154a316b07b96ec36bd3a7bd8bd0aa15f6a5b0dd8f61fb5855a94465049709d9e1e3db1b4e33dbdbe3ce4fc0650d9b51fcebbd631c
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
deleted file mode 100644
index 77b1ce4bfcd7..000000000000
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#		dev-ruby/rspec-collection_matchers
-
-DEPEND+=" ${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 6aeaf9b027f7..9db9eea39a34 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,3 @@
 DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
-EBUILD r10k-1.5.1-r1.ebuild 2099 BLAKE2B b543d218a0ad9f1ae2757486b9262c203c994dd512d3b2c5466c321493c2feb46344436d14b649a46fdb006ab7515dce8deb18497fe06fb0fa55683015276e79 SHA512 bdff5cd90b0b6b2533ce625b1dd2042bf11c98e2469d34a9cce7b14d844649d4044fa71b6458a82f7462b7a2f5efb00c32ca480554ea2c6ac3a714161a9cc926
 EBUILD r10k-1.5.1-r2.ebuild 2134 BLAKE2B 597a5b42e0bda5da73b54d6535acf9aa614a71dc1e893951cb5c70e9ecaebfb7ec0bfcc9334162c5bf63d45d17254a732a1b4544d0916ca636e1baa37da81c9f SHA512 504697400828795efd7bdc3e5ee1d7dcc55a7cb01e56941b01555d3e28ec618733b45e3e0e8e316c56457d51153276b7b5db109c98edd05599dca72a28b22f43
-EBUILD r10k-1.5.1.ebuild 1996 BLAKE2B 84002c1f3961a39bbffc2dd51809afab7f5e8e02df5ff6dc1b0667c319e6d7606c160ae2244dc338ebcbbe71a0c43e0fa03b981ff750f252a3335de44bcf5f78 SHA512 fbb5ddf6a4dd7d34780cbc739d7b7fe74348ce4290c1317a23d00b62724ae41e7c5b51ceda111d222d62e09598267fd57489d97604c29db9db916311c7741bc1
 MISC metadata.xml 696 BLAKE2B 13606b1e280dd0e75f1871c7c749eb67a8e0b455a9f357bf65ffca50547c0811c050a31858fec52c97f3fbc9234222f34372f087660ca65e5a13fd1561d098f1 SHA512 1158620e00396d313aeda263aa479ac878a42162f5c122ca69b26a8fb41d84cbeae688b0c3cda77658edc12056ec17cd12a0c84b95422442ab1bb6aba3cc16df
diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild
deleted file mode 100644
index 0044332eec8a..000000000000
--- a/app-admin/r10k/r10k-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/puppetlabs/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+git"
-
-ruby_add_rdepend "
-	>=dev-ruby/colored-1.2
-	=dev-ruby/cri-2.7*
-	>=dev-ruby/systemu-2.5.2
-	>=dev-ruby/log4r-1.1.10
-	>=dev-ruby/faraday-0.9.0
-	>=dev-ruby/faraday_middleware-0.9.0
-	>=dev-ruby/faraday_middleware-multi_json-0.0.6
-	>=dev-ruby/multi_json-1.10
-	>=dev-ruby/semantic_puppet-0.1.1
-	>=dev-ruby/json-1.8:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/archive-tar-minitar
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i -e 's/json_pure/json/' \
-		-e '/cri/ s/2\.6\../2.7/' \
-		-e '/systemu/ s/2.5.2/2.5/' \
-		-e '/faraday/ s/0.9.0/0.9/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
-	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
-	ewarn
-	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
-	ewarn "for environments to be prefixed with the source name so that multiple sources"
-	ewarn "installed into the same directory would not overwrite each other. However"
-	ewarn "prefixing was automatically enabled and would break existing setups where"
-	ewarn "multiple sources were cloned into different directories."
-	ewarn
-	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
-	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
-	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
-	ewarn "to enable prefixing on a per-source basis."
-	ewarn
-	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
-	ewarn "information."
-}
diff --git a/app-admin/r10k/r10k-1.5.1.ebuild b/app-admin/r10k/r10k-1.5.1.ebuild
deleted file mode 100644
index c9589256bce3..000000000000
--- a/app-admin/r10k/r10k-1.5.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/puppetlabs/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+git"
-
-ruby_add_rdepend "
-	>=dev-ruby/colored-1.2
-	=dev-ruby/cri-2.7*
-	>=dev-ruby/systemu-2.5.2
-	>=dev-ruby/log4r-1.1.10
-	>=dev-ruby/faraday-0.9.0
-	>=dev-ruby/faraday_middleware-0.9.0
-	>=dev-ruby/faraday_middleware-multi_json-0.0.6
-	>=dev-ruby/multi_json-1.10
-	>=dev-ruby/semantic_puppet-0.1.1
-	dev-ruby/json"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i -e 's/json_pure/json/' \
-		-e '/cri/ s/2\.6\../2.7/' \
-		-e '/systemu/ s/2.5.2/2.5/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
-	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
-	ewarn
-	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
-	ewarn "for environments to be prefixed with the source name so that multiple sources"
-	ewarn "installed into the same directory would not overwrite each other. However"
-	ewarn "prefixing was automatically enabled and would break existing setups where"
-	ewarn "multiple sources were cloned into different directories."
-	ewarn
-	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
-	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
-	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
-	ewarn "to enable prefixing on a per-source basis."
-	ewarn
-	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
-	ewarn "information."
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 8cd01b1e9c37..28229d0972c0 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -30,16 +30,9 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2015.5.10.tar.gz 5693422 BLAKE2B 99ba6321b998c111704178f55495327eb6b9122e4eb6efacab40eaa4d8be0cae91c6d72d6fb2732e4ae5c05170b4af772b6210d129e5849f86c7be6252768c67 SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d
-DIST salt-2015.8.13.tar.gz 7036243 BLAKE2B 0b222f91d5bc42621c96fcd46223b064a480185d79b164e0f7ba8782b502f68edc21691b661dd9ec0547d1363320aae3c6560137875570a73c8536d6ea695603 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a
 DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de
-DIST salt-2016.3.8.tar.gz 8519835 BLAKE2B a3936f36a513dfd4a9fd1ece41bf7abfc893d1788c8e5e85b28a2898c321e1d9ab2141dc3ab346e243c0c9c5dbf119abf7506e1dbc6be66995e30d09a1723122 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1
 DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
-EBUILD salt-2015.5.10.ebuild 4120 BLAKE2B b6c3f5f5fcb44721f55828b5d472b81d0bb3ef42e9ddd699c1bd52ce9c26929773662000b7984ed1ba573cff6bf476d2dc4b2026012d7ace822036aeb235b480 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270
-EBUILD salt-2015.8.13-r1.ebuild 4539 BLAKE2B 59bf43c454f1ea434abba97219920d938b6c0a92c2a4ac58e61a03620d19a959a589558e6dae174c76c6e2f84fadfe0b43d8b0a04dde7ecc764ebb8d6063a44c SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330
-EBUILD salt-2015.8.13.ebuild 4481 BLAKE2B eb797e470c44a94019cefaf8638b00f42dfc075a9ab70733fa55f897533c2801f131830be6a7caf9f34981a72c451e23d84712133c382645a585f30d77815324 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586
 EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738
-EBUILD salt-2016.3.8.ebuild 4670 BLAKE2B 6dc1143d60af6a1fd029f991fe8f1438c87865bc3369aef10ea45b3ec3e282bb02cddce76e9cd40289ec401600dfd70e141cc741214d6fa49c68fa88fa8153cb SHA512 3c9133d50c9abee9fc4dad7fcf9c643c84b0f3f8399fb71dc7e92e105f5dc4666b66c1bb308fd6950fe81d79fadc2a0eeaba14c75d9c6a2fe8e8c1ebb3d5cf02
 EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603
 EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/salt-2015.5.10.ebuild b/app-admin/salt/salt-2015.5.10.ebuild
deleted file mode 100644
index 24630f9f662b..000000000000
--- a/app-admin/salt/salt-2015.5.10.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
-	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.7-tmpdir.patch"
-	"${FILESDIR}/${PN}-2015.5.10-buggy-tests.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network}_test.py \
-		|| die "Failed to remove broken tests"
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2015.8.13-r1.ebuild b/app-admin/salt/salt-2015.8.13-r1.ebuild
deleted file mode 100644
index ed02341af26a..000000000000
--- a/app-admin/salt/salt-2015.8.13-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-	"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
-	"${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch"
-	"${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch"
-	"${FILESDIR}/${PN}-2015.8.13-sanitize-minion-name.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		if [[ -e pkg/salt-${svc}.service ]]; then
-			sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die
-			systemd_dounit pkg/salt-${svc}.service
-		elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then
-			systemd_dounit "${FILESDIR}"/salt-${svc}.service
-		fi
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2015.8.13.ebuild b/app-admin/salt/salt-2015.8.13.ebuild
deleted file mode 100644
index 88256a21d767..000000000000
--- a/app-admin/salt/salt-2015.8.13.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-	"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
-	"${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch"
-	"${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		if [[ -e pkg/salt-${svc}.service ]]; then
-			sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die
-			systemd_dounit pkg/salt-${svc}.service
-		elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then
-			systemd_dounit "${FILESDIR}"/salt-${svc}.service
-		fi
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2016.3.8.ebuild b/app-admin/salt/salt-2016.3.8.ebuild
deleted file mode 100644
index 655ea35eb46a..000000000000
--- a/app-admin/salt/salt-2016.3.8.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2016.3.5-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
-	"${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
-
-	# apparently libcloud does not know about this?
-	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
-
-	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
-	rm tests/unit/cloud/clouds/gce_test.py || die
-
-	# needs network access
-	rm tests/unit/modules/boto_{vpc,elb,secgroup}_test.py || die
-	rm tests/unit/states/boto_vpc_test.py || die
-	rm tests/unit/transport/{zeromq,tcp,req}_test.py || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ff04f3d2ad8d..3c3264222250 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
-EBUILD sudo-1.8.20_p2.ebuild 5749 BLAKE2B 123169c823e490ae3a5f1dbf43521bc3603cf34488e4a5bd87ed02a2e816de3555a8c58aa3ec52fb83230ab3e32f4da8220a0c8cdba4ff81bd149e64f5b2b7f9 SHA512 89c82af30974c8f44abb6a01a01ce31309c9c0d5d8d47ce67160e91d05e4bdda7fdc3d82c5171fe994f00faff3c51f65f7909972e8017a403adf0451f3d935a3
-EBUILD sudo-1.8.21_p2.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
-EBUILD sudo-1.8.22.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
-EBUILD sudo-9999.ebuild 5959 BLAKE2B 5b11f68280f6ce261b9579101726164a38c9bf68e67a1df47562ea356dbe68a80e10d30af1332092731c59e7f33bb0df6ac8731970dff2b200e080c0904ab98c SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c
+EBUILD sudo-1.8.20_p2.ebuild 5737 BLAKE2B e2685da19a459bffe137754830be471fa1a10379e615746f059f2bb0c8593841be7063f99aa98c1d452d45b007fea65dd9fd361ddf6a022ac8d3ec4937817dfe SHA512 5a5ce8f6a6e0faea0dcaef046fb3111947a5da95eea6841ec48ea2585e2565e142999b49e3f61d0dac3f26310adf02d00c501a9ec1a060f0943fceb1db88d98d
+EBUILD sudo-1.8.21_p2.ebuild 5807 BLAKE2B e9bc6bc8a27731b06b5dcc786181b875d93c2d8fc78432aac8b71afad59f11e77c548dafdd8c0e2e1269fecb30b209473148648b1d2e271bbfab40abe99659ef SHA512 84cfdeb689f245581062db02accb6d8f37482ecf66fd2f9218cf20b353f7f44d6a7c095443fa353b784b9315476f22bf518cbb9828801dd26226765956190432
+EBUILD sudo-1.8.22.ebuild 5807 BLAKE2B e9bc6bc8a27731b06b5dcc786181b875d93c2d8fc78432aac8b71afad59f11e77c548dafdd8c0e2e1269fecb30b209473148648b1d2e271bbfab40abe99659ef SHA512 84cfdeb689f245581062db02accb6d8f37482ecf66fd2f9218cf20b353f7f44d6a7c095443fa353b784b9315476f22bf518cbb9828801dd26226765956190432
+EBUILD sudo-9999.ebuild 5947 BLAKE2B 3d3f920ed83db07c59bfcd8667cc3c21a5d81a604db33ce65c1b3c1003eadd04def54dc49463d1c698ad3e42fe82c5bfa4b578da1a6a45d232fc512266323024 SHA512 9d27074ca8a0e3f5c18cc820c4fc6640ff19946ea0e68b04a0cb3edc5f6b54f77030b09208099d93fb61f9915c3e6e8fd4cd40c5380f40143dcf1bc419731649
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.20_p2.ebuild b/app-admin/sudo/sudo-1.8.20_p2.ebuild
index 08ea19d2a3bf..3c316a222879 100644
--- a/app-admin/sudo/sudo-1.8.20_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.20_p2.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
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl selinux skey +sendmail"
 
diff --git a/app-admin/sudo/sudo-1.8.21_p2.ebuild b/app-admin/sudo/sudo-1.8.21_p2.ebuild
index 0af84eaf37f1..2587ef0f43f2 100644
--- a/app-admin/sudo/sudo-1.8.21_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.21_p2.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
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sudo/sudo-1.8.22.ebuild b/app-admin/sudo/sudo-1.8.22.ebuild
index 2e08b4eb383c..2587ef0f43f2 100644
--- a/app-admin/sudo/sudo-1.8.22.ebuild
+++ b/app-admin/sudo/sudo-1.8.22.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 62a104c7aebc..7f82a2652767 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-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
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 143f6dcb1502..69c0769ee90b 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -10,5 +10,5 @@ EBUILD tenshi-0.12.ebuild 1342 BLAKE2B c5fb552dbf0ecb866a993cdd2c2fc9fdd80d4d2c7
 EBUILD tenshi-0.14.ebuild 1185 BLAKE2B f17ca46a042bd6f0514135a9cf528854cc6173d1c959929618f50c87075075d6703cae63c16fb0f787af1cfefd9776202a386683c8c137c75f6adcfac60cac26 SHA512 53b7df0fc590a83cd12d8ba0c6c5404941f71ab1e81787b8ce924a0baaee2c8162a7abaf3b1d36e6f634bb16520aec29ab3ff7ea1efeace731b676f167335331
 EBUILD tenshi-0.15.ebuild 1186 BLAKE2B 20916392433c56dfe9af50ffb4b46a9f112c28c836d18c7cf28c8ed7a0663f65f0daa494e8dc4b21d00735b5ce9b8f2bf8ec39e05e294624bb853d1eb09dfd16 SHA512 eaffd6c1308d4c8111f443008eb7a2ec8bae686460b91509834c68801719d277f334660ae1330b6215959e6be8fa7349229e0ad214af593fb8a22d756120e769
 EBUILD tenshi-0.16-r1.ebuild 1201 BLAKE2B 39b1532683d3e310c36594ce0843b5ff29f6a3b754a2ed33ddfbbfcc2158667954a748ab5da3f989e4f1caf7ef019b9c99a193190861942f6913a839d8a5159f SHA512 f344b3f8b6d1a3e61d4a5a1f819d2cc787b20a23d310b4c7545bcbc0593d6b14572c0697659f21d083aee2387dad7e1847b5cac0cfe2052fc83f786cb540fd3d
-EBUILD tenshi-0.17.ebuild 1202 BLAKE2B 00712492d20bbef0f4c459da59f47a8f0d831ef19a701b2df81754e85ca3fb9bafdbb8b3fa9afddec49a45b5f50626800f6fbbcf78e74c60c59b1c1a3925b125 SHA512 5867a7541226f28c9d126a3a457a841dcf8fc9cf3f69aa5414eaddae5c461141d6f734ed27a68e0c273b82788d46b7c972ca6213025656eef9887ae30344ab6e
+EBUILD tenshi-0.17.ebuild 1201 BLAKE2B cb842d255208587f3c9b9cfb5bb9195e3a08521827357a1e5cc6e3a519e13962f5098489f33700cd33286beba0a27cc85b88124456a42688c868533a19464fd3 SHA512 3a8daa84c56a5905347f597c62c48b901815d5eb924147b85734acbe882e97de43b60da9ca8e2c54975d9ca85674b0cb49ab94c4e78610fcd5c721ae4b9215ef
 MISC metadata.xml 616 BLAKE2B 82a12864f809b2c5f87fd5741c1b7723e311b2fc1261c51fdf24bb0ef0ee30e6f5684f12a438c3d86f961dd9299f962d6b08e7302ebdf137259d8e6884c7c62d SHA512 aecc34001ab636a20f6431410c9b96b157c581abebbcd38e61f121472d458e1211cd6fc70f90e50ea1b50d3eda3f151d39a2345c1e6510a8c067f90402ab43b7
diff --git a/app-admin/tenshi/tenshi-0.17.ebuild b/app-admin/tenshi/tenshi-0.17.ebuild
index 45059dc892f4..29c2bc70bbf8 100644
--- a/app-admin/tenshi/tenshi-0.17.ebuild
+++ b/app-admin/tenshi/tenshi-0.17.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/inversepath/${PN}/archive/${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 99a4ce12f6ee..1223027e41de 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index e55e7ae09c0d..ad3b444ab928 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -14,15 +14,7 @@ AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff582
 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
 AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
-DIST clamav-0.98.7.tar.gz 15118851 BLAKE2B 5fffd1896645b5e77f26819eb16e1d9e9cbb8a71d5627aa31ce009b37172fe5c9fff77d6646940c8065c856cf1a74737ffafc79d4e288b8d1202620fe568d1bc SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9
-DIST clamav-0.99.1.tar.gz 15990867 BLAKE2B 3b5d046c0b4e965ff26bea3b6b416e261ce86c449d092fd1debf52e4df5e5448039f7769f94d5817c9754100d296a0eb37ca5289f3cb5af8e58be9e93ef59a18 SHA512 9beb5c0ebff2aef741bb27811c1f10a7cd5da354ff67272ee8994d87c95e272a5983105af0fe1a734e1fa99f112dc4dddd9d82074a0df6715814817f85a45f4f
 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
-DIST clamav-0.99.tar.gz 15968038 BLAKE2B d3690f08215b8d870e8fb11b11eea6bb92a2eb4b7edddb037ed2f0e8c823a6c5856a3824716cd04f02ec985188ccd36ae41c5077df09ed1948281012dd28ef8c SHA512 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56
-EBUILD clamav-0.98.7-r1.ebuild 4692 BLAKE2B ba497a63d9c5319dc3d609106170200f352b93e29f6465bb9f123e2796671664f94abc494690a78951da05f7ccb71a1beea6b55706bff744eff4afd6dac8b65f SHA512 954370eba71cdfc8f0c5985e3bcb05be3e24ee4b073f14cbe6427c67e86a8b4e89ccc4114793f165681b5700b76391a6227bac8056b3021cafab033beb68d294
-EBUILD clamav-0.98.7.ebuild 4624 BLAKE2B 56d6f5e232c08a2a6cbcba67b4e8b982ae70f96665fb6ce6cac52578ca5c804d69b259d988bda72e809347a2bdd7ff56e5356d83ce0d08ed9542d2332b60efec SHA512 ce11c90dc3c7524b0c4599665406906c080e122e92260e95760034bd7dba3e63f70a2a3627518e9cb475a8267a728ecc1ace1ff9c1e5bac4d4a8ae04e572366b
-EBUILD clamav-0.99.1.ebuild 4905 BLAKE2B 8cadfb5896fd143da45ea1f2d7da1fb510b08e42d9833f9aa6f4330c44f9826be17f3aaaa3f951fb7d19c19be03ddae973e573cac976a3c81201cfefa477c8b4 SHA512 8deb314ccb8635ae454de04a0295af882d172d8051954ddf1630a80e81044d7ba0d46b56fcbb0a3a4c06f7d1bb2a765184171ba58b3532a730b18913a090bbb6
 EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6a08cf1480f0622a2632d470f9b44cda9a4f68919f356c5a8b95b81b87912e1c64d3b6e3c66fa9e1b122b2863b06e SHA512 96b2ff17e272cef6a23bfa4357b7a84a509a6e6e105439e70cc8db99b75a61a5732f7257cf494a19d48998c4d84c2d19213d48bf6104cf372eb77c41c5506908
 EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
-EBUILD clamav-0.99.2.ebuild 5011 BLAKE2B e12f2b5c816ae3d7b6e8575d8c0123cbf861ab178360fd9e29ed4e00cd1947fc4c7ed3d676d9bf8e544cf5dee3893a4fe7cfce80d59e52c132542588852ca4cb SHA512 dd2b1a6667eef55cf8200f5392b46c5fbe6534249d5c7008e9a46db8c6b2ddb09ea80a446739a257dd39c21e65a38d71682a1f436949b46128774688aa8a3df4
-EBUILD clamav-0.99.ebuild 4917 BLAKE2B a0e5db3086abd4d0c94213083341a819ce54e098f8b6457cdb065850d91e31992a0c0ee054f66e8f79a8f24297e316cd9f26b9913e24a4534bde41dc932e2e98 SHA512 867f2e5beceddfba26d5aad2016a2f244b01c90b8851b65c9d33ea968c979d1b73db9e700d48b6b1b33525ad4000e3a0e8c5b059b597c27be2d2bc15919b161c
 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832
diff --git a/app-antivirus/clamav/clamav-0.98.7-r1.ebuild b/app-antivirus/clamav/clamav-0.98.7-r1.ebuild
deleted file mode 100644
index a8c9f8f9942e..000000000000
--- a/app-antivirus/clamav/clamav-0.98.7-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool"
-# openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--disable-fanotify \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.98.7.ebuild b/app-antivirus/clamav/clamav-0.98.7.ebuild
deleted file mode 100644
index fa453adfc575..000000000000
--- a/app-antivirus/clamav/clamav-0.98.7.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0= )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	dev-libs/openssl:0
-	sys-devel/libtool"
-# openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--disable-fanotify \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.99.1.ebuild b/app-antivirus/clamav/clamav-0.99.1.ebuild
deleted file mode 100644
index 1fe996a08052..000000000000
--- a/app-antivirus/clamav/clamav-0.99.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	>dev-libs/libpcre-6
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	epatch "${FILESDIR}"/${PN}-0.99-zlib.patch # 604650, fixed in upstream HEAD
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--disable-fanotify \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.99.2.ebuild b/app-antivirus/clamav/clamav-0.99.2.ebuild
deleted file mode 100644
index 135d0c2f817d..000000000000
--- a/app-antivirus/clamav/clamav-0.99.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-# no longer on sf.net from 0.99.2 onwards
-SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	>dev-libs/libpcre-6
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	epatch "${FILESDIR}"/${P}-gcc-6.patch #592432
-	epatch "${FILESDIR}"/${PN}-0.99-zlib.patch # 604650, fixed in upstream HEAD
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--disable-fanotify \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.99.ebuild b/app-antivirus/clamav/clamav-0.99.ebuild
deleted file mode 100644
index 3c4f211ef6a4..000000000000
--- a/app-antivirus/clamav/clamav-0.99.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic user systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	>dev-libs/libpcre-6
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	epatch "${FILESDIR}"/${P}-zlib.patch # 604650, fixed in upstream HEAD
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--disable-fanotify \
-		--disable-zlib-vcheck \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-	systemd_dounit "${FILESDIR}/clamd.service"
-	systemd_dounit "${FILESDIR}/freshclamd.service"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf.sample || die
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf.sample || die
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf.sample || die
-		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-
-		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fad2986538a8..edb58fc7b9f5 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index e81bc338172d..4c37b3daac3b 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -8,5 +8,5 @@ AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b3
 AUX bzip2-1.0.6-progress.patch 5756 BLAKE2B f41a60fb77f1aea7e3e2cdf0fe8379e4712dd597ee67df850f9c757dbd7625c2cf0ece0b40363e293fe468fc06f1793b70fabae05957150bb6e712ccaa646371 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc
 AUX bzip2-1.0.6-saneso.patch 439 BLAKE2B 839aa554d8fc7eeff16cb0dd19aa6bff68437c98ed974f7af25c07232ce2db05f3e366ea005a57bde85cc2dc4d5d4d6156b07c3133f3032b11e368f55058ed18 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
-EBUILD bzip2-1.0.6-r8.ebuild 3028 BLAKE2B 66bf07fe6ac962aefffe99406da517a874736bf1e6925726b22aa8b6a11fe0b7271fe62e04392ef5d2a1902d9d303508fd17620b94e57b06499a22f8c65d7cda SHA512 ac44c1e7919af1e855f191260e520133d275c07139c9bea74bbc289e2bd818584a4f2132826b9b99829ad199f6b10278e764e0e62d76c5eb791672ec9eff2ea8
+EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 5b555febf72c..167f56e9bfd2 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.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
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 80608f2b3a35..159d35489e08 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,5 +1,5 @@
 AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
-EBUILD cpio-2.12-r1.ebuild 882 BLAKE2B 27da1c59779de4ddd5403f1416ad3154d2c9f3db3402dfa60c07acf24830d73ca497beb01e6e95beb5ac24fc38d13871f26ef124a42f6a891bbc4783078687e0 SHA512 40a0fd47774f56cdf99c77b6d0118f122b8dde7ed66c460577b0d2bb2035abe936cf2de9474595dbcb3a5b5996ca1ad15be7705fce0c6ab2017da2936cadd224
+EBUILD cpio-2.12-r1.ebuild 870 BLAKE2B a86550e4b94d3f69a47389a56187a469aaba96528030d9d0794f281849aacb99bfeaaa77aa0e67fe628c6eefbb7af20b862728b330fddcb8640403daad0712e7 SHA512 b18f461cea53f0ea28ca50da48449cc6670e2ddac21b6939caf07af304730727a7835245be73454639c149ad502fe704851c156fbf97311a19510efe00d7f397
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 91efd5e4494c..a6b79426ec7e 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 src_prepare() {
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 944e79646408..6ced80686e16 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f
 DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.8.ebuild 1189 BLAKE2B 4c6a4cb55803c6ffbb0709b3a53e11bbbd98ad12900429b283b74b4206db319bae15675520447d33a1e7292edec877b3b509c2ba1a07b6da92db5631c624325e SHA512 857d78565eea8c432ed26852c89ba0b9a45c3145b843e9f5804b8ebc4715c7e386a8c5089fad8a89f7e7dcb2c1151f056b09b00a50f6481c7a2e2704b7cf632e
-EBUILD gzip-1.9.ebuild 1122 BLAKE2B e1c85598edd62c27c4079af997cd436aa285ebcc47882d85c59859f8d67fa6b5b28212c368bcac2864010fc058b802f630adfd113d322fa2be49a92c82b4c9f0 SHA512 12bc7fca087b2aa92075d56ceae98b0654aa18c8c67d085084d74f89cd42a6a54ba1b9e6a27d178e4b75aea4cdcfdb862db0ab64d3c13085855db9ca7ef2f8a9
+EBUILD gzip-1.8.ebuild 1177 BLAKE2B aaf2b99cec28e67f048a05c88d3a958140a322cc7f232242c06cd800443e8cb5f5e05d19bb60e6662aa01dea521a0ccb79cddc2bc8160880eaf3ea501da10a32 SHA512 f64ac3b923a2dfcb881f90cadfe64cabde16cbde83fef903b35bae5ce23f5422f281cc04e37c3a043978d59d08cc506a06b489d02b4a347a15b7aee1b43b4a4c
+EBUILD gzip-1.9.ebuild 1110 BLAKE2B 9655656fef362d12701a2b9599ec0ddb9cb14cf667027ca10c7d7f4a6103b12e8b120ea8e89d72e38ea32ddd1664404eb53b2379ae5d02508e3196fff7ec9235 SHA512 fa99968ef76bce8fe88179cd32a28b803739fcc72b28de268930e4f9c8196dbdd74f67669a33dd3f0b247e44dd6718d913dd45cb7f608c0728c78019440371ba
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.8.ebuild b/app-arch/gzip/gzip-1.8.ebuild
index 1fd065eae9c3..03bc1b2ca591 100644
--- a/app-arch/gzip/gzip-1.8.ebuild
+++ b/app-arch/gzip/gzip-1.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index d582478b998d..5bfc0488effc 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 1a16296d475c..7555e8587bd7 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,6 @@
 AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
-EBUILD libarchive-3.3.1.ebuild 3300 BLAKE2B 10bce3600696bbcafbb17267ab7139958d0b810acbbfb56e476e873a138770ff5b5b96216387e97a3281f06df01ec67fdd573ea6351ca9a46344c33c1d1d881c SHA512 3c8bd5989c8b6f5554f98e35243a88b3d132779c59bd9d74ee77c7971dba7784345d4c3da2c1294d57384d8034a3461bf5e794a5c15060115bd1451bd7cd879b
-EBUILD libarchive-3.3.2.ebuild 3314 BLAKE2B b864f34e27ee57395cce46578d23880c64b0544f0661b34c50b36fa7138d92b221835e643420279950154c0642118c6e042fea8b7b6c38fd990d094e37c99db3 SHA512 465cedc1ad9b10c83a8a218af0b4fc50207dbf9593a25bb0292781a8b7f141950496b1909ce355174020a97c63b88322c41806f9215765b7a8e5fa6743bbb5e2
+EBUILD libarchive-3.3.1.ebuild 3288 BLAKE2B 7d8faae5223363c4bae7aaaac3d2abe41c527e78a2ba0556cf4c3bd07f0d7083708e8301692294acde86a67f0a0078c8cb0b5b8ac28794ca0bc4b4841696cb4a SHA512 17016296510689034c17deeb7959ad16bb616fc74322bc7c8d35292c5b643d5ff3372be6bbaff875b766424d650f6c9dfd8e46abc0d9962681d11ecdff57fb73
+EBUILD libarchive-3.3.2.ebuild 3302 BLAKE2B 31643b957883b0adda19097444010d8816635f439c7286485d42a6d7a28cdeb89f2101df0bb09486e12d5839de5450e972a9c280d6b26ce7b83fc6ba150b9d8a SHA512 d6c9ddf2639c28824e3456ed07814bcbc502050a261bcb1af2d890b60d4c489c5b658e2b23496c143e3ccbdab8535f28032381af3da08ee9e35ceecf4a7f848e
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
index 06d68d7adcac..6a9a79b303a4 100644
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.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
@@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 
 RDEPEND="
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
index 880de9e8b234..2d3909ef1f42 100644
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.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
@@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 
 RDEPEND="
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 94e04e440bd8..cf50d627e0e9 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,3 +1,3 @@
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
-EBUILD rpm2targz-9.0.0.5g.ebuild 799 BLAKE2B 0e67c227b630752a24e5748454f8ab86a6e424ea222645b1236f5d8a62b4f0c7c0b54d47723012d6c1075763fea87e3ff9e9421fae86a7af6f838fe8b1bb2435 SHA512 c0d03ae150d1b2afe6a9053693832437e1a2c9cebfe0468699b054e2080192e0eea4b7337aead758149c0d37d89b0f02704fe4e4e15d7e70cc05d498e2f80556
+EBUILD rpm2targz-9.0.0.5g.ebuild 787 BLAKE2B 8b25af939b097576c66a4b4debc037184d83c9fe876ab054149866e18968a717a907c99f0c3997196edb0239ade26a02efc100bf927370a94187a98d97b0eed5 SHA512 821e0b916e813b41fbf330525ef04f00ff6801a0305cd219462fa82c94e756500a7902b0f2e8aa4a18397155223dbbad56c4a30a3ce8bea9c6a60cb58b827e4b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
index 3c18ef69a11f..bbe23041901c 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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=""
 
 RDEPEND="app-arch/cpio"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7f2bd51e764d..a06667888d5d 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
 DIST xz-5.2.2.tar.gz 1464228 BLAKE2B aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
-EBUILD xz-utils-5.2.2.ebuild 2100 BLAKE2B 04d1211b30f9ea266d39e1ee2da4e22fab8887e039254d88cbb53e7a0e1e2e4673f9e4698aab128e7c61e92f1220a9cee20dbe346b6c7fc98c2b215d22a3882c SHA512 f18b81c187e2162df1d9020928152acbae4a394e8e3d44a15dd22878fb950b80627880346a5a5cad3aed251e177621fd0ab0e622fb1698aaa66b13dbbb353f7a
-EBUILD xz-utils-5.2.3.ebuild 2608 BLAKE2B 96445bbac4893fb48d83d7475381d53a5ba3a9ed0b429b6b841218c68f694e015e3596bca8136e9575ffdff814510e48049cefd4499d92af63aa00adb6c2b093 SHA512 32672889219550355aa50685ad87ff8af13ad40562936e203e2246f8e06fc3d421627ea38b16552581371d847a5b8da838268a41df3080f5d05b1d702971ce9f
-EBUILD xz-utils-9999.ebuild 2605 BLAKE2B 6e1addb2d66c3c1de44638b8f2a67455246242f1a859fc78609bdce9bba111c8c15c55bc3b5c5b21f0d7035600297b39064f8bb88f8a102d4b9c2301245a9515 SHA512 a9d2b12f2412d7e244583c5353fafed12f8228b530db9f4bed9f7e5cf1e52ccbcffc0fe58c858a3f6f7db4ceedec1412a7edfab4bba48e3de63ce3dbc9df5a89
+EBUILD xz-utils-5.2.2.ebuild 2088 BLAKE2B 4c13f34abc9997f4a71c95c945844c5c68a5616c09ed8f3cdfe1f89ce52637b17fbb54936a108b5df309c05989c1a29aaaf1de1212f3653220a3feb51527cece SHA512 89d9d8991e512aedba675c07e4a128983fc90297b06ad67d381b4e255d3c8252f3795ff64e0d33da5a67a9273815e85b42a18e10c8e63579a42a8a9a9fb12498
+EBUILD xz-utils-5.2.3.ebuild 2596 BLAKE2B e37e98c9637b64103188c4621fb2ec9b83f79a2114a092bcecd8936b0b44a5983c5784166eddb145aae162efd1ea14a7fd329aa09c6a10b28b7455304dbf2b9a SHA512 6c912647db1d496728082b4e47b0864af679662f8c0783f0c18f117c2770e98c7fec20e9751ec4cc7bec7e6028ecd8cd61873620724df402554b84488f8d76f8
+EBUILD xz-utils-9999.ebuild 2593 BLAKE2B f3a1ce1e744ebdf07c8b9af28c9591950b650cf3c893db6ebddcc06f260a5430090319a3429b628fc9319faab411dd09bc15aa4296802fec6d163d9a91fba52b SHA512 f33d375ac506d6d421fd4f0a27c6a3e4e735293ff7b24027d95735496841532fb2fe9ca1599e696e46925596179c9317d53522f35a493a1adfe7a5c6d6a48398
 MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 4c6c70ee4509..56a375592e4a 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.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
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index 85c206c9bd13..c50acecfe5ec 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.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
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 774c19a2aeff..14f09f4bd5d2 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-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
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3ead73429863..3549c4fec521 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
index ac82df74194b..8ba05fa49307 100644
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@@ -1,5 +1,3 @@
-DIST luckybackup-0.4.8.tar.gz 5710203 BLAKE2B a0efe350aecaae759cb8c7d2f51eeaa71caa7b267064ccb0a49f44465df53b6b2a41ebbd6794a5bdd2b44b8d1a402648da0ff243880237c6e3d64d505b5d5bd9 SHA512 48e73f8b5897a09f64f3755dc094ef50031c607ecfca25c238b45ca5bef7f2645081b7c665a9b7c3c3da2f214f91b229a559d723df8ddb6446aa23e68b266076
 DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
-EBUILD luckybackup-0.4.8.ebuild 1589 BLAKE2B 677d7185c631643d64bb223b8cdc4320eaec1d5feaddcc922384e8eeda606cf1249980eed56215f15f115ac3d2850f395066e5aaa33c458f5e53960656eefe76 SHA512 0c253be84b2f951c16ce0b98bbb35691798277ef91239261e7c2f89f77113ba54d598ba25d9b1228fc35d9e93547ab1088c7530c83fc5d8ac50d8e2a81900ea3
-EBUILD luckybackup-0.4.9.ebuild 1351 BLAKE2B 8540ca395ba3628f6002989989dcae31aa3ebefe75528bd79b6e7189f14a0c34f4566fa7d1dbace263e38da1c7971ed12c3cab5ba136a384e79ad652e5cddf38 SHA512 c261abfc103f7f7a3c1819de4d11f9c76d5ede7083a264e9abf1b7ab0da38939286429cbb328a12ba760b07e448cd6844117dea80f7cd494c5b3f6dd9d84e99d
+EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
 MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
diff --git a/app-backup/luckybackup/luckybackup-0.4.8.ebuild b/app-backup/luckybackup/luckybackup-0.4.8.ebuild
deleted file mode 100644
index e8d3c5b6247d..000000000000
--- a/app-backup/luckybackup/luckybackup-0.4.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="bs ca cs de el en es fr it nl no pl pt_BR ro ru sk sl sv tr zh_TW"
-inherit l10n qt4-r2
-
-DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt4"
-HOMEPAGE="http://luckybackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	net-misc/rsync"
-
-DOCS=( readme/{AUTHORS,README,TODO,TRANSLATIONS,changelog} )
-
-rm_loc() {
-	sed -i -e "s|translations/${PN}_${1}.ts||" "${PN}.pro" || die 'sed on translations failed'
-	rm "translations/${PN}_${1}."{ts,qm} || die "removing ${1} locale failed"
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
-		-e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
-		luckybackup.pro src/global.h || die "sed failed"
-
-	# The su-to-root command is an ubuntu-specific script so it will
-	# not work with Gentoo. No reason to have it anyway.
-	sed -i -e "/^Exec/s:=.*:=/usr/bin/${PN}:" menu/${PN}-gnome-su.desktop \
-		|| die "failed to remove su-to-root"
-
-	# causes empty directory to be installed
-	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
-		|| die "sed installs failed"
-
-	# remove text version - cannot remote HTML version
-	# as it's used within the application
-	rm license/gpl.txt || die "rm failed"
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-	qt4-r2_src_prepare
-}
diff --git a/app-backup/luckybackup/luckybackup-0.4.9.ebuild b/app-backup/luckybackup/luckybackup-0.4.9.ebuild
index 4ae8962c48c1..eab1f1a17131 100644
--- a/app-backup/luckybackup/luckybackup-0.4.9.ebuild
+++ b/app-backup/luckybackup/luckybackup-0.4.9.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -39,6 +39,9 @@ src_prepare() {
 	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
 		|| die "sed installs failed"
 
+	# bogus dependency - bug #645732
+	sed -i -e '/QT += network/s/^/#/' luckybackup.pro || die
+
 	# remove text version - cannot remote HTML version
 	# as it's used within the application
 	rm license/gpl.txt || die "rm failed"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c6f0649606ae..ecdf8e7d0865 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 1782829635d1..0df57b7ea34c 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -3,6 +3,6 @@ DIST cdrtools-3.02a06.tar.bz2 2117648 BLAKE2B d9d4dc60d3919e87c6d96addba0e45b9e8
 DIST cdrtools-3.02a07.tar.bz2 2127058 BLAKE2B 5307a012a0d4a593d7e0fc879e2ac0dab8ddcca573772194b3a5bbb3be74fc8109d9af720dd12369b4ef5c51ddc70ebad9e8c5a672d6dee62e7462dc67407ab4 SHA512 7f9835dd32ccca119d2ab77de1cdbd8cfbacc8e9923ca42175a15a5b1f45a8aa238fa3b0917ff67697b54905edc78a142f7106af9127854f944adead4a0d826d
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha06.ebuild 8158 BLAKE2B d69b064e05a61b15567d7536622b65c0c8b69a137f6fa0f6840b2cf8616002d6fc327bf4441b95cc8d36ca166421ecc5f0d2ff1c5393b9551fd30bc9e8795c6e SHA512 fb91a63cd2f47b0342350ac527b23c2cb6454366e3f8c3aceeaa88752760fa4cd5950037ec16114bce390232047e9ada50f47e05d6b97cfd92665a222d830675
-EBUILD cdrtools-3.02_alpha07-r1.ebuild 8268 BLAKE2B 5814fb3fd84b791b46dbdd1cb84e51eadfacb8e6ee25812f41e68e5e94d9d66db926ab7c56df7acfc5a1f1195e71d68668d6703bb01b40fc39276577ac8437af SHA512 dcbf5b1da8e699d7343847ebfc9401ff42556eb30bd7ea1c389d028905a3bd98dd6f8c0c1ec48fb81a88dc834d605c13c465a70c53ce9329969a534def044303
+EBUILD cdrtools-3.02_alpha07-r1.ebuild 8267 BLAKE2B c09518bb0e2d961d94e8ac0841ef754a0dce19754b2a7e92fe0b841912fba368409fe39711c0e81c3e2a13c1fa8dc86d7d4b47c8f84dbf1193da6effbad38c01 SHA512 c0094dd075d0113cc3bfd3bbbcc2ba5805d59c9ce145d673da9e255a1529c0656917685be59c91503a512d0a9ec30e963b61ba76a641c6714287b5489b409af0
 EBUILD cdrtools-3.02_alpha09.ebuild 8276 BLAKE2B 0117783e30ffa2875b56bbd2d7a26a895c41c0be60ac81266d6b42ac454c5c4b9d17e0216cf23fd2e2a8b30f84ad14a9bbe0a2dc941bba389e963597e17c4488 SHA512 cadb033f176fe74f98febb566a503f483249da124ad9621692b5a7d3b8260aa9a27a0987019700371bf991537ab2180981b75248293ec419b248d5c5df036059
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
index 9f1219635a7d..6703e37a190d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha07-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 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 ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 91d5be4b4a1f..ffb647189df0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 20e95e32e7ab..761c50666cbf 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e4540
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.0.tar.gz 1105665 BLAKE2B c7fea5f9fd6a0f68112897923fe96c854751789c6ba71ad38c333c259d556431ccc53658eef520f2518b42ff26748bc6736f3deff97cbfee4900305b1cd24fa7 SHA512 87d1f2b5153f8fc6a5cf1ee3e6ba084464d2094ef0ae8955d4ac3c75de759cd62c54465186a21b4d4205193f410cbfcb93f4af4f29bfdb21f7cc881a38c4340f
+DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 EBUILD acme-0.18.2.ebuild 1133 BLAKE2B 401d18f882e17b5cb3b2554be65faaecd297ff995aa2a27740a02f5ab492e5cc54e93bae8f9d70630718ad428dcccfd99969f34ae53bef082408d21c8b3c436f SHA512 f06d2ed89253047db5a4943d6b4a9e78587af57d352ff5e892f9fa339ab2971684466afa2bffd9c4c7d6d14fde3e59382056b4cf5bab45abc5f914597d61ad13
 EBUILD acme-0.19.0.ebuild 1139 BLAKE2B 38a9513be1f7da99521962ca9a42ed7c5ef519a498ffe36f5fbf6451cd9820f7b2a796dc40ec02cc363c9f3e73e3a158de93bf7bf9677bc79b64c73a563e0e73 SHA512 577fb0baf8b0c0322cd594bbd68635bffaf47ead067563d838d5f787001f9e03ea7e0611f8975bd864b6a749534a4d9d851c519e601b139837310cc11f5b380d
 EBUILD acme-0.20.0.ebuild 1196 BLAKE2B 6f3277f312a2d4178feb12874a72cf00c29f78bbf5a664cf3e3c6900a8945e871aba74cb291bc81ae4412c4fa2ccccf1b06d3241f6a8562d8b5afd042af7a39d SHA512 1ca1a31c541cbf073141b5b4afd0eb0080eb5543c96570497fd107832a72e8716d136f51eed1fe9021c228858ba6b1abf67ef2f268004cd3279ec9b402e64f99
 EBUILD acme-0.21.0.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
+EBUILD acme-0.21.1.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
 EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.21.1.ebuild b/app-crypt/acme/acme-0.21.1.ebuild
new file mode 100644
index 000000000000..610350856377
--- /dev/null
+++ b/app-crypt/acme/acme-0.21.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 64ec1ddee785..cbe35bb23a3d 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e4540
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.0.tar.gz 1105665 BLAKE2B c7fea5f9fd6a0f68112897923fe96c854751789c6ba71ad38c333c259d556431ccc53658eef520f2518b42ff26748bc6736f3deff97cbfee4900305b1cd24fa7 SHA512 87d1f2b5153f8fc6a5cf1ee3e6ba084464d2094ef0ae8955d4ac3c75de759cd62c54465186a21b4d4205193f410cbfcb93f4af4f29bfdb21f7cc881a38c4340f
+DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 EBUILD certbot-apache-0.18.2.ebuild 1067 BLAKE2B e78aebbf53581e67cae97bf0598959d62f6fe443f560299ff5b3e220fa2fed9a7f2b69a08bec227eff38d815621bc4557e3837990e2ade0f213c2d129efdd3ca SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9
 EBUILD certbot-apache-0.19.0.ebuild 1070 BLAKE2B 0f50a2906405dda2f47ef28b8f48a2c0178b7754b5178a8e923a0ded24ac55fe056716b67c65d831ce52de7a0901b465dede95a7e6658bf074bd24dafd174b1e SHA512 4f99ca73893eaf072f62781a3d740ae9a6836c53b20104d9f1673eae9f6dc5255c58c3e54dcc27d65cef710030a44fb4b8073788579db8ffa4fcee801594b781
 EBUILD certbot-apache-0.20.0.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
 EBUILD certbot-apache-0.21.0.ebuild 1072 BLAKE2B 468296ac97d510a7b4852c6aa82276f5e8923fc21da5a8f0dbabe8ac2e04a3223af0a3e38bde0a999552ea3266c11b5579631f23a53e700f15483c83f08f9355 SHA512 70bd80bdbf9a165c0526cd95dc594b023f673c23c28b98b28eea7dbd84bf1600d9dcca4093f7387e06d61974d3c9a628c103ba1b979ef4e7687bdce010e84105
+EBUILD certbot-apache-0.21.1.ebuild 1072 BLAKE2B 468296ac97d510a7b4852c6aa82276f5e8923fc21da5a8f0dbabe8ac2e04a3223af0a3e38bde0a999552ea3266c11b5579631f23a53e700f15483c83f08f9355 SHA512 70bd80bdbf9a165c0526cd95dc594b023f673c23c28b98b28eea7dbd84bf1600d9dcca4093f7387e06d61974d3c9a628c103ba1b979ef4e7687bdce010e84105
 EBUILD certbot-apache-9999.ebuild 1072 BLAKE2B 6ec71a794ac98f33ce0d71fad86006da09d13ebfd708ed734f2b1376eb67ccb81252ff010648398aee622cca7e63f2667a56efc54abe36901d63fd76039c70e6 SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
new file mode 100644
index 000000000000..bcdba5a9d286
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 549669340149..12f7e3cbdeff 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e4540
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.0.tar.gz 1105665 BLAKE2B c7fea5f9fd6a0f68112897923fe96c854751789c6ba71ad38c333c259d556431ccc53658eef520f2518b42ff26748bc6736f3deff97cbfee4900305b1cd24fa7 SHA512 87d1f2b5153f8fc6a5cf1ee3e6ba084464d2094ef0ae8955d4ac3c75de759cd62c54465186a21b4d4205193f410cbfcb93f4af4f29bfdb21f7cc881a38c4340f
+DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 EBUILD certbot-nginx-0.18.2.ebuild 1019 BLAKE2B ca94ded55ecdf215d80d88e1191db76e46871179159b46653ae31032dce8620aca19a47e7be420afabab4c72cb3fdb0152acc856556b0e1deffe141a12ed8224 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964
 EBUILD certbot-nginx-0.19.0.ebuild 1017 BLAKE2B f4b1b9a0269c25d5a95e18dbdd00dbd8ec4296a649f1b09cd02c3a65ccf4c439f530fec36749f028f9560951e1b6e21c60b9b018c3f7203c51fa4cd64879a8f4 SHA512 3454653979f0756144420c09f84fc7d349d2d6a661d43e3d53cdda0a5734082d65543292bccfc5f49f7a91230fdf4d51fd84a1fc8dd642609298dd1e7f5a2716
 EBUILD certbot-nginx-0.20.0.ebuild 1017 BLAKE2B f639ab25ed6ce43b1d5d952dd7bc454225dcdc80e228e4d58399c7dd40ca6cfffc00a61728694aa36fae72b6b42f370d086e91f0674f8845ca2763d823500c77 SHA512 3d16b2ca9e4743f95bae9e4aaa2b116bec74bc0879c755de7bee1495000500c7b73082087d971084bf6cd1b35105b239ca1bba94f6e1d7a721ff5d617e4f3f9c
 EBUILD certbot-nginx-0.21.0.ebuild 1019 BLAKE2B 4019c3ff35427160b9d18e4278c201e59a371714d652c77e1895b42dbf66c798d58868773ae1a7f25ca8ddbf42b97a86d92294a3e3a162d4ae00bf3b2eec472e SHA512 d578788e3027a9c3734eb9a0a90023782ad7c8ed121b6aa18f5573b0e38b870f6aece4e6dfdf7f7c76f6b64a96dd0c0cbd208c3cf2c2c93841c2151d669415c0
+EBUILD certbot-nginx-0.21.1.ebuild 1019 BLAKE2B 4019c3ff35427160b9d18e4278c201e59a371714d652c77e1895b42dbf66c798d58868773ae1a7f25ca8ddbf42b97a86d92294a3e3a162d4ae00bf3b2eec472e SHA512 d578788e3027a9c3734eb9a0a90023782ad7c8ed121b6aa18f5573b0e38b870f6aece4e6dfdf7f7c76f6b64a96dd0c0cbd208c3cf2c2c93841c2151d669415c0
 EBUILD certbot-nginx-9999.ebuild 1019 BLAKE2B ca94ded55ecdf215d80d88e1191db76e46871179159b46653ae31032dce8620aca19a47e7be420afabab4c72cb3fdb0152acc856556b0e1deffe141a12ed8224 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild
new file mode 100644
index 000000000000..9e827c955370
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index e731d1020597..071b64c37c70 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e4540
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.0.tar.gz 1105665 BLAKE2B c7fea5f9fd6a0f68112897923fe96c854751789c6ba71ad38c333c259d556431ccc53658eef520f2518b42ff26748bc6736f3deff97cbfee4900305b1cd24fa7 SHA512 87d1f2b5153f8fc6a5cf1ee3e6ba084464d2094ef0ae8955d4ac3c75de759cd62c54465186a21b4d4205193f410cbfcb93f4af4f29bfdb21f7cc881a38c4340f
+DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 EBUILD certbot-0.18.2.ebuild 1507 BLAKE2B f63d3f040a50d0bc11fc9e630a7b8ee93b7ca9e1ceca08e16231997dafd3b4b38e0c45d633eb235e721284d4970a4b9818db32b0492b44b133b17ef4de074c5d SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7
 EBUILD certbot-0.19.0.ebuild 1505 BLAKE2B e6a395971dc77dbfcfe4b83b130acb9c5658d25da273cb572dc250bdc8f63fc60a35eec98069240f66807f0253f851346d4afd00a2ffebb02518b1cd0d5c9fb3 SHA512 a4e0e01665da6a1b93adca2dab9a062ede49e92f05534d23baeca5bbf34e7681d14455d2733f636ab4d08838c69ccb37bf4a228dd5a0abaf8c27a8f1a90b0f8a
 EBUILD certbot-0.20.0.ebuild 1593 BLAKE2B f59bf64316d9f8834ad592a20542c36e825b49ba7f80972e888efeae7a09cee36a3e5005a9ab8ed2ad5ac66b497cb0bb0aa15c86d38e5b2fda83da7c2c6371b2 SHA512 746e799bf353167035a9f12e52d814e5fb9208182ef3aaf023d890d0512ceeb8a07f7d41f203e5cbd2dd95e3a8f2110b0032662c84854923482df043e6203781
 EBUILD certbot-0.21.0.ebuild 1521 BLAKE2B 023aa5f5a8ce9fde2fc521880cf6d6a4992bf36ec4c057df0d78811111be786dde21598d374b069021ac84be9b1adff567c07b582a4756a5d3e2385d4d9f4a8d SHA512 72897b2d8a3256d5ffb5fe11fabccadcc13dfb4963f3a8030dbe19d942c97f6d26225441467a8ade644fdc732c7c4dd737d62ea6383faedec75a4f156330e893
+EBUILD certbot-0.21.1.ebuild 1521 BLAKE2B 023aa5f5a8ce9fde2fc521880cf6d6a4992bf36ec4c057df0d78811111be786dde21598d374b069021ac84be9b1adff567c07b582a4756a5d3e2385d4d9f4a8d SHA512 72897b2d8a3256d5ffb5fe11fabccadcc13dfb4963f3a8030dbe19d942c97f6d26225441467a8ade644fdc732c7c4dd737d62ea6383faedec75a4f156330e893
 EBUILD certbot-9999.ebuild 1521 BLAKE2B 023aa5f5a8ce9fde2fc521880cf6d6a4992bf36ec4c057df0d78811111be786dde21598d374b069021ac84be9b1adff567c07b582a4756a5d3e2385d4d9f4a8d SHA512 72897b2d8a3256d5ffb5fe11fabccadcc13dfb4963f3a8030dbe19d942c97f6d26225441467a8ade644fdc732c7c4dd737d62ea6383faedec75a4f156330e893
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.21.1.ebuild b/app-crypt/certbot/certbot-0.21.1.ebuild
new file mode 100644
index 000000000000..10f9b67afa20
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.21.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v ${PN} || die
+}
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 6d22571fa0cc..2db0e2693d97 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1450 BLAKE2B d1508ad41772d5a810359de3dff95d908ce95c86ac56fb6b08a97030deab83b04f583ba3ea6606323ff737a39f4f468f44458f3547c1be8c9ffc9d72819a045a SHA512 ad0a19964ab7f9552c6ffd288577be8b717d094046a0dc4ea60449ec78743ff01e7fe9ae46244644fd27956aa73c7289220d42f1ec3904846b1fdbddda749daa
+EBUILD mhash-0.9.9.9-r2.ebuild 1438 BLAKE2B 0722da99796190fc4b0240f88486e5a35d080cec1ef56a425d754e2d55cc800de9065a11892e4b33ab599b76883a0678b5c78298748727ec66c556687112f08d SHA512 9dbd5075d99c23f9274cbbaf5bdcd13833f0c4c353796e888b64fbcf7e83c39f67df1d270da65e139b42a75416fece6a5e16b4c643602debae6dcae897e5c92a
 MISC metadata.xml 325 BLAKE2B 07d8e2f3ec1adec0b16be91a853079e875a3d318fb47ec60e43a6ea87fbbdbbf5f22ec364af47ae311070081235752cebac0fbca30785731cc4b924a9a14edba SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index 10bc239c95b1..300d6c81abea 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-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 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="static-libs"
 
 RDEPEND=""
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index a57ca7c66567..12e43d786480 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 907 BLAKE2B 9545c0daface9b30fd991087ec9a90fef82d02d43dcf68db05eedd8b6ae18fb2de9d7efa6e18f92416df3a0973b6dc7acd9d74aeea9d6b8779645bbce65099d0 SHA512 2d6bba56beb9065d1e213ac8175792461007869aee551a875759d65c51b719927a1b2d136206c22a8199a80d862143b65db25288b55c5aeb9f1050e9f278c010
-EBUILD shash-0.2.6-r3.ebuild 935 BLAKE2B 9bee662dd576e56e0a119a15f59d554e9e050e2930dfaa235490cbad0dfa713059428b3818e01f15b95c51e35c11a1a30ce48268c81b229e3ecca07ab7a69b45 SHA512 631a3f5eeb582c67b32568a9628bc2f7c2379d1ca91ec3f42719dc286ab2fa949a22a8cd6953655b55d852f90c56f0e7fa7e4a262553d80e7e7b417215e6746a
+EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
+EBUILD shash-0.2.6-r3.ebuild 923 BLAKE2B 5b41073761b2f723dad67298cf38adffc6f26dc421bf754b7dc7e389f11413aa2237bd513fc5ad92e830d990776ce98c09be92be9ad85900bc76da4114040970 SHA512 a75a9b80eb674812cf64cfc4ec2d69bf3aac8b6393b3e91132e10372940128cdf32777c131550f448ab3123a7fc2c32d8dad7a5f9411094190dc3444b029be66
 MISC metadata.xml 437 BLAKE2B e63ebd159e39421a74ce18c4623827dc34092a226ffe079becd58894f8397d111a6e7425e3b91a52a406d38acf81aa6dc9c799e88cda229900e5c85a19bcc745 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index c8774700c9c6..2c8f45a03e6e 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.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=5
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index 139c18088373..44336b6724d6 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-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
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index b6ea9ea9c94b..d08081e675c3 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-af/Manifest b/app-dicts/aspell-af/Manifest
index 7c4a6b660cd1..4efb5c279930 100644
--- a/app-dicts/aspell-af/Manifest
+++ b/app-dicts/aspell-af/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-af-0.50-0.tar.bz2 256111 BLAKE2B d2f5cfb6d1e3f71319283d1487bb27765daead18a9b709cb9dd0b58b0f1579649cae3d1b59e4cb28c470b1924bf670e3c89f75a1abe7fa02fd4ad779750647f3 SHA512 8ca7b892745bebe5dfda1319141c5efc53fbad1444066d585cc2d6479c51c85c31307a6977a0647b0c4add4a5b7baa9adb370996e25db4e1c98f1c10991fd649
-EBUILD aspell-af-0.50.0.ebuild 306 BLAKE2B b22d9cbaa01538febb00606346a158cf4492a6e1ec35361a1b6abe8e132a8aa78e7ff3f962d2cdae86483116565e8b2cf747bf0a137dfecae2d6ffe055a68c18 SHA512 d682271ab205fad835b8ece4bbecc241f1238fc0897378331e086b35adac7fd55c07a402edd6c0d88915b962077d0df1196d6c5d4331d8a08346e7cfa952a284
+EBUILD aspell-af-0.50.0.ebuild 294 BLAKE2B e3ac2abc18fa1b2354bb19546e025e04fca4ff5cc9d2802df1b1cc234d09940d2a7cb1180178b0f1730939e50d29e77eb13f8a659f3fdfd553dc42aafc0a46e3 SHA512 2e70789e53d6ad1b8e63eb8f5314436988099266a23d5a2473a2b6a222122c049f67bba33447c439e5b61f58cfbc35d9daae875d6b52a49d9e95527d0f1b92a7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
index 8e455326f150..b05a2281825d 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-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
@@ -8,5 +8,5 @@ ASPELL_LANG="Afrikaans"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-be/Manifest b/app-dicts/aspell-be/Manifest
index f9a074ef5acc..8a43b20ec202 100644
--- a/app-dicts/aspell-be/Manifest
+++ b/app-dicts/aspell-be/Manifest
@@ -1,4 +1,4 @@
 AUX aspell5-be-0.01-official.patch 506 BLAKE2B 0172ae29930012aee31b25a227765dd01d7656a0c27b2dc62d306e5e4693682123ab081878fa8a78b87f4dcfa9355bfb62e6874a7ce111847e84c448ca7a9b66 SHA512 adf3b65dfae9de761d6971e2894abe3d97b30bc8185e2039128e501fa097dcbccb140e740cec2bfcde3d47b010f5bcc359f8b78ff31eed7d3da0b6edfc265c22
 DIST aspell5-be-0.01.tar.bz2 653405 BLAKE2B 7a7acadf75a754fd389b1bda94c5a437ba04db01beaaeea8a2cb2a3eba276150f680983e8292d5b80f3d5134501bfefad8538d96d2a459eeb698f0cd5f2a77a0 SHA512 320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022
-EBUILD aspell-be-0.01-r1.ebuild 519 BLAKE2B 14a2eeef87e47c52715e257b237c1f57400de45bd0a6347c58a7aa368e130a0e500de30c89a45dc93b9330b98fac59f3eb92a0e5ecc0cb530d3b14096796199e SHA512 1b9fd0c3d7619e4bb44ca4c481eefb4e7b7677507de9f19f48e92ede5145b8cca673f25e632de902e17d0127cfb6f3af76ad58a0fd410252fa36394777121b32
+EBUILD aspell-be-0.01-r1.ebuild 507 BLAKE2B d72eb50c6cefd591823781508a71cfe2399fb1458e68a367f02b0fca7770921a26cf9bb69ada7138aaa0ef150961491be61acba1adfce1d3ab24e92f25c4628a SHA512 bc254db72d9d23f6d0e60ef2270c87a17a3ff0e99013727a905ed39c2ba718b35f41672ec56a94c4f26020f3c1a874a6408a2ce5c49e8b6bd26012981cd4164f
 MISC metadata.xml 244 BLAKE2B c544a3cb01d4997c270248b3f9a06d9d45d0d4196e2215301b17404870dabfeecdd7f42a3dadb25015e039e759fe59d90c3ab59b5b8baf076fbcab236564003b SHA512 4ef4e5c63d3c90792ac5dfa5465831bb960292260a8b93401b6087fa7f31f8ea0e47cba61beb73df46b8e8cc40676c3e4bcd8e43b8333ff5415cedd03c7b74e4
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
index ade8ef097491..0a67bf10a774 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-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 @@ inherit aspell-dict-r1
 SRC_URI="mirror://gnu/aspell/dict/be/aspell5-be-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="classic"
 
 S="${WORKDIR}/aspell5-be-${PV}"
diff --git a/app-dicts/aspell-bg/Manifest b/app-dicts/aspell-bg/Manifest
index c29fc620948f..ff178077b3f1 100644
--- a/app-dicts/aspell-bg/Manifest
+++ b/app-dicts/aspell-bg/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-bg-4.1-0.tar.bz2 138940 BLAKE2B 5a694e3ffc89bb6f3254c269cb73730bf725a39661a1418f54ca85f845292b6fd7aec948df38bb4fe954946be65adfb162112cdf68b5808c017af75188bbfa54 SHA512 73ba292e9e78be21a9bd32d802a3f87b5b8200b64fcdc6e8bb47c834eb9dfd855a3397e8deb83e7879dc0dab7b118ae117832032fb9a450976c929bf12926881
-EBUILD aspell-bg-4.1.0.ebuild 323 BLAKE2B 9d98f2c13e01d10e60cbb52831496d556dae8c4fc88bf9700c588a5379d6ae220823dda4d27f2cbf3a3a4424335c8705e840eba0493f67e7f56b6b29a010b885 SHA512 39ebbfee324836702cde65c0cd0ce1d4ad8b912d4906b90f76c2b95a3734e8c3c4e1fd4fe73d30fa0295e7beeed0b5e1af88d2bedf645614ecc0501d42242863
+EBUILD aspell-bg-4.1.0.ebuild 311 BLAKE2B 3c1bc64680ea30cf9feedb7d68acc1810cf0c814dd78d01b6bad2b10e73629b307b23fc0e38c18e8871f453fa839422eed6aefff2939b082feadb386762f875d SHA512 5f51af4f2acdb91245faf77062c3b1cc7e5804365cb8f4f46c0081fcd61e1b9b08e7727dec6285a660e6a3914af75cc8df8f70a4927830ddda5b19a5e9f0c686
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
index 82cd9be40d99..8542657dae46 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-br/Manifest b/app-dicts/aspell-br/Manifest
index eee5d5f48dd2..9e27277e35f6 100644
--- a/app-dicts/aspell-br/Manifest
+++ b/app-dicts/aspell-br/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-br-0.50-2.tar.bz2 68055 BLAKE2B f301543386e81bb14a48c22f35897ae9cce296719a501ffab92b733766f5078b86dc1f70ea1eafe851e569e909b73d2c7ef473647f8a4be7bae35e75a9e7ff76 SHA512 02f2ce7a350adb87a0f32dd4748f067230a0f3faf195f8c7237bc0520cc0a7aa6475f96de933ae650611f8b9a41deaaeb57c2228ed95950a41e5defccba9e67c
-EBUILD aspell-br-0.50.2.ebuild 303 BLAKE2B eb454472e0c6744e6876feb00ca7d5da68699be490a8a8deef2a61f9cc1c269117d07fbde1738d0c043e8099ef46a9ea3c51153136fe99789b8c55426b3ad764 SHA512 ec86611969091ada30fa1dea711e47b7bd2a804e1244c3dabfbd5e1987970036a16280645ace9499fbaaf3c0b9b06c680972d25473289e4633b50198152290a2
+EBUILD aspell-br-0.50.2.ebuild 291 BLAKE2B 053bac9eed673663e0192e4ac11333ce6766b45fc5ca992d1975c3b20c165517f7425dde5a8c4aac4b2c08b6dcd80ed030565ca192e4292e9ee0434d0eacb9c2 SHA512 9cb205aaed441a3a0e0dd35ed59eebe90d5e5374bc5a51a31a58bc285303daf4f4469322db0f1009461085d22ce94b3733ede2f1af69da8d132521dcfcf983ae
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
index 9d77ec995967..57add5a98488 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Breton"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-ca/Manifest b/app-dicts/aspell-ca/Manifest
index 08c29664ca2c..642a90413475 100644
--- a/app-dicts/aspell-ca/Manifest
+++ b/app-dicts/aspell-ca/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-ca-2.1.5-1.tar.bz2 227561 BLAKE2B a7b26408eb583ca56967508f00d9c617e6e4bec364f6c807813d5f6485c549b9b62f02ea5464c32c3b3a84477d8fb6e768c11fda7d262b56ff0b24d57e19fde0 SHA512 9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a
-EBUILD aspell-ca-2.1.5.1.ebuild 321 BLAKE2B d963a282aa8df771d001732d9025e0b9d870fb4279541ef592d614db3c4f6ffb9a9e789508ec99e938cf6dab7aaacad172c36ee926268724f48ffbfab74a79ae SHA512 30fb41168c6f17af4fc0832ea8e9d4659cfd7a77129186279dcd9c0d15709c21364dfcf6057afd1353ea52ba388db1ed51162c6e727f0126dae8883b0f0768ab
+EBUILD aspell-ca-2.1.5.1.ebuild 309 BLAKE2B bd7f3b2d1acc4546db9a34bf4df97b9f3f0ebb5d9ee8c0518377e823cd0398cc44f5eb90d6ede8de1a7456c6f31e27a263e047ea8a460f58aa93440092e6acf9 SHA512 2ef8511f8b2902ef072a23b98e009b4bf27663442ce4ad30822d7f493650a98eae10e81a10cf74cd8caa85f3e34c52893aa6fef1e0a245aa84f5ac663d4bba8e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
index d94d2567f91e..b3e1044a9340 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.1.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-cs/Manifest b/app-dicts/aspell-cs/Manifest
index 1e8472526798..a8fde2e9183a 100644
--- a/app-dicts/aspell-cs/Manifest
+++ b/app-dicts/aspell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-cs-20040614-1.tar.bz2 451507 BLAKE2B 7a7c910fd52d15f9513e30db5ed6ed7116d92ce02c401d8f11222e64c1ca6aa332cab3152b3b27904bd59fb542e957517b52f2bae1878c17652a17f575d3e6bf SHA512 b4d3e46907a00c7de4d19766dc29f089ec119b736de1340ff5f56be9d0a1c8c90fa2b156173f312c13c589750ec7551e79bd7aa092d31fa6d5f05ed0b4b12c9a
-EBUILD aspell-cs-0.60.20040614.ebuild 426 BLAKE2B 1d7a6c4b0a6d72058dff3a1a72952e080452cc668a4ab8932993aa694db5aa10de6c41f37f5d089ac88b30939ca19dee62634a937401a80a28ee5dd07915432e SHA512 f3381e5b9e38750d2bed9bcb42c71effabefd328492df45c01a6521376d7baf6ee8d9b35307432fb01567fcc138862b3236785b208e8e86ce778651d363082a9
+EBUILD aspell-cs-0.60.20040614.ebuild 414 BLAKE2B f9b454362eca4a6c228c6517b05e226fa001c09b2fd6f2f6b7c7df3ff041ddeed12dc956a47351e41df74e3b58e121d5539529bcba5a65a2010c0af90cad9891 SHA512 d66a4f283a5688825b28c2f5cc9111dac599701d86113c8c8b714833be36594f51e12c2cb4ff69770af9a2a74ce674ae51edd319d413159bda9f0e95fced4d7c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
index c05dfaae6ca2..8eb7d9e49ba6 100644
--- a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
+++ b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.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 @@ MY_P="aspell6-cs-20040614-1"
 SRC_URI="mirror://gnu/aspell/dict/cs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-cy/Manifest b/app-dicts/aspell-cy/Manifest
index 8a16c493f6f3..36242e75c5f6 100644
--- a/app-dicts/aspell-cy/Manifest
+++ b/app-dicts/aspell-cy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-cy-0.50-3.tar.bz2 117652 BLAKE2B 68abfa88829f8574229bbe35626bc3c7df7789e063abe9c70c054212bbf159ae704f4a0204d63e362d49582c2300d0e2453d486c7bba039c8141f93232a38045 SHA512 feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b
-EBUILD aspell-cy-0.50.3.ebuild 302 BLAKE2B 99f80fe84f9b6c47b6e4a70a902852fca660ac7835a236060667d335153fb6b081fede2b73f407794989205f9f5e9a07244d3307539ce07515bc0b217c3da499 SHA512 35bca3039486fa996c3f3f2be3db656d6de18b3d0b83bcbedb83f6a2bb610d250ca90cc2b19cefe4cd500257a893ae6eca81a319feced9dbfc437de0d89caebb
+EBUILD aspell-cy-0.50.3.ebuild 290 BLAKE2B cf51fd22e71b300cab5369868814978999ea5a82fb435ba0c4931a49afe43e0ce4c945c42370c3706dd71d4894d10571a674829b6501753eda84dd9f4c2c8842 SHA512 7def922d1057f2dafc4274b3b47ee15fc94fd0ba7880a818348fbb876ea8dcdc0184149b946402fac6fba77e3f830f4c5dd1d461a05d4a78e4af19d902994e44
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
index 13df5db42bf7..b1de268550bd 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Welsh"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index e47d53e2d918..2159b74cbd6b 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,3 +1,3 @@
 DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
-EBUILD aspell-da-1.7.42.ebuild 429 BLAKE2B 606ebc12a0b787e380016000152bf229c50e31a0937dbdd3828fab37fed24ff5e4b904ed047d8edd1eccc3cf97a9cd123b26f81a422bdedd0e6819d0a6250f5d SHA512 af66bc00501287c871297aa01c0fdfc119d21c113d4e30c1a1f65ea71f05e063a1eee9b1b033d6e16ef5007439fcb97ae4fa3de85f52edac4a6a7c36691c8e09
+EBUILD aspell-da-1.7.42.ebuild 417 BLAKE2B 0a5ee5e86d67b982c1374ec34e52aff700dbf95cf6017c7d3164f74dd0c9e65c8cd22a3a7ed84b09e450e2271181df7043e6cb3fc861518a584b98c9c65737a1 SHA512 4870e8906b5fd6fe83da96405b9497d1d9134158121c561f5d77755eb0806ff48904365f8deb458da70f4d11dcb348ae70a49d92c7c481605ee9bd85b6bbd6aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
index d724c4979677..6aa816b27d4c 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.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 @@ HOMEPAGE="http://da.speling.org"
 SRC_URI="http://da.speling.org/filer/new_${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE=""
 
 S="${WORKDIR}/new_${P}"
diff --git a/app-dicts/aspell-de-alt/Manifest b/app-dicts/aspell-de-alt/Manifest
index f4e8a1c3623f..70dc19b64b3e 100644
--- a/app-dicts/aspell-de-alt/Manifest
+++ b/app-dicts/aspell-de-alt/Manifest
@@ -1,4 +1,4 @@
 AUX aspell-de-alt-2.1.1-dict-name.patch 1843 BLAKE2B c465d3ff766ea3749011a7ea0a502284e1ba31112cb21149edbf7a909cc4e45bced0ee165649117038a1072cd7d5165d89f9ed17237fbf1ea0b4942a0e54bd45 SHA512 2ad6133fd907cfacb1d33dad879c0b101869b9ec67f33d3689052c5f25a35244fb98e19ea6105f5c8f000ef3412fcc567f1a242decf7eee0ff29784d22d040a0
 DIST aspell6-de-alt-2.1-1.tar.bz2 247116 BLAKE2B 45428b341fd7d2cdf098d6d85956b8e41794ad7a725cd7f3c703bcdb9995c6c18f89e78f06ddc14b7c570b21eea4d72e944ba293b2272d8c5d5a2a5447427327 SHA512 823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4
-EBUILD aspell-de-alt-2.1.1-r1.ebuild 487 BLAKE2B 85e3023caf6b22437c30a25e767178050c0f71982f522a9fd355335968ac114d43f4bf39f88c750ab81b2bda367e6766d0e0131bb97e470d8acd961b76df017a SHA512 b090f358789c5e588f7c1cb244d2cbe871c9d7bcf2391467d5a1d111ec2a5d49d064b823fa350ec15aee8cd748071a038a7912f7a38d2f1de0994736cda191ce
+EBUILD aspell-de-alt-2.1.1-r1.ebuild 475 BLAKE2B 5e72064aca9c30ae500d5e48d7d6266dd788c33ba48cb6f8a5149451af2ee75575aa878e521b6180618eacbcfc9a3561ff5709e17a2870ecac92d872da5353db SHA512 a158330a6b1485d727afbba689624fc60c73775fc8109795ca1cb5255f5e7c9ac232280065b5ff18c8e7a38b9647aa690ffcbc4c3fc796a9a9655eab0fb4077a
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
index a67e49d53e56..af3af00fef72 100644
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.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
@@ -9,7 +9,7 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-dict-name.patch" )
diff --git a/app-dicts/aspell-de/Manifest b/app-dicts/aspell-de/Manifest
index 158b29700024..9f2cdce6e772 100644
--- a/app-dicts/aspell-de/Manifest
+++ b/app-dicts/aspell-de/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-de-20030222-1.tar.bz2 274407 BLAKE2B ed69c0a3c1e63599d99a811b7b2d54c5dc4699f776d4c97fb5d295250df64e6189378c2bdadf8ce1b38a5a49046020b220e528ae69f20be01af5f771dba3bc37 SHA512 2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6
-EBUILD aspell-de-0.60_pre20030222.ebuild 488 BLAKE2B 7c10c69aea8fdd464f36c1663e92ca7edb7eadfdb2cada0e02d4f8041c0a87d1468aa7bb89b684d14fe8115ff1213d420bdac20cbc5c1fbe78c0e3fad1f5c48e SHA512 e534d1d07bc68c452e65ea7384e57dc6f3599f6e44ad56d11c7f9da0e822a0f5d34a12d0cd0d90bb4cfda3569050582952e03edb402bd593d9fc90c6fc84cca6
+EBUILD aspell-de-0.60_pre20030222.ebuild 476 BLAKE2B 58799495658273c127f70cdc2015c2525341134670b61251cdcb097f53ea93a05f1a08ba0cdc0ce52eff1dc7de79cc91035a75152ea4847ee0221414f1a6a469 SHA512 07d9345b2aa8bfb22b51e3ccb23bb7079cb8c4f839099a248400d6bd4cda2ec54fc68a429542d79d10cc10e5af7769e575312e7449d3bf0e215ed8ab6b032967
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
index e29ed33db8fd..626832fa9e79 100644
--- a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
+++ b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.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 @@ MY_P=aspell6-de-20030222-1
 SRC_URI="mirror://gnu/aspell/dict/de/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-el/Manifest b/app-dicts/aspell-el/Manifest
index d44e52cccdfc..edb83d15dde5 100644
--- a/app-dicts/aspell-el/Manifest
+++ b/app-dicts/aspell-el/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-el-0.50-3.tar.bz2 328225 BLAKE2B c032ad4c549cd2ff4d3dbc2cd142f6405d339bccb4040034ca225203666da8eb7c9b153a9ee58472dba6c3de5dd9e10dc338c4e46fa27e7cae3225ea8bc0b79c SHA512 405a21dc3e6ad04ea7a6b3ff69fb77382cc8f20b95e9c1788ec77a38ad1d4eafabc3a5e996a68cd5a2a385927244a2cf81cc5dcc68a1c7d42fc31a95d9068cfc
-EBUILD aspell-el-0.50.3.ebuild 302 BLAKE2B 070f69ba72b8878e4453fa89f7a2d1ba0a18e4b2c2e0ac18cd0aa98ee18ac53bc562f934fe1455f23ff1bd7b9271834262cce1ce6147bb8de7330db7a2366c3e SHA512 f95ba9329f03d415816c1840ad40eefd1ddab77952e77c7b8ea85740fdc705d4133152ccfd0ceef321f063fa59a656f081df6bf607f7b6f48fb0d0ad95c51b4e
+EBUILD aspell-el-0.50.3.ebuild 290 BLAKE2B 0ed26327b5217240facecd767147202f30d2487b410710c12e888ad0655ae7893cc8532b5b4c6a275df60c966e3a4cf68f162b658a442e83e98a626fdcf0a3f9 SHA512 40ba45908aaf2cc50ce8df5a04e95c35a1f844f8b5d36bf83583852615e7ac351f991dec499de2f625dd7a947f5b9008f91dd159ffc28dbbb6fbd65918b785b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
index bb0bfee24209..b6763f48f91b 100644
--- a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
+++ b/app-dicts/aspell-el/aspell-el-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Greek"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
index 42629c22954a..aa8580c9bda8 100644
--- a/app-dicts/aspell-en/Manifest
+++ b/app-dicts/aspell-en/Manifest
@@ -1,5 +1,5 @@
 DIST aspell6-en-2016.11.20-0.tar.bz2 184650 BLAKE2B 2ece9532bb14243a1470048a16f29df2e90fa6f9399c9c66831f7f4a743be8d6c257a3cd36e5b506ccf8968f03cdd0dd785302e135007e9dd23f8c58767f1d39 SHA512 acf4c0bac9dba5b001481da159768ee65decea480c6c601ca0733091558406a84a7d8efb47c1806b032d8e22e96927787a29f8e4e93563a01361e4cfaf3a3519
 DIST aspell6-en-2017.01.22-0.tar.bz2 184409 BLAKE2B 8a2e214996f412943581a2ac31c315e585ba234484b44d7563b27338dfbbc2947d19854fcb5417736a1c32b7fd8d6b033efc86d2a6dd81256218a72df09eab86 SHA512 2721ffdc7f2823b9104a0d7cfa10d1ba9581432dcbb2584b9519e56a621520177eef55ea5bf9803503c429201141ce0ed4001e75c6b9385bca2fbf8986617a66
-EBUILD aspell-en-2016.11.20.0.ebuild 631 BLAKE2B 75326f7d72eb1666fa2e0af08c5b7cf6da6df2af893b56bb2e02f5351fb4bc6d01f7462bb1fc4daff70622a259bf79b0050183e8f3177328ed1e2efb45d4116e SHA512 754d101913d31a03e81b59303e1f1ed4e16b596443cac29232dbf0d2c925071985ac2ab988c4b09a1d9802d0cb8cdc62ab057e9245ea0968af5d0ecccfb55c26
-EBUILD aspell-en-2017.01.22.0.ebuild 640 BLAKE2B 82ff97efa4d97a73289e6ce0db1362dbaba896145162dbaa6bb15c0d6b61830816888668bd7986e937ba3d7753b5cdcd8269bfcfe3971ad8a88101fd18e5bbc4 SHA512 1e29b2777fce78206d200ad848c3990031fb252f45000872dab0ea29cb1a3c362aac1158edcf95d887d1b6be3e4e75012a2d6cd38cf44d7ca6189c7dafadcd76
+EBUILD aspell-en-2016.11.20.0.ebuild 619 BLAKE2B bbfa3904504f481ac4b91a975ef362b37e150ee9c322279f5cf34164feb1cbc1dd85901df3cb53cc02f70152cecead50221417cd259667517ae3cbbdf54e4120 SHA512 b01e5c39dfd3ceaa6e4f9c3bdd50befb65045d22aefd65aac848aba1abd9d4aec7b126792fab417c831c94ddefe3013c5b22f7f0657294be9260e6d157583f35
+EBUILD aspell-en-2017.01.22.0.ebuild 628 BLAKE2B f3fd0e118d12fd561ebb8aa9380f95106a5db2a5b67ded343c390e7dc97553cc9e0bf9449168e80bc1ef5192e412655677e6f4496af47b6a8a8d3677f9af8512 SHA512 1acc4bbb00700bcf2e555e742c419caface629647409263782f9ee0669499bca3822fa3913fea935998bf2f2df74bcda6d2cb38efe3b07669cce197c5b215836
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
index 92ecb8d907b2..de8c3268a4fe 100644
--- a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2016.11.20.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,5 +11,5 @@ inherit aspell-dict-r1 versionator
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
 LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild b/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
index 1e8780872766..c97317a58443 100644
--- a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2017.01.22.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,5 +11,5 @@ inherit aspell-dict-r1 versionator
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
 LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-eo/Manifest b/app-dicts/aspell-eo/Manifest
index 388b3a0818fe..3c7045db0230 100644
--- a/app-dicts/aspell-eo/Manifest
+++ b/app-dicts/aspell-eo/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-eo-2.1.20000225a-2.tar.bz2 71591 BLAKE2B 3e8624857ae9c7a1256849dfe65a2b5a9de396516973b3e00075d5bdc507598b414ad745df41e2f8b746aeb43d0296186dd1b8163af84a0bb709ac5a2847cab9 SHA512 172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda
-EBUILD aspell-eo-2.1.20000225.2.ebuild 487 BLAKE2B dc335c6e604a0f590b28d9d2d0eb9becc7e42925506da99003ed76b30759c8aa7b8a8ac5bba36b30bcd35374e2a31a1f62b345f633ca41c62df9dbb40e859df4 SHA512 fbe03e50cbf7cd6779ff0d6c7c84040c30f8a57a80181fe490df11465e9f26bbd43d0557ee151405040e2703c2a714df254519d2e365e438f672bcdc79d1e4cb
+EBUILD aspell-eo-2.1.20000225.2.ebuild 475 BLAKE2B 6f6eb78a9e4a0d4b0dd99bc632043fa3458262b1307bb59efab993094c141584f82d612d2e5be441345191577d68b15b3be40679a9457f62dc8066139727093b SHA512 831a315e96a20091cc07dd341160db067865f62d4c8528e31517ae303eb7ad2e85720809e57352a81b13cf9627327a17c5dae507847a009fe7cc045b2a88b159
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
index 32482c0701a1..b4d83f953113 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.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
@@ -14,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/Manifest b/app-dicts/aspell-es/Manifest
index ee1a7c4f0e23..eadeb1fa48e2 100644
--- a/app-dicts/aspell-es/Manifest
+++ b/app-dicts/aspell-es/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-es-1.9a-1.tar.bz2 132542 BLAKE2B df33c5c38633573b1616c480c2df4b53bd1b6afc6d749f558c22d56482df9977cc5aa366a0e9a7b5b1bdfc12b92bf4e38957e23b3bf8dca38b0dfe00824ff365 SHA512 7ea228104231a4af395787da41eb14f27b6b864f1512c9ccb72b5f19b4327a0e4ccc37fdc31085b33da83a0b3b45bfe608f0a1361da8297dff2bcd96096f4c06
-EBUILD aspell-es-1.9a.ebuild 444 BLAKE2B 9f0db54e419bdd061666c310f1b9a5db4e2e7af1dc403b667ab53bebc947ec079a22ff122ef14b35143cecc07d72e9001431f1129fbfae1f17417b355583200a SHA512 bd0d1ee42127f6e152d0f9e6ccf98a0ec8dadb73389632956570a037cbdf91d3a555f40a1ae8402ef4cd0098b46e9c0ec619a972f24f254cfc0cac153275118a
+EBUILD aspell-es-1.9a.ebuild 432 BLAKE2B 27a68be2a7669a73a58845728a48bed6912e9478840cbfa1b8855a3231a25515a3e4672df5f7092a4e94169c504261cd3fb0f55e26ec86bdad38b425dcc81c55 SHA512 e5cfd21d6da9b2dcd1f8f00baf31caeaaa05c48ec5b1045c903aff98459b990d62b603108332dc8aea0a82f01096e218ec7e46168a95909c80b17f31121d4806
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-es/aspell-es-1.9a.ebuild b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
index 388fd6eb1a98..d8ae5c99c2ff 100644
--- a/app-dicts/aspell-es/aspell-es-1.9a.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.9a.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 @@ MY_P="${P/aspell/aspell6}-1"
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-et/Manifest b/app-dicts/aspell-et/Manifest
index 7eff41f11abe..39edc223ebc5 100644
--- a/app-dicts/aspell-et/Manifest
+++ b/app-dicts/aspell-et/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-et-0.1.21-1.tar.bz2 338155 BLAKE2B fb6c1ebe5d63d88d85935675c6f78ae8dc55cc4e0dda2f18370813049042fdd356343b8d98faebe788732c1ae199b851afcfea30e8734e3167bb00579ec08551 SHA512 b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae
-EBUILD aspell-et-0.1.21.1.ebuild 322 BLAKE2B cf090c1a93d186f8ee95a3c53a4448832dc5671ad19f207310993950a8679a9d5a28701103ef29bec4f64f4c1b58ad288d62bf1aae3e0e9744d2a014fc6420c8 SHA512 7233d20684041ea99b2485b0f0683b0fbfd45f3525f3247673c2cf9cf93b184c8e5dd30c6e78732e45a8ebad0716526ef612dd21a7c179e208a8111a2825e97b
+EBUILD aspell-et-0.1.21.1.ebuild 310 BLAKE2B ff4172ccacd777212d711e7f9cca1722dcaf19265a15a0d6c107182d9c58171a4805c679509a8fff98b7df0d9736887c3d2e547e92701d4ccee80e0b2da0a01a SHA512 568d302ba4b1b86b0ae6a2e6aaa03e577f7acfe92923287aecc38781dbd744b56f25f15ec691fd9aacbd594460e9fcfa128beeb22f53ec29fc690625185eb0c7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
index c20d374204a4..fd36d838091a 100644
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ b/app-dicts/aspell-et/aspell-et-0.1.21.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-fi/Manifest b/app-dicts/aspell-fi/Manifest
index 3c1cc5dc0b31..bdbbefd6eec4 100644
--- a/app-dicts/aspell-fi/Manifest
+++ b/app-dicts/aspell-fi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-fi-0.7-0.tar.bz2 209249 BLAKE2B 89b5e385f618a1aabbe0b3e688bd21cad1d15ff9945f61048d72a8d59dbe7551c6314de16dc34249370432459483b7badeae606dc48380d345aa977136c0a4ab SHA512 d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7
-EBUILD aspell-fi-0.7.0.ebuild 321 BLAKE2B ccc24ec9f8bd12d6a9382e883e68ec3db499b691db2a661a58ba818e2ad922c2810a7de7be9a468822c57f23cbec8dfa9e0a5be2216d29754ac5f85d38f6382e SHA512 b57d3319c3b96e8f38eab491f07649c694c6e080c5449227238457ee034c93e633c90c3c6bf3c16b7be42ae4272b816e3eb4aaaef7f95659d5f4a97c472600c6
+EBUILD aspell-fi-0.7.0.ebuild 309 BLAKE2B 48b75454aaf532d1305f85c25a27b1b51fcebd4569b66d298f6c1bca72a9ff0d471b05b80133a97468fe69bf090d54806092501a1b61d5b2c561d432f4f1ecd7 SHA512 b300e2142dd67bca5176967b294a7adfc9104207d9f283e72b444c8261d0f568f1b5f54bb72eec835f7e7963f594cd086171a302d96d9bc4b9b219d235caa425
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
index 0f04f182080c..c75b86e7294e 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-fo/Manifest b/app-dicts/aspell-fo/Manifest
index 4203bc7818d3..545abca699ef 100644
--- a/app-dicts/aspell-fo/Manifest
+++ b/app-dicts/aspell-fo/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-fo-0.51-0.tar.bz2 161169 BLAKE2B 2d607954fdd15c07c425b6d53bd10e0226193f45fcadf56b4eba1cea81bfb569519e71295a54058164eb8762fb5e9db8846410a01b009278393e78ee94081fe7 SHA512 8177e302816f0ddf05653656d07489be02dd5d12eb178f5e627034030f38e9b612f41a49fe4a1c092bfc3d6edc4dfcb0ec8326005251a3b36f80e1ca234d4c28
-EBUILD aspell-fo-0.51.0.ebuild 304 BLAKE2B 27692f104935c67488e803bbb0d7ffdcad8f9eef4a27e9b2b2c4e39a8d54de9e4bd83eaa7942062dbe68776752772ba1322b0bb1d062ae4c3a3be41c6bff22b2 SHA512 e032b7943b517d5599e5107a3f0fb2c18ce7640f578c37524f944dbb9b3dc6b35ebb296bb4afa00f91e6e70dddc02a29f13b41f208219c5ab9fba179f3a53891
+EBUILD aspell-fo-0.51.0.ebuild 292 BLAKE2B 46930b0ed932dd10c56232bc2435a48184858a98c9778d4d23937c13bd7ed676803f2c77e81cfd4de664f8f5722ff3dbcfcee8efeca87f94ee943a7f2cac0890 SHA512 839daa8af7b744cded3fe099f5f4252015abdc391dd7462f094e4c0641760e10b32a3c95b79eaf59a38f7e002a7a20f5529313b83975c2e84e743407d8bedcf6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
index 39b3d98e62ef..8ff848bd2ce1 100644
--- a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
+++ b/app-dicts/aspell-fo/aspell-fo-0.51.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Faroese"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-fr/Manifest b/app-dicts/aspell-fr/Manifest
index f2532d3dfff9..5036607ed8f1 100644
--- a/app-dicts/aspell-fr/Manifest
+++ b/app-dicts/aspell-fr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-fr-0.50-3.tar.bz2 283086 BLAKE2B 674199a56d676ab65c414741e669b099a0f08f2010f3981caf30daff6726e516586aa771190eebf83570093c28a8732761a9166f587a933860a037f1dd561e0e SHA512 bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b
-EBUILD aspell-fr-0.60.ebuild 565 BLAKE2B b3fa054e2fa87163680c0544ae26fb5baeac21812d580cf5c639c3745ffa18f3b20ce4b341bff1c66b57f66535ad2e2b3bf1fd23d5ce35f40cc7d02c9fad3848 SHA512 b3c546644aeb310101ce7a6d6d8d5f6d6ca8683df4634a0dd89d4ed5d4e048ef55b44b4369f9d4a5c18d3852bf0972c4339467faf5ba20eeaa33aa08a56db22e
+EBUILD aspell-fr-0.60.ebuild 553 BLAKE2B 1470cb73cc191bc21082b64cef8cd570e6bdd7163c11d74e549e66a13adabb43970188cebc6fda60cdea58043fa306f07a8c452a4734ddf8e00231fb3ed61ed6 SHA512 a3854a09e71fd00f8820bedd3d78df21ff7eb8ce4f0d17cb0b1ef4823a9313d1a0f3fbd0f8887910cee02c756a8f12877941bf1f1350de02eb53c1b35188b3e0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
index e257c729d34e..93b3cd25bcec 100644
--- a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
+++ b/app-dicts/aspell-fr/aspell-fr-0.60.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
@@ -16,7 +16,7 @@ MY_P="aspell-fr-0.50-3"
 SRC_URI="mirror://gnu/aspell/dict/fr/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-ga/Manifest b/app-dicts/aspell-ga/Manifest
index 7c0a93a5d146..4eb40d0195ca 100644
--- a/app-dicts/aspell-ga/Manifest
+++ b/app-dicts/aspell-ga/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-ga-0.50-4.tar.bz2 394776 BLAKE2B d065dff80c1405d48e39d22e7f8ca789a264763b1caa978a1dfa568b7d5d4c2382bbf5e1cf3626905a9c1bda37bb9389868fc944027eaad4e47b31a452668fef SHA512 631d4e8a6088633be3863e04818b576af861bfbdb90b1641f792c74ca1f61a7d71b1167ae5585245767d628a44e215c2804dd4c2b050c279ee892810203fae0a
-EBUILD aspell-ga-0.50.4.ebuild 302 BLAKE2B f2f472998987a18f538ebc14b3715844f8e17bc8b9b0c591c192b86fab2ca69e765ee4371e97b58345a76570775dd03b2838d5f0eaf1ab6b324d147717863e54 SHA512 4266414bde4fb307c0aa52d17e08a041396ba03fac979b0aaa27f93fb5538fd39a0ee52fbd709d3f1131a073bc1bf47bc966b2882ead3267b3f8eb09884ec495
+EBUILD aspell-ga-0.50.4.ebuild 290 BLAKE2B c9f7558915ee4bf4c8c7231829930057c3a008d647209a84d7620599740d64d89c2ca6c39a67417752507f8badc9655e8f7421d7c8d141c5b0f2526e14680c54 SHA512 992b5937e10c41df38012629fa50eba60998103e23252ed983c9bb5e2fb7b44344501668a9846d20a3000ffac771b455ee0a1b16b25295f14ef697ffb64c6ac0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
index 0123d2fbb8d7..35256b300ec3 100644
--- a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Irish"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-gl/Manifest b/app-dicts/aspell-gl/Manifest
index 4048456dac63..3473edd7f3f8 100644
--- a/app-dicts/aspell-gl/Manifest
+++ b/app-dicts/aspell-gl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-gl-0.5a-2.tar.bz2 80043 BLAKE2B 9c2c4601695e5fa5b64d0047e942f797bd37e2c2245421cb3a236a52fd64ba3524e1131c6e0e1deca777cb793d03e786ad4ad8804eadafe3bc17adf779f4b074 SHA512 9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714
-EBUILD aspell-gl-0.5.2.ebuild 486 BLAKE2B 9d5a0fe9382f2f23ba8ed5afe605fbc90553ac20a713faf1ed76a76d1f3776225bdef16ec58fe504e5cce19a6ee96921c2a1a787ed929a2d46acf6c6567e8374 SHA512 009975859c876b50d136c6acab9089c7f25dd9d7b80d9e8aa49273c719d7a049ea0a705b369a57d5827909644637137ee4acb987febd35070eb7313e8c6238c9
+EBUILD aspell-gl-0.5.2.ebuild 474 BLAKE2B f4de1ae2557922afb1695e17d75189fa9079b775505de16a92ed65dbb530c914ab5529e44d64d35c3244ff014cbf12bafe2f280485e8cfdc11a4b5531cc2e819 SHA512 a1ac16270f69b8710e13b16d8bfd0ecd10cc801e123e77cb4c59ace87f13feadb1436af2f587646f95bce0fd77c562482a9e18bb66988d7fd9e4ef442fb9eb11
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
index f9b68e210f0b..b7e89a02bb88 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.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
@@ -14,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-he/Manifest b/app-dicts/aspell-he/Manifest
index ebf0d9840d93..689575586623 100644
--- a/app-dicts/aspell-he/Manifest
+++ b/app-dicts/aspell-he/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-he-1.0-0.tar.bz2 122781 BLAKE2B 24df4f12d3dda89e6654bccdfb4290baa883ea21f761046129a4baede917f2861b829dff93349b9ab441b5c2ef556702a0ebfcdf682a8e7ab00c746e2f9d9e1f SHA512 4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88
-EBUILD aspell-he-1.0.0.ebuild 320 BLAKE2B 1e64b2fdeaaf978135eaaf80fc3c2c731660df235474eba44352a86ef79a2496faa8f381e13d2c13fbfd813580959b139a3cfb3583828e1b644abd5763dbb08a SHA512 50914f659fd13f4749481249070ff460743a39108f9ea6d77b8fe2a666d5a03f9085c66451e02097179cfb6e69c26fc8828b74dc69422c43631212908e89b0cc
+EBUILD aspell-he-1.0.0.ebuild 308 BLAKE2B ce7d78f664a9389605b6cd030ca1f7739afd0dc86fd44f16f7173606bddf0f01fea21be96350df680fa1868d3746b740ee57411a806fe8411efc9777e1ddbc46 SHA512 1b6b0189a27e644831ef575d96a6fab818d1c7e6b5a81d5ed7bb907aebb19fe0b905e7a37700b5056af13f46269727fe0a7b8316ee69a3284ce149d02c7c3e85
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
index 3e0f1eb1573c..fb0da0d1207b 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-hr/Manifest b/app-dicts/aspell-hr/Manifest
index bd8f2dc4e163..acbe8c8c47e6 100644
--- a/app-dicts/aspell-hr/Manifest
+++ b/app-dicts/aspell-hr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-hr-0.51-0.tar.bz2 208118 BLAKE2B 34328a99833dbbdb1e14e5d66c3870a576fd137d38711fbc1c57738057433d1eb7a996dd32ae87942d8bf1c3efd4dbf669d4d5ddc83764caecb8ce36fc2afd3f SHA512 d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad
-EBUILD aspell-hr-0.51.0.ebuild 305 BLAKE2B 3d652b14bf7b5b07fe95e66ecb0f3ff17d9e19c78dfc23d78a25a746b943973486d5c83d3c92d8c094898d30862b3289c4f28e6386bae9190ea8e0b9209e5295 SHA512 d3db371b8096fb7f3ebc2acf9f55a788a59cf8f996dfc91cca0ed63267dcc5a6156260af35f83f71238946792167ba979ddaf80f2c7abdc3f174ea50540b7064
+EBUILD aspell-hr-0.51.0.ebuild 293 BLAKE2B 94c09ba89134004d6983966d5027412985e255055b68ab4f6ee0dd05751ba6d39a1b2194669eb8b882a292cfaf90d2ab8248f361b4face1b4bc631b1c7a80876 SHA512 c6f7ebd2f9d6118484eedccce1d8ef3c67fe26af794c352cc62ddaa03bfd0f5cd34fbe6b5c380fa861b3d20295166c29cb4fe17eb1cce01cac3f5f1c1c2200ef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
index 9c5aef8cb87d..cf9a479afa52 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Croatian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-hu/Manifest b/app-dicts/aspell-hu/Manifest
index 8eeaef7a1217..f094e32c6705 100644
--- a/app-dicts/aspell-hu/Manifest
+++ b/app-dicts/aspell-hu/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hu-0.99.4.2-0.tar.bz2 375949 BLAKE2B 933844253b8280d01e4f37f141e566548b3eecfdb16a2fcfeb026698d64667faedeae512d582b7ceb900753c5e2b1fba6b474bb4d85e598c432d0ac0010a9d31 SHA512 95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320
-EBUILD aspell-hu-0.99.4.2.ebuild 425 BLAKE2B 320daa55d93895ffb1d9ba1c5b0d111f5111244ce9846488f1f748e01e5fb8eac1d213535f6430aadb108c16e8b716540aa0c09fcb4f674ee88a84f47ab41c48 SHA512 4fc5d5e5f956a4b0b852d6084a2a769bbb371ec8f00bdb2dea473af70a0ea1ec1b35c42bc1114e2101afecc4e0dbf50f4030c25c6c63e81dc05cc114776f9c46
+EBUILD aspell-hu-0.99.4.2.ebuild 413 BLAKE2B 0ec0153cfd235ba1a0131674e94f364632d650745420ebf0316693bd2bd97013a7a3d46d8a39b2ea7b7eccb96279b17aeb50b728106ab22e069ebe1ab63c2e71 SHA512 e68be386f2a731d54aa6345ca777598c28eb732031954b720f788bff028bcae205d4775d6423cddf942d0efe4b74d1f9c65547b9e3d209584293e786ac7274ff
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
index bc85dfaf86bd..4c11f4b34414 100644
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.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
@@ -13,7 +13,7 @@ MY_P="aspell6-hu-0.99.4.2-0"
 SRC_URI="mirror://gnu/aspell/dict/hu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-hy/Manifest b/app-dicts/aspell-hy/Manifest
index 9db51152b410..a2d61fbe3a63 100644
--- a/app-dicts/aspell-hy/Manifest
+++ b/app-dicts/aspell-hy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hy-0.10.0-0.tar.bz2 191872 BLAKE2B bb74a82446b35a487bf61c27349e9c8c047bf9f9e12cb48b884b7aeb19eee4df7c7e4efb86292338540ae23d4081caf88b63409f06617e6a6da82e9bf7648957 SHA512 b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3
-EBUILD aspell-hy-0.10.0.ebuild 420 BLAKE2B f84b300bf1a257ce69d1cf73ef6dcf37027a85ab6fd542c26a0f0c9b0038c431b727013789463a6df25ac7a0fbb2ac1fca0dd7c3fc1b81070d65da0b2b1947e8 SHA512 9b450f11a9196616fdad65aced6be6846fc18d4fb2186295eeaf9b6e224f3f590522129317fbbe055494f26821ef2d7f81b3f50b18ab3fd45df37d416d4ae347
+EBUILD aspell-hy-0.10.0.ebuild 408 BLAKE2B f7fcf4a26670cf5978915122a290702d8f83a1f6d9cf62149c0888298a8650fc51b4062864894689fb29b3d4ae1353c64d4c61294428c9712302741d650cfa5e SHA512 8270ad448fc705f9e6e98467c9c3d746f0a4550fa2e0f194ef4f7d182559222519f0e9f12a720dd13e5e13e31ad991d2d5dd95e5766b3eaa5e3da01e5e69f2ab
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
index 6709d51f3d83..87ec14d60c22 100644
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.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 @@ MY_P=aspell6-hy-0.10.0-0
 SRC_URI="mirror://gnu/aspell/dict/hy/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-is/Manifest b/app-dicts/aspell-is/Manifest
index 363937ff5a29..df15051b120f 100644
--- a/app-dicts/aspell-is/Manifest
+++ b/app-dicts/aspell-is/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-is-0.51.1-0.tar.bz2 323850 BLAKE2B d3d15c594380ae173f94862eedaee8255a0d98f5e6552ea24fffbf0400d88a858d6d9eb56b35a314b3ae9440929eb525c41ea57f99c43dff0032da68ab8ebf95 SHA512 b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2
-EBUILD aspell-is-0.51.1.0.ebuild 306 BLAKE2B 83e3f3732b8fdb74e6e6eab56ab21d31edeae28db92a2723e02b93c783c729cd25767cf0df7e46da642126649352ab709bb211df79a530a3e9aa5a265705ed05 SHA512 b0701565e9ce6d7ae79dc8c6e8dda59656a32f466efe9b3707b60c228915eb864d1bfd2bc54b624182c8ddf4dac4bc9d0703e44e138790e338cb2771118c7412
+EBUILD aspell-is-0.51.1.0.ebuild 294 BLAKE2B 695a84df5ede4f87d30f3769de003229a4cb0d807b498730d1a5efbc4f721360f305066dc8279d62fa0831b468a538ffca6a4ba22f29db28275a23a28a83e2f3 SHA512 1404973d9e71da03a519060417fb84ca01fcca4b6ffed516f86221a64ddeb2e695f3f382daaeaae42372ee3b357db62e3eb75b3e0ebbdce527ea3bc29d949314
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
index a9d8dc22e041..53f77a4fafc2 100644
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Icelandic"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-it/Manifest b/app-dicts/aspell-it/Manifest
index 7e2cd1d1e2c2..c25b8d2f8e86 100644
--- a/app-dicts/aspell-it/Manifest
+++ b/app-dicts/aspell-it/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-it-2.4-20070901-0.tar.bz2 261419 BLAKE2B d377690df133647c8345eed4178d91c03a2a6813f444833ae5c78a0960577fa2d8d259a5b04e053770e2df832260ae817c387ddd814593fe2e6ddf5f95eb50a1 SHA512 6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9
-EBUILD aspell-it-2.4.20070901.ebuild 470 BLAKE2B 15d5a550c773fe73fb851af06e3d22a2da18d91b2c434a1a10adbab65478c8ab197ec699d369dc0d93b9e2706168c4c7afe82eb73a47ef09f0ecd34f61c5e922 SHA512 044ef5c781fcaa46b9896f158cea97d7646853c21b8c1bcaaf289f7e2fc7706cecb4157e8a4d3d04053fdfb7c4400d85dbce8168afee6a5ef8146f49b4b97f45
+EBUILD aspell-it-2.4.20070901.ebuild 458 BLAKE2B 04eeab71978bc44c620329f201bdc91f42ab2528ace9aac693b7d2f45f552f44dd47fe71fb210513191b50c82f39a58c1cc14c111c2763264fe04a7180ae6216 SHA512 4912a3406bf271331a58dabbff738e0f955f7b84ae06cc84bfb4ca83085d2994e785239bd7ac71057868fe9d3d2beb74405f9de674822e9f4e9d02a3fca4651e
 MISC metadata.xml 248 BLAKE2B 2c1fcd90482f1cfffb25b908862709cebdefed604a40a5611ebd3e8831829c1b07aab4911cb5962aa9bc0587832d8a01ed43558a6fad30feed29b9ae0ff97161 SHA512 1d44fa5baaf032845df65374a83f1eb1459100ced59d260a19456fff81ce7dc1c074cd34b1ad37b172af7cdee476fe0de39aa3a280e311816dd8bdd9c98a61ad
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
index 110de34f83ca..1a237ac5f188 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.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 @@ MY_P="aspell${ASPELL_VERSION}-${PN#aspell-}-${PV%.*}-${PV##*.}-0"
 SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-la/Manifest b/app-dicts/aspell-la/Manifest
index 3885e66891c7..54d5d523260c 100644
--- a/app-dicts/aspell-la/Manifest
+++ b/app-dicts/aspell-la/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-la-20020503-0.tar.bz2 42722 BLAKE2B 344e4cbf586e93894be20dff7ba44f79d775abe27b3ae3624fbdbc0d4f22c916b6e518bfd0c1d37d69e09d8b9acc50a32622013ecbda5d7ca2ebaadc07358ee6 SHA512 b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f
-EBUILD aspell-la-6.0.20020503.0.ebuild 426 BLAKE2B f4891ba14c75f56ae8996127f57bb283611dbeacc93d175b20e0abb29b06c087dc93365d4f288e93748501dab511ac8beedad32a2e92c64c0660849a19dedeed SHA512 01a91346cb9131814b68b3cc0c72b2881bc7b87585b1b7979380904931d25541e32d9a10fefe60aa76f75334aa1c07d45e0bae03148e6b16613850548df61962
+EBUILD aspell-la-6.0.20020503.0.ebuild 414 BLAKE2B 12905549f32785884806377c67a024c6f7a2f99e525b97c7ad5432d0b7c0bc7555d348dac9c10c4761d184351e2a17a5507cc04525d5adf8f74bf39e587ecd84 SHA512 6c27c91793406f94bf14dc116f3234066a66236d87b97656b8dab798055d1a5abc822f6f90410faac66d7b8cd95bd5b3b8c5845799a4fa03c72826dea7accfbc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
index 4f66e8d0d681..bc0d0a95a3f6 100644
--- a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
+++ b/app-dicts/aspell-la/aspell-la-6.0.20020503.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 @@ MY_P="aspell6-la-20020503-0"
 SRC_URI="mirror://gnu/aspell/dict/la/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-lt/Manifest b/app-dicts/aspell-lt/Manifest
index 386e837becf2..afbde113ce95 100644
--- a/app-dicts/aspell-lt/Manifest
+++ b/app-dicts/aspell-lt/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-lt-1.0-1.tar.bz2 155409 BLAKE2B 5beb2cad8c018dcb5b06701ec467464ea2b472c9cebaba966c0c495899de11c0b1fac29cf3d359cc1b8bf85fc890172dcd476206ac7b5b6eec99a619055ad34f SHA512 478acf95f4a7f7a705ddf481650a35f565b200886eb6b42bfcaa4669021b43a99e1f06ca3459d60afbf4cc0b3d111e9394308bc1fc6ec2ac920c9e7aa7f42b31
-EBUILD aspell-lt-1.0.1.ebuild 428 BLAKE2B b61985cc8939ace4092416d5fb0e4350339eeb60b1091353be425e2b6dd1d7779474cf92c77e182d6eb09ec823364cf2c5edc06ca5769aeb0631a91bf10663a4 SHA512 e88e00e58fef7cde007a678e62ffe8f965a13ca93dc6ca59a2b1e6b9463f80d464e3c36aca66aa13bc5b937502fd0f6258d4072c1048a3d96fe2bce4a7d09f5e
+EBUILD aspell-lt-1.0.1.ebuild 416 BLAKE2B 7728def977a62eab3b42599a911d2c5db590e26e797c4b99fd6e81a052040c82f65057fa2563972f9a8e03b46620041da08ad6ce039fd4cf1d2fe8eaebe4d1b6 SHA512 38918a2fb3e25e1a0fdfce8bfb8a35afebb180df4b075afcd5bc79a66b22f69643df08377de01e6044ab194dade395b67b95b12ee832533addcb73044ee5b52c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
index 3ddd9a934db5..8f1afd00dd33 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.0.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 @@ MY_P="aspell6-lt-1.0-1"
 SRC_URI="mirror://gnu/aspell/dict/lt/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-nl/Manifest b/app-dicts/aspell-nl/Manifest
index 9748c087924d..01bd2f053334 100644
--- a/app-dicts/aspell-nl/Manifest
+++ b/app-dicts/aspell-nl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-nl-0.50-2.tar.bz2 428365 BLAKE2B 91bd81eb0925994961c8f11b28b74a87ec4dd4d0b03db4f6e4510329f3da9db7d50b93398f3bfbca0a33b67e8ba3871ff868562bc95028b40d8efcae2d995e99 SHA512 bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152
-EBUILD aspell-nl-0.50.2.ebuild 366 BLAKE2B ae64c89953f54739dfe857f909121e5d57cea3df6ea6eaa2a83e712bf0041bfd63b3242ff7e9ea64f93f54564b801275b2054873d6007950733ba4c3a15223db SHA512 ec65b4189ce69428afa5bd3ee44276cd298a572e2d633daad4b6595b2e11d74022091fbfd16b802081465da447209ee6666d9deb8cd522d980ee456ed579e757
+EBUILD aspell-nl-0.50.2.ebuild 354 BLAKE2B 73b76d79ffb53e561b03f6a59037722d52311ea2ffc412f21b05b08ee1d35236914ba1f05f638fafbbbe7af99fe9b98f41cce0980e5d52792524a6da220f6307 SHA512 bf6ba85aafe3d430f2094e12390be1854da48f4f225fb3d94b1e50d805063139f2293c050e79cd26c8ce13470226314150ea7ce07f04b3ced533f6a6de55affa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
index b0f20c4dc581..d21a77ed3ede 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Dutch"
 inherit aspell-dict-r1
 
 LICENSE="freedist"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-no/Manifest b/app-dicts/aspell-no/Manifest
index 440d500100a7..5a626f643d90 100644
--- a/app-dicts/aspell-no/Manifest
+++ b/app-dicts/aspell-no/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-no-0.50-2.tar.bz2 286696 BLAKE2B f5719a12cc3f139c53cd7cc5a9a0ca6841ed12e4ed3c5c000100c7b196dc896c1bf5c5514224f9fa5cf269f65e88e9858b9348db888b77661e51bf6c0e5b35c6 SHA512 b07bf649ffce60a5dfa1e771fa0669d246afcc192155be027ad4db7eaba8e5ebce4456d83cec2100020938cda87d5e194c68039df9d4fa726013de4b6d5f5e4a
-EBUILD aspell-no-0.50.2.ebuild 306 BLAKE2B 615e5a141a00f9bde12be8f19203f38af4d14656b2db3eb024e423e5973874e79d5c01c8736cf6cb777b61947f1771d0bf9fff2eadca690ccd9bd3e8fa201a07 SHA512 911e3c54410a9d749366beffe2d34a0e0c68c4d72d30e412612ea456118f7db38fd0742961055d153f839623fa1952c2d7162ffbbb1079387061697e9b04ded7
+EBUILD aspell-no-0.50.2.ebuild 294 BLAKE2B 987fdacf19918c033af2673590101e6202e0bf2ca6343e0b54ffff0ea3a5da8c1861a70db20e5504e9675500757ed898c218892d3b604101047941c8b8a6197c SHA512 d60ea59a30b128fae95455bfb106aae6ec5cde6b3b874fa944a3bf098f3346beaedfd81a1cf0a3dfc6401e49cc6b634379bbf56851c9c0c301c4d5f684736e8a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
index b1c5b8a4df1b..70d6161e8609 100644
--- a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
+++ b/app-dicts/aspell-no/aspell-no-0.50.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Norwegian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index 563b79b42c71..77c0bdabdb67 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,3 +1,3 @@
 DIST sjp-aspell6-pl-6.0_20120418-0.tar.bz2 579320 BLAKE2B d338a7b6cc804604e80cab20cf3b6c6d219377a7c4de4d513626e6b787b8aa32e4ab2a7925ea9bc1d0b224fc6770755e3c6ef3440a34c8adb187352b7e106c06 SHA512 58f6734d035f0b4831a7de48f4f0dc2394206e287cdefec95849a8a46f3bf2303f81228f24b52ace0a4f444cad2f354b30bb3598f3ff1930c17a4d54d808fe9e
-EBUILD aspell-pl-6.0.20120418.0.ebuild 550 BLAKE2B f66c62942e641d84515004c0b06a406f178108e73cd146831f566a5271f4ec7b221c82b817081b7ad61fccbf93426636114f38b4f7e20071ee2e6e40a1b50ba6 SHA512 897607ff92ea925cb10ddc038dadf5c19035dc201a89477e1daf24b63d78ed7eed4bd7db809acc2a4757a80eccb923b5dbbdfc8bd1fefe3c21e3de2b17982f9d
+EBUILD aspell-pl-6.0.20120418.0.ebuild 538 BLAKE2B 7e5c0d3bcc1fb74acb929853b0ef2c58747fd9b4ce45a60b745cd4b573b6ee7f74e91f24c66b4c043391fd915646103f7a336af1a1399d450fc50b8a054c837b SHA512 75f48206c39f323bbb1f7dfd5e87bb2535c3940e646e84617898ee1212563918236c3e5b42f0d12419825b8312d69939c0364b9071c37ff5129edd330e791a4a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
index 5a5785b6ffda..c6455af410a7 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.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
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.sjp.pl/slownik/"
 SRC_URI="http://www.sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-pt-br/Manifest b/app-dicts/aspell-pt-br/Manifest
index 96e9d1c81d03..d6ecccdaaa2d 100644
--- a/app-dicts/aspell-pt-br/Manifest
+++ b/app-dicts/aspell-pt-br/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-pt_BR-20090702-0.tar.bz2 865676 BLAKE2B dd98250d378b15f321850e88de4a464ffa5e00183fda06990be9132406be268bf5144d4d500836df0e6f1d8f1601d8a38f3ed96ca00f3d9bacb5398dbfa9a945 SHA512 4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1
-EBUILD aspell-pt-br-6.0.20090702.ebuild 513 BLAKE2B d19205bb174a87c258c9e0ed6338268705d6fef27486e1fea007039771c6396d35064b74fca7dde9d3ef9ace3ac2fcc86789e4f1ffd9c329bbefca780d8915d5 SHA512 a7d55700aeb3653958fb36787a7691c2a5c71c83294ec89a68ddaa093109fd087e5f436ebd62c83fd17f2ab87cfe0a11e6b80b15e28eadb5514607697941945d
+EBUILD aspell-pt-br-6.0.20090702.ebuild 501 BLAKE2B 32a725726fe3b4335451e94a3c07016eb6a38f79c5f4a3b8b245ec49706f47702d5997458c9dcfb9de1874e928717a0f4f358696f0056b1e2f42d5bb4cf7c27a SHA512 142416588236aaf77498a4992054e58381bfea1c919e4f76a0e58f19cba32bf04fb642b2feaba7e359de59b3bd9795d50e472a8d512098442280d2b7db339c08
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
index 34ca6d72f644..9eaddb36cd2a 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.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 @@ MY_P="aspell6-pt_BR-20090702-0"
 SRC_URI="mirror://gnu/aspell/dict/pt_BR/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-pt/Manifest b/app-dicts/aspell-pt/Manifest
index 2a4a1b88ec2f..efb9a2a97d6d 100644
--- a/app-dicts/aspell-pt/Manifest
+++ b/app-dicts/aspell-pt/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-pt-0.50-2.tar.bz2 201341 BLAKE2B ad924c197e7e72ea5be7a8f779fd7b144ac23e69ab6f089c338485c9fc4f5624a814b0f0f85d030647fe22e9390f03b873a05bd1cb26997986c30b5af0b10ef4 SHA512 21f115eae4507ca6e8c726476ba40910886e2ed17161cddbe493b2fe1c55a30703f033f8062eb0b9543d85541aa15e9ecab508cb3bb7403881315ecdb0bc55cd
-EBUILD aspell-pt-0.50.2-r1.ebuild 481 BLAKE2B 65c690bfea1208f8ea1d77b2d8381775a3ee39528f3936c0add8069f0a10bf1c8a0b7c5619ee5db8a6ec974aa3133892a37061e0d3a836816f483be32b4dda25 SHA512 06308bd58c8cc9edd92d0ec7587446bd40db072209a48cf4c4eb527ca275a4ac327fad6f8ad9c1554266d4621ce641f82c8d9ecab8fab36901ce63c2464f4830
+EBUILD aspell-pt-0.50.2-r1.ebuild 469 BLAKE2B 25223ab7c96a9ac1716282dff6d45b1eff1765824d3f5707bbb649497826d34708d32c37d4f19bb0b93a5ff27ad0d478997ca5ccc4ab40d3f51bed7a33e0c65b SHA512 4c4e74d221463695a79044d16d7974938b7940752fd472b1b44edbaeeb3f45e047e51d570aa51a7e2365b02b03311ff2bd40b605a1a9fac539ef9bbf82c15fa3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
index 5be881b7dc98..3c1e8a18170a 100644
--- a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-0.50.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
@@ -9,7 +9,7 @@ inherit aspell-dict-r1
 
 LICENSE="GPL-2"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-dicts/aspell-ro/Manifest b/app-dicts/aspell-ro/Manifest
index 16fa7c7a1fa1..da84dc0877ba 100644
--- a/app-dicts/aspell-ro/Manifest
+++ b/app-dicts/aspell-ro/Manifest
@@ -1,3 +1,3 @@
 DIST aspell5-ro-3.3-2.tar.bz2 444966 BLAKE2B 078a10fd3cdcc0771f48cfcaa606c626328becdb98ad8d53b31d2b08dd32d532caa5edcb1649900e29fddb81d960c35e6b6af74aa8e20b15c2f6dd3bf48b8957 SHA512 0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3
-EBUILD aspell-ro-3.3.2.ebuild 384 BLAKE2B 82bd565138a6b600c3baf7d980074a3b09d839258518db7a2f663b528c0f3757e15e7112a896d292d6e8dbd9718454362e5708825bb83e563eb3372aee2acc6c SHA512 07f65a9558025a44c810736f7d08c7041ef34cb1fcad675bfdced0326ce0afc7c2e81720dda19f58967f237997e16d68bb3d0048dac96f59a01d458df4c42c98
+EBUILD aspell-ro-3.3.2.ebuild 372 BLAKE2B 0f59d3e0de06b12bbf36cb935b8c89410f0c098d7e80a7375252c4867f9f75b50e5ca9eaaf860f499763105fb94b72252b459ca293b2b6507e522f50f6dd2607 SHA512 af08fb03724f1dd8d18d45667ab14a008c57b5e9fe38c4e1fb6af907574a662e8c36a283a1759d0a66e8be8c4df9082cd2c7fc549a92cf4f43680de623439367
 MISC metadata.xml 244 BLAKE2B cd51ca64142dd29c7b2538142821322696100f916c76acf1472a3fe8a955786d3ec5ae1cc5bbed2daf2fa40cb2239901d25b7c3059bc14aa1571796ca35b9f06 SHA512 ab747cf65f0d06ab770b00b35ac0da826824bfe088c30dc729ec32d3e1c3dd2d00f9d701a351fdb1ba1c02a16706076bcd920e2fea34758c7352320e186054c5
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
index 5283ef42246c..5c0bb468bae5 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.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
@@ -11,5 +11,5 @@ inherit aspell-dict-r1
 HOMEPAGE="http://aspell.net http://rospell.sourceforge.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-ru/Manifest b/app-dicts/aspell-ru/Manifest
index 2b74c9cdd051..5ca3b8f15c58 100644
--- a/app-dicts/aspell-ru/Manifest
+++ b/app-dicts/aspell-ru/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-ru-0.99f7-1.tar.bz2 427312 BLAKE2B e039744dff54dbad3dacafd63f5e4874b119b01da57929f403d535958b80b33e90a5429fdcfcc3d2fff2beb0e97e67fa0bd8af03c6a1ca2980d7c7718843c0e6 SHA512 789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430
-EBUILD aspell-ru-0.99.1-r1.ebuild 605 BLAKE2B 301ed0ba5e388fc1966358e017b9b1c31ead39090746b041af672ef91cfbbbcd871d4a2befca601d8d158698f93703825ad22c3fca6f927798e86bdc678bf33a SHA512 f2e94d2b4059a73fe54ac5c49d0cc86e88c57ed0e53952a3b790e1f47509d0ed0056432ffff8a521e67ecf6ebb1944a59e83f1470197510eff4895c4c7175b52
+EBUILD aspell-ru-0.99.1-r1.ebuild 593 BLAKE2B f0a2b24786be44e8514c9b5e2cb6a07c8312d474fde23dbfc46b7e3307948902e09519c4e42c4e8f00484d4a2de47ef645c7037841525bc1dfc752173b08d5a0 SHA512 3147bcb0ca1864094e82b68d6ec31a08e3b47f7407603db43bdeefdf0826f755487d99b9721bbce4d967582b2043e55012768a43ee926213acdc5b1fcf200812
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
index 793e034b27b0..201df4b33f97 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.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 @@ MY_P="aspell6-ru-0.99f7-1"
 SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-sk/Manifest b/app-dicts/aspell-sk/Manifest
index 80d2ffbe402e..91ca622142bf 100644
--- a/app-dicts/aspell-sk/Manifest
+++ b/app-dicts/aspell-sk/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-sk-2.01-2.tar.bz2 338933 BLAKE2B b306850bb72e8bb60dec32853afe6e7cd0796f92730e54ba25c6051c65ba5e53e1d5dcb091866adc3dd90d8013863b419d1c98f4e474f6b29754da326eb5a72f SHA512 020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4
-EBUILD aspell-sk-2.01.2.ebuild 320 BLAKE2B be475a9508bd1197b4181ffabc35802425dc4cf0378a0d75d299323e3779cf261d96c28df8dbd6b9283b990717279d56b80393001a8ae1a847d09fac8650d7d2 SHA512 afd3a8ce38ae70ac0e8e8850ea6e2d982118b986012c367d311256d5678628c973e9f78d9bc809a78574d8bc6a09b97e6cd9475cded3e20db962f01239937086
+EBUILD aspell-sk-2.01.2.ebuild 308 BLAKE2B 6eeb18029c98c5366b5b2231b515b02deca2583633366c1f71a84b5a86010d916a1557487c0c511bf63e89bf34d221920bf62e3478832a877dd4321425711c7d SHA512 0b0886d04cd07f59e3cdb0e3e056fff21ff61a080295bd0d8f36dfdde241317f0401f846deeadbb7d63befbe9fc71ab3b8373a7056a13e60ecef408a90dbbc40
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
index 05e6ae54302e..a466beccc0de 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.01.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-sl/Manifest b/app-dicts/aspell-sl/Manifest
index 18aebd83703b..9a85705dfc33 100644
--- a/app-dicts/aspell-sl/Manifest
+++ b/app-dicts/aspell-sl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sl-0.50-0.tar.bz2 215463 BLAKE2B d3583a18cd10d81a443938e8c1430061ad004c964fe84eb79cd721006eee7ae4c422130d8dbee6cbd588ebbec33fc766a0d19eaaa4fc4b5ef60357b6d96fb188 SHA512 17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f
-EBUILD aspell-sl-0.50.0.ebuild 306 BLAKE2B 8d7334ca3bdb17fbc9189fa6b786a9ec0702a9aad75a4628ed4c416c4178c98744f755950a051ebe8677a0d2a793de99d1e565b7df8a2c8988db5416131fd623 SHA512 ae15ff806c11d23c303214ae8684ce2b8661e68f00fafbe885c1b1107b73e4fafc72382509a70f46c2d46b47579966c066978ed21faec66ef99079edd5cbcd85
+EBUILD aspell-sl-0.50.0.ebuild 294 BLAKE2B 667cacca4b9d1d075433f8bdeda29fb25b6a0bb9d9e36f38a1a32145a493e7daae89f986a4d04eb962670961065ea9dbfd94ae0fc9e878fa623fdcf2a8eba53c SHA512 9c0b329e0d87a5cbebe61dcdda88a4e72940e13765b2cdf83d72090e413538912b0e900b1c09e643a0787980e88644c286273324a31494580eaee5c159e06648
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
index 6907222b301b..4603b96781e3 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-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
@@ -8,5 +8,5 @@ ASPELL_LANG="Slovenian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-sr/Manifest b/app-dicts/aspell-sr/Manifest
index eb36ac8be6e2..a8d1dc959575 100644
--- a/app-dicts/aspell-sr/Manifest
+++ b/app-dicts/aspell-sr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-sr-0.02.tar.bz2 574923 BLAKE2B 3fa85bb2a24716a51c33447fa15fdc833059d49db62f36d7f11dc21baa926c2918c869d5e7052f6d729c038af1aa1e12f47c6476349b6f34989c6fbbbe3ce34c SHA512 3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395
-EBUILD aspell-sr-0.60.ebuild 421 BLAKE2B 281da5b1c1cd416a4915ad15d1dd7e6aee85fb75687a6f1e904745790f8807b3e6bb313ae7370596548b6c4346aaca35bbdd3a8ef62e4ae0e38f7b5519d6e82a SHA512 214b194c5227daff69c8b4ead12d443f2567e2ab8537fdd2f840fc5cf60aabc87deacbe4e8044cadebd414d05d3ac0453b904aa23fc626c5dce81542c8387ba6
+EBUILD aspell-sr-0.60.ebuild 409 BLAKE2B ad7f76a390505440a00ed29a97e26b64ea61909e25a38709d10986127552a366fcd1e9a51b18dd2853cd81e7531155e5c3269dd61d73c6243943459db02d2af6 SHA512 7fd98d83aeef0d711a105d8b030110dd4b9561d20f15e3aef6ce5b690248ca6ce0221187bb659e7c0a803ce0785ba3af9f919d00fcd138ea379f1d38f4be0f99
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
index 5e495930305d..de7d122e577c 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.60.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 @@ MY_P="aspell6-sr-0.02"
 SRC_URI="http://srpski.org/aspell/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-sv/Manifest b/app-dicts/aspell-sv/Manifest
index 4281753c41f7..1b9de3d83e7a 100644
--- a/app-dicts/aspell-sv/Manifest
+++ b/app-dicts/aspell-sv/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sv-0.51-0.tar.bz2 93942 BLAKE2B d089e13e67849ef5fe51b7c7cae1c8e35e47363358842349118fec3685f987d3e87301942d16f95df914f39d1d7594f2f257596812c20cfaf1e728a2a1d12df8 SHA512 f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c
-EBUILD aspell-sv-0.51.0.ebuild 365 BLAKE2B 8a9dcdf3cf470d12e7a53b5133a25e11457b385f853dd6105aa8d379990b0f18d8bd3fec7c2be2e9352460490fc202ccd2dcbe2a7af4aa9bcf0643f3e91d33c3 SHA512 e70bae361d9fc11c2d1bbd40d663d3d0a802a62a2822726bb01807cfe7b753227739662043b16ef22785874efdab741c0b96e7a78e88ad09b9ab004374c1759a
+EBUILD aspell-sv-0.51.0.ebuild 353 BLAKE2B 730c22d24b5b2e0aa61d678b122cdb0f9e38329cde01e8652503f553f376a94f871f355817379f16322a2dab23cd5b55f55516b956163d2ab207995d38778100 SHA512 378b5a6ce17bb1ef7f880dc5e8c4a698709ef8159d74e071a13e305208896785e79092a417600394b6e2333e5dfa21c6228952e46ee2a2f5d9ccaf7ae796490a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
index 23e76f9d1e96..ec843d806e25 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.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
@@ -8,5 +8,5 @@ ASPELL_LANG="Swedish"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-uk/Manifest b/app-dicts/aspell-uk/Manifest
index 06ffa8dd3ffa..df09c746aaa5 100644
--- a/app-dicts/aspell-uk/Manifest
+++ b/app-dicts/aspell-uk/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-uk-1.4.0-0.tar.bz2 226767 BLAKE2B c91ef5132126b477a827b576005ede885932226659c96192a7a176f36db952c802550939dd659bd1b341442acfbd840a8811202a44f054070e9eb3d31ec8bb0f SHA512 2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799
-EBUILD aspell-uk-1.4.0.0.ebuild 332 BLAKE2B 2771494320b3cb6128d0ba67d6f5a024fd1caf75f1a103da7fccccc79975759d26288a8461f6b2c9d3f4592dadaad4bf45427e4951507b99ec7077c1e694593a SHA512 6f41f7a49a43eb4cdfd2f0466a0eb524e766bf071e2f26e1fc29122b77cedb7c0add170c5a6c9003998f08bcc6bc93d2734bdb91d72bbeb5ddf6469d4161d6c1
+EBUILD aspell-uk-1.4.0.0.ebuild 320 BLAKE2B 22f2e649e3f40d5709cefa1e9fc3db990c758a31a882a30197ac4c1d673b85ca7913fac31b4f953dd6183e1615cb47feb105f04f0221edea08ac8fa9797c19a2 SHA512 434d7e92d0bb63af0aca26b7528c1714da23ef266ad84961a554a15e7e01d52ccb5eed2f86b21c09289d4d1e4585b70f69d9dada8a2588ebf4cb3c56eafe8add
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
index a65be95f9bc1..e6d6236f2ddd 100644
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ b/app-dicts/aspell-uk/aspell-uk-1.4.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/aspell-vi/Manifest b/app-dicts/aspell-vi/Manifest
index e17a37946291..944e781745cb 100644
--- a/app-dicts/aspell-vi/Manifest
+++ b/app-dicts/aspell-vi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-vi-0.01.1-1.tar.bz2 30843 BLAKE2B 73bc289d65bd76d29bfb1db25ba9e2a8845997e10eea26d98989d7d3b3d8c78715e797ee6a726a02632150b744dbead32392199886e2d4f2732a77e686b9627c SHA512 d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5
-EBUILD aspell-vi-0.01.1.1.ebuild 324 BLAKE2B 26333ba6d33b24acf7ea9806147bb08b30a6596d204c33d6826d1e74024b26e159d2641a145268fbca4571f0a529524ff978dfdf5e309567544cadbe7430ba40 SHA512 662e05040400cf96ff331b7d521c330d7bc8abcfda60274588bdff1a9c56aaacd38a91a0041ec1b69bb8c7d9d6b3f6bef08755315302d153d03d09b7b437833d
+EBUILD aspell-vi-0.01.1.1.ebuild 312 BLAKE2B 31234244cd652b09c91c188bd6f70f9ff5c9cb79945c74ed3fd8ca7f810b51f67631dd9cb7d5264adba2194f5034d673f8792d0dda0f7aceb523cd89507b414f SHA512 4371936daa2fdba1b37d9a68acf5b518bb980a99219efaa045c6a91b40b77b39f4076350448d7bbd08713dbbbae53bc75fc8f4c278717da3e32c421828786d8c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
index d0b99923f56f..9372a23f3e2e 100644
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-vi/aspell-vi-0.01.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
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 34642a291363..bafab2577eb5 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/zsh-lovers/Manifest b/app-doc/zsh-lovers/Manifest
index 17845fd5fa16..604077a0a6f7 100644
--- a/app-doc/zsh-lovers/Manifest
+++ b/app-doc/zsh-lovers/Manifest
@@ -1,5 +1,5 @@
 DIST zsh-lovers_0.9.0.tar.gz 28883 BLAKE2B a9917c2441222ea27937e4bbcfc6ed4ab7594fb406a28bbdc1849ae6dae11fd924dbf50d97b65f4800b1d3ebd044ac6b1516b80924428d007e7070817a82ced5 SHA512 54e7465304313556f9299877314f18cef631c076cad1a8f3b1ce13a6e24dcb4778e852f0eec31bce62bad2bd9503b8741238f097be8cec541e5c4c8f08af9dc4
 DIST zsh-lovers_0.9.1.tar.xz 26632 BLAKE2B b5c5015e7e61c21452b688aa46529dd468beac5a034b844185e1a497778a1c83b9d8124551a7b0dfd0d441394b0bf71fe64f4af5af7add3956c0a2a2f79f01ca SHA512 16493f2ec095fbdb992188a732ca4205880fa10fc1f1ab6cde8cbd2a0977d95bb06e46d1635c0c9910c249bec024f3cd13a1f8c6597e5201ef8a26b80fac9c2f
-EBUILD zsh-lovers-0.9.0.ebuild 798 BLAKE2B 4acf9bdfce6284b18eccbceb91c0efb2e958190fc0a186528c99b41939dff71972527f0abafe54ca54a82ef94a6c653cee01113ee0a70ae25ea0223cd10bd4b1 SHA512 b7dbeb729e649d670a3eb999929c180c966e572e5931a964f4fb7dfcdc02ddf874d85b280eeb29e3de93d3eac3638f732181d7c533c6da3c4a5e2476f217b1d3
-EBUILD zsh-lovers-0.9.1.ebuild 767 BLAKE2B 1a5be9eabbf0963bd6051ee186c83edc13461c99c8b6f5700137219265555c51b0d4038307170a1c145c1707a93667407fb3637b79e71eee12c36c3e40701111 SHA512 cb11a5ba77689fb21e379c8915d99a9d44ae8151028d3fb3130851c27b3e0efe23a6dd4a5cb6f902a853d101c57a5d31e06cff5b569156f6fe00b3a5f9ce6b16
+EBUILD zsh-lovers-0.9.0.ebuild 786 BLAKE2B ce32b6606360d1c2da24543784d78bdcf4dafb6f3d858ac6ef5dfe6d994679e8402ce6915629f695c26f074e45266ca5623cc26739ee407ef0fe64454a9fc911 SHA512 aabcf1eed9aeb3a252d0ebe4e6a293640f172adb37461c47113aee58b81d1379734636895e8ca1abfb3b318b73d259e02ed7b07171da9ee9f9adcf3a421d5c7d
+EBUILD zsh-lovers-0.9.1.ebuild 755 BLAKE2B 9938b7bd1f902ffddff94af2841dc4445f39739624095e9fc67cb51c7dcf9d06a919d94efd3547a06ba3a5eb8c010a5773aed4ff1656e3d64a13dff24b942b16 SHA512 2335b7b932b6f1648ed3764dd8198b46f39f8943c4da4573a7ef191b75266ed3aa81be1266cf3e5233ce8ad3bd6b9eb101b3fd3f0f78f90ad29297445989af14
 MISC metadata.xml 377 BLAKE2B 6329163489737a50e5cbbf5fb0dfcd4099d97a5c675519bd86e80428aa51b89ae2c5a9329239a47a405bf6d94a61dce6f4e2acb27866ff708dc3fb4bce09d505 SHA512 b6b6d0907c374c74d7b3f3151f31ec989ce028d92df3d1d7f2e1fbabb6995ba27562d643ae7fbfd9102beb4b38fe231871eef46664e455ded7414bbfc94ceb11
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
index 049cca03b52d..9312e8261e2a 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.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
@@ -9,7 +9,7 @@ SRC_URI="http://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="app-text/asciidoc"
 
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
index 279cd66b0189..08c577d1925a 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.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
@@ -9,7 +9,7 @@ SRC_URI="https://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="app-text/asciidoc"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6959c1200492..1fc6d1337ffb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index 254fbedd8b79..fc7deb0e208b 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -8,26 +8,25 @@ AUX atom-unbundle-electron-r1.patch 1531 BLAKE2B 51f0072ad40e5d9268d9dbfc107201b
 AUX gyp-unbundle.py 3933 BLAKE2B 638bf2ad17c5e052c4b1972ac91a1d0d6b0d9d361cb0d04c3e732c892af54a30b099069ac4bfb0f8882ac3d049c25a53d698cc95aeb23a486d92284a1ac21376 SHA512 5de7aab9b2fcf135fac5429a2655acfb53ed40871ca51281be237393b0318b06339d20af196275bc48acac456eac61e884821da7abeefb9991bf2502d2835cfe
 AUX transpile-coffee-script.js 589 BLAKE2B 0fa75fef95437d8c2f3eb5619734b577f843bd11ca4cfe96174408315c6defb57352ea29a22b69d0d6f1e2d01f3515e65cde2793914c42c60a28e936046b0304 SHA512 383772d0a8df6ab3f4950dcda87eb21222d71463007e15cf54c768aedcdd06d4791bf92660c042542aaf2c6fe283ff33f8e6c60488907bd309c450712bb94496
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
-DIST atom-1.22.1.tar.gz 9541647 BLAKE2B 8801172da7b59dcf0974dc916e83633d52de8419b28db46578851d528dfce55b8dff1103e8e485a54203a7732e9288254d4d1b6ce1328d5e7340412e45fa14be SHA512 fb1a27c59ee6db8c659eb91fb397def3c05bd094b8a0614eb81a0ffabddcd61d480783f37af303773a9a9d15712630966ac162f3978e00ea2d8f8ef1ac78191a
-DIST atom-1.23.0-beta1.tar.gz 9553918 BLAKE2B ed44c6fca17bad667da145e1bcea17ae85330f4bb0dadf886c7b9ab929e3f580cb074532b0cc60f96d75d4d2bb68fedd7c25c4569983d008a024575a6d9b21e2 SHA512 3bcbe9ab9090eeb26cc6f121349c2c6bc4a3bdd58c36b7a2452320dde851bb0e2e60ed8040f406ed560cfd1a3cc217f220d98755ae50b8b81f123fca8e33bd44
-DIST atom-bin-1.22.1.rpm 129683452 BLAKE2B 7f408fced77dd1a965521ca7d905b568c2e5c9db19f5948a7c4c711372d53dfcc9b0988d5ec7c1ee748b1a1a3edc7c8e1e7cb919a223069263004e8683694404 SHA512 bd8305a36a8f6755907de576fe02bba64fcff08f804cf22f784323f58440d7c5b251d8da34c74a679c2d7f66b5afdf11c897337a314e829e2b5f06573ef0bddc
-DIST atom-bin-1.23.0-beta1.rpm 129888621 BLAKE2B f32ee16773fcf4cc956fd21adb6c3a03e2ba07f2c7ce4518e2f2721b1cf6051bcee01934d657ade38050b8d4c2049d693bf53ccb834301e71078a81d6f2e87d7 SHA512 44c19db7452cbbf704950e2ce3347fa52525f44563744860061fd07880a7f7eaa958de8c954b634df7055c26953a99321c1aeb332cbd290d86369d0e3a31ccf9
+DIST atom-1.23.3.tar.gz 9553983 BLAKE2B ed5f77a51fbbf7a5ba828f5c488b139067636865fef30c88926baf5855b89a7283a35de383cfc65a06391479ec70c067e8ddacd5132b46859b4d4c6ee5cf35e8 SHA512 879a6a209659b612efcef6d3cac9c218da033295b3cc915259e2d4ab51567627a2369b2b8630f6e8a4706aa7b4e0cfb7cc3a55b635f559c8a913cc19e702d524
+DIST atom-1.24.0-beta3.tar.gz 9550090 BLAKE2B e74923afb56573530a3297d7ce27197af478b2697f49e3d1d9d239e12281a43ab614f8bb9356451372723af7a2bb6cfe2dc21c2e672a321eeeeca6455dcedd9b SHA512 31dc4e9be108fdd5e770a21e94f1284f3e5aa3a8293bce542fbf5a449930bb4f9a3f2405653e27809ccb3d2395b9bf3e0e630b4b1d6c2f7995859b2af391c554
+DIST atom-bin-1.23.3.rpm 129956012 BLAKE2B eedb8a55955dbd30d85073e536435a6faa214e9f197acda4f3c7a46408ed5fdcff16141b28c519b1d1fc680d0a17f77d0f22ccb561eaea9665c7836ef282ab8d SHA512 f17b0edc33c537ced60360ff5daba44257ac2a85fdb8cf10e886133429093cbd99cd5835ea1ec451a2c1c485971dd5176585357b980d7dbab17f12ee0adacbe8
+DIST atom-bin-1.24.0-beta3.rpm 129894085 BLAKE2B 9c58bd91ed3d4c9eaf97de0b2ba168c1f4118890f40f8aa9c4f50a9fe24d614c1d52ce8d91f0efdfc8b7bb01891096d8e39a2e2f67faefdd6db33e0114288892 SHA512 a942732dfc975c44c3db11c8e43b88e6dbe247245947964704ee2ada79a8732da5a6f6cedd960556349844ca92333c3504541b300975bd4daad639abb3ce309b
 DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
 DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 BLAKE2B 9cf59f69c3433a9982c1dedf58c03eef5e1ccf1275f92ed192a2de601f38caceea5926e9b3a8571e2124b83e49c99a14f262db39a44732e1ff6550d6cd46d500 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5
 DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
 DIST atomdep-fs-admin-0.1.6.tar.gz 5539 BLAKE2B 9ee1857152cca343673a270c1044ad33a3ddbfb5b8389f2e0449e99348d0bdd4aaaa7e4c07bfb8871ae840f1a69cd90074a769f80fa3cc7f914050bc6f45b29c SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7
 DIST atomdep-git-utils-5.1.0.tar.gz 4141959 BLAKE2B 7504a4ba57b093da659ed0ba7319863636d7f9f1e9a6a4bbd4b6c6fcf9922c9ca32398b44550e4a94d519471ca5cf249976426583f998186398c147c6cce5636 SHA512 1f9c38646b25a526c0399d538e58864c552d65802402df82f8303a936374121db40f61195ea3254e56e31dd9d25b847b325264911f62d6beddfc24931a9367bf
 DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 BLAKE2B e86a399be545a43768a53d5d9279dae1bc4d87fd99af87a10861f2e3367d6786e3631f8dc77671b08b06e30290f2c97833402e3732a010ae31c7c1c02d9d6afd SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66
-DIST atomdep-keytar-4.0.5.tar.gz 15594 BLAKE2B 3ced4a3eca1036ce21435473d013bc98537959d8488425581089c230b3e6ce276264754c607c29adf9d9d6272bde10066b23c7de502030c35ff2a5d907b17a4b SHA512 bd4dcd75517c057bacfed57490b9c1614f52169cc786a167eb1b391bf83845b23cdc53e20c72e7902140a5da7f865ad8bdc2d456063ebc1b86f6cb9fa1178929
+DIST atomdep-keytar-4.1.0.tar.gz 8564 BLAKE2B 69b745c6afd22dd4ffd5694205294f4cc7985b9ae5df51e5c7671cee296a2d28732ccd453417eeb60cc66fdfd39247ee90205808fdbfbea8b5585029c22d4d76 SHA512 2f72aa89232da558ad96e838bae23e2b95cb9def52015105584f120902214221f4200fc24dba27e6fe69ad52ca2b429e9f9e28d8ef15f4771e29a829c09ba6f9
 DIST atomdep-nsfw-1.0.16.tar.gz 43214 BLAKE2B 261539bebfe494aad0b372f1837a87c7c2a410bb591df523ea25bd5acd008f7eb0e8460a218fd4ee70d98bc26dd166472e9ea0aea265971cf2e904da913dda88 SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a
 DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
 DIST atomdep-oniguruma-6.2.1.tar.gz 586350 BLAKE2B 65574ef004c98cced7a9f5917845015ccd84b2383a85d889365da5c73313114454458b441bf6588eaee2a17150d674b7754ccc0bbb2d68ae3d98f7d5ca63530e SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1
 DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
 DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
-DIST atomdep-spellchecker-3.4.3.tar.gz 480739 BLAKE2B 5549ca23c50efc4573cb990d8cd79bc564dd4890e8509915e89173c8cb49ed0f9d17ff22c73f61e00487f9a09de3e6b0de542a755fa3eeeb2cc8bd766016ec62 SHA512 cef2aa6adf95772f0d38760adb9a805ad540bfb422647486ccd63db7afcca508eb821b6099d9913912dd1b0881f3b5ccc62d203f2ce6bc47859f36a76c781376
 DIST atomdep-spellchecker-3.4.4.tar.gz 481892 BLAKE2B 3bae26ffffbaffdbac6f082c6f33ea4f5127583663e1df3ed8d98cebed2ce11ea0d9965615e369383695df6ad55aa996e8968e6616415d359ffae640a679f47b SHA512 974b3ce9866ce7e3f30137856ea0f4b1348c105edb833a94620c6b53cfa7052c37575f6dcd160a322fa10c61babfc32c916786d9d44ad10efdb2ab3578620ac1
-DIST atomdep-superstring-2.2.13.tar.gz 793833 BLAKE2B b5e8003c25ec38da1eae92022e972467b33ab45ea9db918a0acae6af10abb8a48609d76318558d327d013f65ea01888450ceb991dbfed39530ddd7076f1cf995 SHA512 9e2ce1ec9dffc0ccd700ed4b2f069dfc6cf258ae842dfe7a5242db99c0899ad77a692d2697695c3ca6d42cf4b9c590e9f29f469399d519029052b7ed806b39f8
+DIST atomdep-superstring-2.2.16.tar.gz 795922 BLAKE2B 58f66a51f20f11bd6d4335c945c5af2418ab5e210af989f9480e319a55cf273d63c97db2c5a32e8196dc06c14bbb552ea1e34d2e8910807f8e2d04925c953b41 SHA512 1ea105483032a5f6fb3b752dce33cef7498a9d597cdef35efb00ef26dba95c84dda863452eaa954d38c9c22510397aedfeed2ed44874560fdca4151d87d49e5c
 DIST nodejs-nan-2.6.2.tar.gz 161949 BLAKE2B f74e8d56e67ae03e60e0be7752ed9527bd8499c01f7df8899f3eb6735b1286633753e8bf595781b6d3d1446df20483fc0377bd745be10c6bae0ad66426751b79 SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3
-EBUILD atom-1.22.1.ebuild 14818 BLAKE2B 7c4c829f40c4128660bce776c35ef042cb723079d571cf3da483532553b84c2dd4803b3fa875dd59571fb166d6be239205a8fe8cb0cfb12ef26d13176d143c32 SHA512 95fe6e96017212b33e0ee66d1a52c13a635455f702aa3c243465283fdc91e54888f5d15dfd0fbb4abdb24118155575855f2403c34bfdbdf5aa9a51a28443f171
-EBUILD atom-1.23.0_beta1.ebuild 14821 BLAKE2B dc64da4d4a26854edcb2080687f90c2507fa562e27d3fdab19a78174810d5d44d945454afd543b2eceab5d32ebd7aafdb4ca43a2d032063a9296b7c295303275 SHA512 d5553b644c8292f55ddcd917136c309093b15d16b21bb9f5d02191385a407e2db856978dbbacfdc5f736886ee1474238d4cd3d2635aeb6eb9334eed6adce9ffb
+EBUILD atom-1.23.3.ebuild 14818 BLAKE2B 1e1d81e555efdc6e0ac073ece2b4c2d0128b3aee89c09656e9a58e00979b883d6d22facc55e51f34e38609412f6661780e54035fc312c797c69ed737190dfee0 SHA512 23a70450f5223b3e2f4b8a63240efdf5a6f1337aeee386c5848224f3963211621fde3fa071208d99c1d06def823c6001e496a6ac21e5cc399a80d2a29e91ad3f
+EBUILD atom-1.24.0_beta3.ebuild 14821 BLAKE2B 7d50260f0e4fa4ddf0486d694fb23c87ed049bffd4fdc424c30be7fc7fcb014298d2db907b999329d54af7f1b0481931981c11c318e9a79d6bb9b0b218273a83 SHA512 afa15e00d2446ab6f9104840641588977c0a9b1094c0df66fd00ec39514aed614c09f3c072a5d373fe8ed8e1d3efa01c48665e5e0f4d4ad8e3c257e0d2a1fc2a
 MISC metadata.xml 531 BLAKE2B 75dc8465fe585ee047f3e702b40d1e951759c67b28e63cbba370813e34c5213748529022dd3ecc8477bedcee3657f87ce162bde4984a3d4afbe2b2a200cc1060 SHA512 ba84d0e101f6d53dbd6abb0e441d426bfd04f890331bd5357c18d7a34eea903897a06d725f45d50d95a645018f5ba6b519be07b7dd1ba6cbcfb30bbf1602ff12
diff --git a/app-editors/atom/atom-1.22.1.ebuild b/app-editors/atom/atom-1.22.1.ebuild
deleted file mode 100644
index fbafbe5c1639..000000000000
--- a/app-editors/atom/atom-1.22.1.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-#       atom overlay.  If you would like to make changes, please consider
-#       modifying the ebuild template and submitting a PR to
-#       https://github.com/elprans/atom-overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.15
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-ATOM__NSFW_V=1.0.18
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.1.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.0.5
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.3
-SUPERSTRING_V=2.2.13
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
-	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
-	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
-	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
-	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
-	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
-	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
-	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
-	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
-	https://registry.npmjs.org/keytar/-/keytar-4.0.5.tgz -> atomdep-keytar-4.0.5.tar.gz
-	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
-	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
-	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
-	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
-	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
-	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.3.tgz -> atomdep-spellchecker-3.4.3.tar.gz
-	https://registry.npmjs.org/superstring/-/superstring-2.2.13.tgz -> atomdep-superstring-2.2.13.tar.gz
-"
-
-BINMODS=(
-	atom--nsfw
-	cached-run-in-this-context
-	ctags
-	fs-admin
-	git-utils
-	keyboard-layout
-	keytar
-	nsfw
-	nslog
-	oniguruma
-	pathwatcher
-	scrollbar-style
-	spellchecker
-	superstring
-)
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/hunspell-1.3.3:=
-	>=dev-libs/libgit2-0.23:=[ssh]
-	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
-	>=gnome-base/libgnome-keyring-3.12:=
-	>=dev-libs/oniguruma-6.6.0:=
-	>=dev-util/ctags-5.8
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-	x11-libs/libxkbfile"
-RDEPEND="
-	${DEPEND}
-	!sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local a
-
-	for a in ${A} ; do
-		case ${a} in
-		*.rpm) srcrpm_unpack "${a}" ;;
-		*) _unpack "${a}" ;;
-		esac
-	done
-
-	mkdir "${BIN_S}" || die
-	mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
-	local patch
-	local binmod
-	local _s
-
-	mkdir "${BUILD_DIR}" || die
-	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
-		"${BUILD_DIR}/app" || die
-
-	# Add source files omitted from the upstream binary distribution,
-	# and which we want to include in ours.
-	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
-	# Unpack app.asar
-	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
-		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
-			"${BUILD_DIR}/app"
-	fi
-
-	cd "${BUILD_DIR}/app" || die
-
-	eapply "${FILESDIR}/atom-python.patch"
-	eapply "${FILESDIR}/apm-python.patch"
-	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
-	eapply "${FILESDIR}/atom-apm-path-r2.patch"
-	eapply "${FILESDIR}/atom-license-path-r1.patch"
-	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
-	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
-	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
-		./atom.sh \
-		|| die
-
-	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
-			   export ELECTRON_NO_ASAR=1"
-	sed -i -e \
-		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
-			apm/bin/apm || die
-
-	sed -i -e \
-		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
-			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
-	sed -i -e \
-		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
-			apm/lib/test.js || die
-
-	rm apm/bin/node || die
-
-	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
-		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		cd "${_s}" || die
-		if _have_patches_for "${binmod}"; then
-			for patch in "${FILESDIR}"/${binmod}-*.patch; do
-				eapply "${patch}"
-			done
-		fi
-	done
-
-	cd "${BUILD_DIR}/app" || die
-
-	# Unbundle bundled libs from modules
-
-	_s="${WORKDIR}/$(package_dir git-utils)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "git;libgit2;git2" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir oniguruma)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "onig_scanner;oniguruma;onig" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir spellchecker)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "spellchecker;hunspell;hunspell" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir superstring)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle \
-		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
-			-DPCRE2_CODE_UNIT_WIDTH=16" \
-		"${_s}/binding.gyp" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		mkdir -p "${_s}/node_modules" || die
-		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
-	done
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local binmod
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Configuring ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom configure
-	done
-}
-
-src_compile() {
-	local binmod
-	local x
-	local ctags_d="node_modules/symbols-view/vendor"
-	local jobs=$(makeopts_jobs)
-	local gypopts
-
-	# Transpile any yet untranspiled files.
-	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
-	gypopts="--verbose"
-
-	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-		gypopts+=" --jobs ${jobs}"
-	fi
-
-	mkdir -p "${BUILD_DIR}/modules/" || die
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Building ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom ${gypopts} build
-		x=${binmod##node-}
-		mkdir -p "${BUILD_DIR}/modules/${x}" || die
-		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
-	done
-
-	# Put compiled binary modules in place
-	_fix_binmods "${BUILD_DIR}/app" "apm"
-	_fix_binmods "${BUILD_DIR}/app" "node_modules"
-
-	# Remove non-Linux vendored ctags binaries
-	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
-	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
-	# Re-pack app.asar
-	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
-	cd "${BUILD_DIR}" || die
-	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
-	xd="--unpack-dir=apm"
-	easar pack "${x}" "${xd}" "app" "app.asar"
-
-	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
-	# Replace vendored ctags with a symlink to system ctags
-	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-	ln -s "${EROOT%/}/usr/bin/ctags" \
-		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
-	local electron="$(get_electron_dir)/electron"
-	local app="${BUILD_DIR}/app.asar"
-
-	virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-
-	insinto "${install_dir}"
-
-	doins "${BUILD_DIR}/app.asar"
-	doins -r "${BUILD_DIR}/app.asar.unpacked"
-
-	insinto "${install_dir}/app"
-	doins -r "${BUILD_DIR}/app/apm"
-
-	insinto "/usr/share/applications/"
-	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
-		"atom${suffix}.desktop"
-
-	insinto "/usr/share/icons/"
-	doins -r "${BIN_S}/usr/share/icons/hicolor"
-
-	exeinto "${install_dir}"
-	newexe "${BUILD_DIR}/app/atom.sh" atom
-	insinto "/usr/share/licenses/${PN}${suffix}"
-	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
-	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
-	_fix_executables "${install_dir}/app/apm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
-	if [[ "${PV}" == *beta* ]]; then
-		echo -n "atom-beta"
-	else
-		echo -n "atom"
-	fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
-	echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
-	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
-	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
-	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
-	"$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
-	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
-	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
-	PATH="$(get_electron_dir):${PATH}" \
-		enode_electron "${nodegyp}" \
-			--nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
-	local cscript="${FILESDIR}/transpile-coffee-script.js"
-
-	# Disable shell glob expansion, as we want the coffee script
-	# transpiler to do that instead.
-	set -f
-	echo "ecoffeescript" $@
-	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" $@ || die
-	set +f
-}
-
-# asar wrapper.
-easar() {
-	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
-	echo "asar" $@
-	enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
-	local binmod="${1//-/_}"
-	local binmod_v="${binmod^^}_V"
-	echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
-	local _patches="${1}-*.patch" _find
-	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
-	test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
-	local a="${1}"
-	local b="${a%.tar.gz}"
-	local p="${b#atomdep-}"
-	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
-	unpack "${a}"
-
-	if [[ "${dir}" != "${p}" ]]; then
-		# Set the correct name for the unpacked directory.
-		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
-	fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
-	local mod
-
-	for mod in "${BINMODS[@]}"; do
-		if [[ "${mod}" == "${1}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
-	local _dir="${2}"
-	local _prefix="${1}"
-	local path
-	local relpath
-	local modpath
-	local mod
-	local f
-	local d
-	local cruft
-
-	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
-	| while IFS= read -r path; do
-		f=$(basename "${path}")
-		d=$(dirname "${path}")
-	    relpath=${path#${_prefix}}
-		relpath=${relpath##/}
-		relpath=${relpath#W${_dir}}
-		modpath=$(dirname ${relpath})
-		modpath=${modpath%build/Release}
-		mod=$(basename ${modpath})
-
-		_is_valid_binmod "${mod}" || continue
-
-		# must copy here as symlinks will cause the module loading to fail
-		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
-		cruft=$(find "${d}" -name '*.a' -print)
-		if [[ -n "${cruft}" ]]; then
-			rm ${cruft} || die
-		fi
-	done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
-	local _dir="${1}"
-	local _node_sb="#!$(get_electron_dir)"/node
-
-	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
-	| while IFS= read -r f; do
-		IFS= read -r shebang < "${f}"
-
-		if [[ ${shebang} == '#!'* ]]; then
-			fperms +x "${f#${ED}}"
-			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
-				einfo "Fixing node shebang in ${f#${ED}}"
-				sed --follow-symlinks -i \
-					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
-			fi
-		fi
-	done || die
-}
diff --git a/app-editors/atom/atom-1.23.0_beta1.ebuild b/app-editors/atom/atom-1.23.0_beta1.ebuild
deleted file mode 100644
index 1a6a57a15de5..000000000000
--- a/app-editors/atom/atom-1.23.0_beta1.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-#       atom overlay.  If you would like to make changes, please consider
-#       modifying the ebuild template and submitting a PR to
-#       https://github.com/elprans/atom-overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.15
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-ATOM__NSFW_V=1.0.18
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.1.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.0.5
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.4
-SUPERSTRING_V=2.2.13
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
-	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
-	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
-	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
-	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
-	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
-	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
-	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
-	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
-	https://registry.npmjs.org/keytar/-/keytar-4.0.5.tgz -> atomdep-keytar-4.0.5.tar.gz
-	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
-	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
-	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
-	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
-	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
-	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz
-	https://registry.npmjs.org/superstring/-/superstring-2.2.13.tgz -> atomdep-superstring-2.2.13.tar.gz
-"
-
-BINMODS=(
-	atom--nsfw
-	cached-run-in-this-context
-	ctags
-	fs-admin
-	git-utils
-	keyboard-layout
-	keytar
-	nsfw
-	nslog
-	oniguruma
-	pathwatcher
-	scrollbar-style
-	spellchecker
-	superstring
-)
-
-LICENSE="MIT"
-SLOT="beta"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/hunspell-1.3.3:=
-	>=dev-libs/libgit2-0.23:=[ssh]
-	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
-	>=gnome-base/libgnome-keyring-3.12:=
-	>=dev-libs/oniguruma-6.6.0:=
-	>=dev-util/ctags-5.8
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-	x11-libs/libxkbfile"
-RDEPEND="
-	${DEPEND}
-	!sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local a
-
-	for a in ${A} ; do
-		case ${a} in
-		*.rpm) srcrpm_unpack "${a}" ;;
-		*) _unpack "${a}" ;;
-		esac
-	done
-
-	mkdir "${BIN_S}" || die
-	mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
-	local patch
-	local binmod
-	local _s
-
-	mkdir "${BUILD_DIR}" || die
-	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
-		"${BUILD_DIR}/app" || die
-
-	# Add source files omitted from the upstream binary distribution,
-	# and which we want to include in ours.
-	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
-	# Unpack app.asar
-	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
-		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
-			"${BUILD_DIR}/app"
-	fi
-
-	cd "${BUILD_DIR}/app" || die
-
-	eapply "${FILESDIR}/atom-python.patch"
-	eapply "${FILESDIR}/apm-python.patch"
-	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
-	eapply "${FILESDIR}/atom-apm-path-r2.patch"
-	eapply "${FILESDIR}/atom-license-path-r1.patch"
-	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
-	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
-	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
-		./atom.sh \
-		|| die
-
-	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
-			   export ELECTRON_NO_ASAR=1"
-	sed -i -e \
-		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
-			apm/bin/apm || die
-
-	sed -i -e \
-		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
-			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
-	sed -i -e \
-		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
-			apm/lib/test.js || die
-
-	rm apm/bin/node || die
-
-	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
-		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		cd "${_s}" || die
-		if _have_patches_for "${binmod}"; then
-			for patch in "${FILESDIR}"/${binmod}-*.patch; do
-				eapply "${patch}"
-			done
-		fi
-	done
-
-	cd "${BUILD_DIR}/app" || die
-
-	# Unbundle bundled libs from modules
-
-	_s="${WORKDIR}/$(package_dir git-utils)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "git;libgit2;git2" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir oniguruma)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "onig_scanner;oniguruma;onig" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir spellchecker)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "spellchecker;hunspell;hunspell" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir superstring)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle \
-		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
-			-DPCRE2_CODE_UNIT_WIDTH=16" \
-		"${_s}/binding.gyp" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		mkdir -p "${_s}/node_modules" || die
-		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
-	done
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local binmod
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Configuring ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom configure
-	done
-}
-
-src_compile() {
-	local binmod
-	local x
-	local ctags_d="node_modules/symbols-view/vendor"
-	local jobs=$(makeopts_jobs)
-	local gypopts
-
-	# Transpile any yet untranspiled files.
-	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
-	gypopts="--verbose"
-
-	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-		gypopts+=" --jobs ${jobs}"
-	fi
-
-	mkdir -p "${BUILD_DIR}/modules/" || die
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Building ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom ${gypopts} build
-		x=${binmod##node-}
-		mkdir -p "${BUILD_DIR}/modules/${x}" || die
-		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
-	done
-
-	# Put compiled binary modules in place
-	_fix_binmods "${BUILD_DIR}/app" "apm"
-	_fix_binmods "${BUILD_DIR}/app" "node_modules"
-
-	# Remove non-Linux vendored ctags binaries
-	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
-	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
-	# Re-pack app.asar
-	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
-	cd "${BUILD_DIR}" || die
-	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
-	xd="--unpack-dir=apm"
-	easar pack "${x}" "${xd}" "app" "app.asar"
-
-	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
-	# Replace vendored ctags with a symlink to system ctags
-	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-	ln -s "${EROOT%/}/usr/bin/ctags" \
-		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
-	local electron="$(get_electron_dir)/electron"
-	local app="${BUILD_DIR}/app.asar"
-
-	virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-
-	insinto "${install_dir}"
-
-	doins "${BUILD_DIR}/app.asar"
-	doins -r "${BUILD_DIR}/app.asar.unpacked"
-
-	insinto "${install_dir}/app"
-	doins -r "${BUILD_DIR}/app/apm"
-
-	insinto "/usr/share/applications/"
-	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
-		"atom${suffix}.desktop"
-
-	insinto "/usr/share/icons/"
-	doins -r "${BIN_S}/usr/share/icons/hicolor"
-
-	exeinto "${install_dir}"
-	newexe "${BUILD_DIR}/app/atom.sh" atom
-	insinto "/usr/share/licenses/${PN}${suffix}"
-	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
-	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
-	_fix_executables "${install_dir}/app/apm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
-	if [[ "${PV}" == *beta* ]]; then
-		echo -n "atom-beta"
-	else
-		echo -n "atom"
-	fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
-	echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
-	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
-	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
-	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
-	"$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
-	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
-	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
-	PATH="$(get_electron_dir):${PATH}" \
-		enode_electron "${nodegyp}" \
-			--nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
-	local cscript="${FILESDIR}/transpile-coffee-script.js"
-
-	# Disable shell glob expansion, as we want the coffee script
-	# transpiler to do that instead.
-	set -f
-	echo "ecoffeescript" $@
-	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" $@ || die
-	set +f
-}
-
-# asar wrapper.
-easar() {
-	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
-	echo "asar" $@
-	enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
-	local binmod="${1//-/_}"
-	local binmod_v="${binmod^^}_V"
-	echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
-	local _patches="${1}-*.patch" _find
-	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
-	test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
-	local a="${1}"
-	local b="${a%.tar.gz}"
-	local p="${b#atomdep-}"
-	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
-	unpack "${a}"
-
-	if [[ "${dir}" != "${p}" ]]; then
-		# Set the correct name for the unpacked directory.
-		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
-	fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
-	local mod
-
-	for mod in "${BINMODS[@]}"; do
-		if [[ "${mod}" == "${1}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
-	local _dir="${2}"
-	local _prefix="${1}"
-	local path
-	local relpath
-	local modpath
-	local mod
-	local f
-	local d
-	local cruft
-
-	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
-	| while IFS= read -r path; do
-		f=$(basename "${path}")
-		d=$(dirname "${path}")
-	    relpath=${path#${_prefix}}
-		relpath=${relpath##/}
-		relpath=${relpath#W${_dir}}
-		modpath=$(dirname ${relpath})
-		modpath=${modpath%build/Release}
-		mod=$(basename ${modpath})
-
-		_is_valid_binmod "${mod}" || continue
-
-		# must copy here as symlinks will cause the module loading to fail
-		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
-		cruft=$(find "${d}" -name '*.a' -print)
-		if [[ -n "${cruft}" ]]; then
-			rm ${cruft} || die
-		fi
-	done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
-	local _dir="${1}"
-	local _node_sb="#!$(get_electron_dir)"/node
-
-	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
-	| while IFS= read -r f; do
-		IFS= read -r shebang < "${f}"
-
-		if [[ ${shebang} == '#!'* ]]; then
-			fperms +x "${f#${ED}}"
-			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
-				einfo "Fixing node shebang in ${f#${ED}}"
-				sed --follow-symlinks -i \
-					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
-			fi
-		fi
-	done || die
-}
diff --git a/app-editors/atom/atom-1.23.3.ebuild b/app-editors/atom/atom-1.23.3.ebuild
new file mode 100644
index 000000000000..14043a200d4f
--- /dev/null
+++ b/app-editors/atom/atom-1.23.3.ebuild
@@ -0,0 +1,535 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+#       atom overlay.  If you would like to make changes, please consider
+#       modifying the ebuild template and submitting a PR to
+#       https://github.com/elprans/atom-overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.15
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+ATOM__NSFW_V=1.0.18
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.1.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.1.0
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.4
+SUPERSTRING_V=2.2.16
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
+	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
+	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+	https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz
+	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz
+	https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+"
+
+BINMODS=(
+	atom--nsfw
+	cached-run-in-this-context
+	ctags
+	fs-admin
+	git-utils
+	keyboard-layout
+	keytar
+	nsfw
+	nslog
+	oniguruma
+	pathwatcher
+	scrollbar-style
+	spellchecker
+	superstring
+)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	>=dev-libs/libgit2-0.23:=[ssh]
+	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-6.6.0:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+	x11-libs/libxkbfile"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*) _unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${BIN_S}" || die
+	mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+	local patch
+	local binmod
+	local _s
+
+	mkdir "${BUILD_DIR}" || die
+	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+		"${BUILD_DIR}/app" || die
+
+	# Add source files omitted from the upstream binary distribution,
+	# and which we want to include in ours.
+	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+	# Unpack app.asar
+	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+			"${BUILD_DIR}/app"
+	fi
+
+	cd "${BUILD_DIR}/app" || die
+
+	eapply "${FILESDIR}/atom-python.patch"
+	eapply "${FILESDIR}/apm-python.patch"
+	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
+	eapply "${FILESDIR}/atom-apm-path-r2.patch"
+	eapply "${FILESDIR}/atom-license-path-r1.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
+
+	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
+		./atom.sh \
+		|| die
+
+	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+			   export ELECTRON_NO_ASAR=1"
+	sed -i -e \
+		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
+			apm/bin/apm || die
+
+	sed -i -e \
+		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
+	sed -i -e \
+		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
+			apm/lib/test.js || die
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
+		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		if _have_patches_for "${binmod}"; then
+			for patch in "${FILESDIR}"/${binmod}-*.patch; do
+				eapply "${patch}"
+			done
+		fi
+	done
+
+	cd "${BUILD_DIR}/app" || die
+
+	# Unbundle bundled libs from modules
+
+	_s="${WORKDIR}/$(package_dir git-utils)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "git;libgit2;git2" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir superstring)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle \
+		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+			-DPCRE2_CODE_UNIT_WIDTH=16" \
+		"${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		mkdir -p "${_s}/node_modules" || die
+		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+	done
+
+	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Configuring ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod
+	local x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs)
+	local gypopts
+
+	# Transpile any yet untranspiled files.
+	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${BUILD_DIR}/modules/" || die
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Building ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${BUILD_DIR}/modules/${x}" || die
+		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${BUILD_DIR}/app" "apm"
+	_fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${BUILD_DIR}" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	xd="--unpack-dir=apm"
+	easar pack "${x}" "${xd}" "app" "app.asar"
+
+	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "${EROOT%/}/usr/bin/ctags" \
+		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+	local electron="$(get_electron_dir)/electron"
+	local app="${BUILD_DIR}/app.asar"
+
+	virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+
+	insinto "${install_dir}"
+
+	doins "${BUILD_DIR}/app.asar"
+	doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+	insinto "${install_dir}/app"
+	doins -r "${BUILD_DIR}/app/apm"
+
+	insinto "/usr/share/applications/"
+	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+		"atom${suffix}.desktop"
+
+	insinto "/usr/share/icons/"
+	doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+	exeinto "${install_dir}"
+	newexe "${BUILD_DIR}/app/atom.sh" atom
+	insinto "/usr/share/licenses/${PN}${suffix}"
+	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+	_fix_executables "${install_dir}/app/apm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+	if [[ "${PV}" == *beta* ]]; then
+		echo -n "atom-beta"
+	else
+		echo -n "atom"
+	fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+	echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+	local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+	# Disable shell glob expansion, as we want the coffee script
+	# transpiler to do that instead.
+	set -f
+	echo "ecoffeescript" $@
+	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+	NODE_PATH="${BUILD_DIR}/app/node_modules" \
+		enode_electron "${cscript}" $@ || die
+	set +f
+}
+
+# asar wrapper.
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+	local binmod="${1//-/_}"
+	local binmod_v="${binmod^^}_V"
+	echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+	local a="${1}"
+	local b="${a%.tar.gz}"
+	local p="${b#atomdep-}"
+	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+	unpack "${a}"
+
+	if [[ "${dir}" != "${p}" ]]; then
+		# Set the correct name for the unpacked directory.
+		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+	fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+	local mod
+
+	for mod in "${BINMODS[@]}"; do
+		if [[ "${mod}" == "${1}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+	local _dir="${2}"
+	local _prefix="${1}"
+	local path
+	local relpath
+	local modpath
+	local mod
+	local f
+	local d
+	local cruft
+
+	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+	| while IFS= read -r path; do
+		f=$(basename "${path}")
+		d=$(dirname "${path}")
+	    relpath=${path#${_prefix}}
+		relpath=${relpath##/}
+		relpath=${relpath#W${_dir}}
+		modpath=$(dirname ${relpath})
+		modpath=${modpath%build/Release}
+		mod=$(basename ${modpath})
+
+		_is_valid_binmod "${mod}" || continue
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [[ -n "${cruft}" ]]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+	local _dir="${1}"
+	local _node_sb="#!$(get_electron_dir)"/node
+
+	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
+	| while IFS= read -r f; do
+		IFS= read -r shebang < "${f}"
+
+		if [[ ${shebang} == '#!'* ]]; then
+			fperms +x "${f#${ED}}"
+			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
+				einfo "Fixing node shebang in ${f#${ED}}"
+				sed --follow-symlinks -i \
+					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
+			fi
+		fi
+	done || die
+}
diff --git a/app-editors/atom/atom-1.24.0_beta3.ebuild b/app-editors/atom/atom-1.24.0_beta3.ebuild
new file mode 100644
index 000000000000..be1bdba86e3e
--- /dev/null
+++ b/app-editors/atom/atom-1.24.0_beta3.ebuild
@@ -0,0 +1,535 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+#       atom overlay.  If you would like to make changes, please consider
+#       modifying the ebuild template and submitting a PR to
+#       https://github.com/elprans/atom-overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.15
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+ATOM__NSFW_V=1.0.18
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.1.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.1.0
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.4
+SUPERSTRING_V=2.2.16
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
+	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
+	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+	https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz
+	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz
+	https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+"
+
+BINMODS=(
+	atom--nsfw
+	cached-run-in-this-context
+	ctags
+	fs-admin
+	git-utils
+	keyboard-layout
+	keytar
+	nsfw
+	nslog
+	oniguruma
+	pathwatcher
+	scrollbar-style
+	spellchecker
+	superstring
+)
+
+LICENSE="MIT"
+SLOT="beta"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	>=dev-libs/libgit2-0.23:=[ssh]
+	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-6.6.0:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+	x11-libs/libxkbfile"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*) _unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${BIN_S}" || die
+	mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+	local patch
+	local binmod
+	local _s
+
+	mkdir "${BUILD_DIR}" || die
+	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+		"${BUILD_DIR}/app" || die
+
+	# Add source files omitted from the upstream binary distribution,
+	# and which we want to include in ours.
+	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+	# Unpack app.asar
+	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+			"${BUILD_DIR}/app"
+	fi
+
+	cd "${BUILD_DIR}/app" || die
+
+	eapply "${FILESDIR}/atom-python.patch"
+	eapply "${FILESDIR}/apm-python.patch"
+	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
+	eapply "${FILESDIR}/atom-apm-path-r2.patch"
+	eapply "${FILESDIR}/atom-license-path-r1.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
+
+	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
+		./atom.sh \
+		|| die
+
+	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+			   export ELECTRON_NO_ASAR=1"
+	sed -i -e \
+		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
+			apm/bin/apm || die
+
+	sed -i -e \
+		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
+	sed -i -e \
+		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
+			apm/lib/test.js || die
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
+		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		if _have_patches_for "${binmod}"; then
+			for patch in "${FILESDIR}"/${binmod}-*.patch; do
+				eapply "${patch}"
+			done
+		fi
+	done
+
+	cd "${BUILD_DIR}/app" || die
+
+	# Unbundle bundled libs from modules
+
+	_s="${WORKDIR}/$(package_dir git-utils)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "git;libgit2;git2" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir superstring)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle \
+		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+			-DPCRE2_CODE_UNIT_WIDTH=16" \
+		"${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		mkdir -p "${_s}/node_modules" || die
+		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+	done
+
+	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Configuring ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod
+	local x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs)
+	local gypopts
+
+	# Transpile any yet untranspiled files.
+	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${BUILD_DIR}/modules/" || die
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Building ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${BUILD_DIR}/modules/${x}" || die
+		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${BUILD_DIR}/app" "apm"
+	_fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${BUILD_DIR}" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	xd="--unpack-dir=apm"
+	easar pack "${x}" "${xd}" "app" "app.asar"
+
+	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "${EROOT%/}/usr/bin/ctags" \
+		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+	local electron="$(get_electron_dir)/electron"
+	local app="${BUILD_DIR}/app.asar"
+
+	virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+
+	insinto "${install_dir}"
+
+	doins "${BUILD_DIR}/app.asar"
+	doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+	insinto "${install_dir}/app"
+	doins -r "${BUILD_DIR}/app/apm"
+
+	insinto "/usr/share/applications/"
+	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+		"atom${suffix}.desktop"
+
+	insinto "/usr/share/icons/"
+	doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+	exeinto "${install_dir}"
+	newexe "${BUILD_DIR}/app/atom.sh" atom
+	insinto "/usr/share/licenses/${PN}${suffix}"
+	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+	_fix_executables "${install_dir}/app/apm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+	if [[ "${PV}" == *beta* ]]; then
+		echo -n "atom-beta"
+	else
+		echo -n "atom"
+	fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+	echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+	local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+	# Disable shell glob expansion, as we want the coffee script
+	# transpiler to do that instead.
+	set -f
+	echo "ecoffeescript" $@
+	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+	NODE_PATH="${BUILD_DIR}/app/node_modules" \
+		enode_electron "${cscript}" $@ || die
+	set +f
+}
+
+# asar wrapper.
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+	local binmod="${1//-/_}"
+	local binmod_v="${binmod^^}_V"
+	echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+	local a="${1}"
+	local b="${a%.tar.gz}"
+	local p="${b#atomdep-}"
+	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+	unpack "${a}"
+
+	if [[ "${dir}" != "${p}" ]]; then
+		# Set the correct name for the unpacked directory.
+		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+	fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+	local mod
+
+	for mod in "${BINMODS[@]}"; do
+		if [[ "${mod}" == "${1}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+	local _dir="${2}"
+	local _prefix="${1}"
+	local path
+	local relpath
+	local modpath
+	local mod
+	local f
+	local d
+	local cruft
+
+	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+	| while IFS= read -r path; do
+		f=$(basename "${path}")
+		d=$(dirname "${path}")
+	    relpath=${path#${_prefix}}
+		relpath=${relpath##/}
+		relpath=${relpath#W${_dir}}
+		modpath=$(dirname ${relpath})
+		modpath=${modpath%build/Release}
+		mod=$(basename ${modpath})
+
+		_is_valid_binmod "${mod}" || continue
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [[ -n "${cruft}" ]]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+	local _dir="${1}"
+	local _node_sb="#!$(get_electron_dir)"/node
+
+	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
+	| while IFS= read -r f; do
+		IFS= read -r shebang < "${f}"
+
+		if [[ ${shebang} == '#!'* ]]; then
+			fperms +x "${f#${ED}}"
+			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
+				einfo "Fixing node shebang in ${f#${ED}}"
+				sed --follow-symlinks -i \
+					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
+			fi
+		fi
+	done || die
+}
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index b44df1d472e2..7882d6eed91b 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
+DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
 EBUILD emacs-vcs-26.0.90.ebuild 12493 BLAKE2B 8c026c0691dbdb7426ed5942986cc5356ba2b8fd486af3e1dfe4d43606cb6f1f69bdd168a5772b9fc1a6446124dc8d9694abe02c3c32f14afddf1b74cc3dfaf2 SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6
+EBUILD emacs-vcs-26.0.91.ebuild 12493 BLAKE2B 4de1c2d011897acc603f906e10f8412542f8844df1f0ed10f8c70d13a086f5f6b6a00511883fb01f8d398244ec142150364b19d9e9dcf3a469edc1912512536a SHA512 72ca1d0df4de980246398c9500b4fb9ee7d84e3b5100e33f212dc7f93910ac309603243cc1d60379b604e23b6d0079682dfc1e2cf73482e241b80962389ca5ab
 EBUILD emacs-vcs-26.0.9999-r1.ebuild 12493 BLAKE2B 8c026c0691dbdb7426ed5942986cc5356ba2b8fd486af3e1dfe4d43606cb6f1f69bdd168a5772b9fc1a6446124dc8d9694abe02c3c32f14afddf1b74cc3dfaf2 SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6
 EBUILD emacs-vcs-27.0.9999.ebuild 12491 BLAKE2B c2c9f4d17aeaa25f98410be4cb1f3de14d19ce02ba2bfe9dc5df7d72a4fce3397a3f91268b7f0223514b784415ba2e8ee103a62f6b399c3743c6a3f496f5f3c4 SHA512 e17454202752433ea2a2e5badcea478ea6a735ba5b7f7d836ae1ce0d91a6b43eb55c15adf98040ffe88e48a09f328424d5268b4bc2a321d519ed0122e7e74919
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
new file mode 100644
index 000000000000..d0810d80e22a
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-26"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			xwidgets? (
+				x11-libs/gtk+:3
+				net-libs/webkit-gtk:4=
+			)
+			!xwidgets? (
+				gtk3? ( x11-libs/gtk+:3 )
+				!gtk3? ( x11-libs/gtk+:2 )
+			)
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/attr )"
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use xwidgets; then
+				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			else
+				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+				myconf+=" --without-xwidgets"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--without-pop \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 796111cd296c..1991ab700294 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,5 +12,5 @@ EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a65
 EBUILD emacs-23.4-r16.ebuild 11264 BLAKE2B 5d6c8a786435acc3f0311951741b895ed426305444efe9f0c83166576f984c51266e42d8502f03338bdcfeeb9b3c3aa34068485beb6e10a8138eaf1315e734cc SHA512 fdff9e3bf6839e7caf6ecbd841ed6d332173aeb46550a652dea8975fe92d8b3174045170a9b8e8ce898e3853e8620b7c3d90c93ad76d2cd35014b3a0257f2f1a
 EBUILD emacs-24.5-r4.ebuild 11095 BLAKE2B bf769253d5791e01441f4f55fb3a00c0187b22c05ff8c7a8a9fae5a23fe9861fe44b0ffc23d4be6c623ed837451781a70f1e6af326c03858ddc0bffc09534b20 SHA512 ce02df6231626e4edceb9e2e693f2006446b62f09c553d1ed0c028f1cfa255a0d9abec16de717ac4c18f78511f087ebceab2bbcc11c6b452d7d0bcd43c87586a
 EBUILD emacs-25.2-r1.ebuild 11534 BLAKE2B defa0b46ed5ede9eca8a4edb7e3dd06fab21fdd53c854faca88c105c58fa5bf65145ebaef656f59da6ec128d33cf5799adcef33a94421e683f9b8c710a9ab932 SHA512 e29e7e2c3f8987843203799620099f3da70f89d7e44ad606f2b7f4ff7077333c7e783c3b327d735165b6d9e38e8f22a8eb635b8f412c53a7c9946e81467bf2e2
-EBUILD emacs-25.3.ebuild 11455 BLAKE2B e4999d4b86c9992223232b8287e17526d16a4ab35d5401477d168e5a51fc2bb0ac26be317e533ce963e4e823fcf72266a11dda73c54a278abdbc767eb080a6b0 SHA512 e907d0edd4595581957e65f57140f344352668c0c4a20e3741f08f937b2b426250f78cca1cbbe88de71388e2343978e86dbc83b85813663b94b0b1be825e558e
+EBUILD emacs-25.3.ebuild 11454 BLAKE2B e2d7e31c2131cdf0ad2188b3f30bad9be18333650edebd5b0436a15411e5df372f1c09d7a0d401454a1d40bc0f1f2868ab570d8df775281aa23490e83d71fd19 SHA512 823acc7c1b5990566a4c6f41d4aa508c624bac290bfc30929e1a6899c405749e5abb4152da570b873c057d3cbfd3ce409113a117d8c520647c8e5036a16acb03
 MISC metadata.xml 2759 BLAKE2B 6054420573e7ff20ec4e946e666de88e5e925edf36a2b86ff4f6f1f179c3a4d82e62b5e824b154b8f68d98cefad3831bec4f3a1b4e92c34b2c8ffc76254a3b1f SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index 0cacc0f2275b..e5ff6db30523 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.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="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index af171a8b8a91..6bfb9fe2c881 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,9 +1,5 @@
-DIST mg-20161005.tar.gz 140797 BLAKE2B 27498f483ce64bd5624f77ca0e1d544e2a518c9f010393c93bdd4671bc95ddbda9b893a8d1b2e157330db961257e09b9cbc35ab0c3a10f5d4b7908d56d7d6622 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae
-DIST mg-20170401.tar.gz 140895 BLAKE2B 09cf3483a5f3fe1b240743d07008de62ffded10f32454b5795307b70ae42f9477cac3b8c1a59da6dc493fb3d2477fea418479d19e432e10b42a05bcfe509d242 SHA512 729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce
 DIST mg-20170828.tar.gz 141028 BLAKE2B a0243ee05f86161f1a9448ec92c8cf14362a60dd3643ad49f79fdd6c2ffe56f51415321eb6f3d7b78c1ca6eab9cb91380cdb63f699359080011d6801feaedd04 SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
-EBUILD mg-20161005.ebuild 1045 BLAKE2B 248e031b0f93393707420e8c13e16dee309b4a7d0f36b848d32de51d2700d0d04dc5e4a6c16e1b8d2035c4a1f41c9a90ed543bfe325bd60b9dd05398d52f1e31 SHA512 dd63f9da0f28961aac1f02d09d021f661d5bf2bfb8baf3509aabf1855bae9d41efd09847d1cdd8c84985146083192b7b3212038180ebe3b2e1256ffed0fa43fb
-EBUILD mg-20170401.ebuild 1046 BLAKE2B cf5707c2c77a6df9ce2a9d57a15c6d397c15464cc4f559b876803b8c3874a7086943e58ecbe0ae0d38eb4a41f44feca4b7093010e4578282adb9e5ae1ec0d09b SHA512 b2b1e8bca99cd420d4b70d2c9f0303c424e607d866373274a9cce2ce9644e1746f616501920af4efb17cef4b069456108dd3e0ba537b38c453846c80853fab32
-EBUILD mg-20170828.ebuild 1046 BLAKE2B e49a17d0fcf805dbeaaacb0f5484fa15ace9ffbe47554d6fa7e1dda0c16a93501754856be5c1207593f0869bb0a426f665be02e58d7de98e6bd3349796576fa3 SHA512 9063a1085e77e301bddc90c074ba9f4e44332dcbf864ce308bb6f5bbffdad43e4a70a3849ed4ab205853878e297e27c82c9366de7db111db6cbc681a19fdd689
+EBUILD mg-20170828.ebuild 1045 BLAKE2B e489742c9b9c71178d1e9847f3fb556a8f4018f76b82e3231313043e3ab8e0faebd2e1714ddf81b6e9816c7864ff98e26eae0a6c82fc301589a7e52b67220eb8 SHA512 14c1fd5ea918379aa77ec2e31ffec1967384ec7ccc5b0987c17e2c01b02909f6e75defe317009d86a46af545758d5ef5958aae956177d92a26151c72cc4bbb66
 EBUILD mg-20171014.ebuild 1052 BLAKE2B ec7abfd554d18939a3e16ad6d6ecc6be0a78d953d88d15e5ada0797f022ecdf86e621b55ce19ffdad1017bdb546cc2d092fc9d58dc886f2a5494c30ebec1313f SHA512 793e3e975a2a74f6160c7ecd1a9f0536b097671a32e772706aaae34865e14c5678cfad9625fa66ca9a987220316502bdbc7ae6d226d1e483342de7a5c04c3fe6
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20161005.ebuild b/app-editors/mg/mg-20161005.ebuild
deleted file mode 100644
index 5bdc5464637e..000000000000
--- a/app-editors/mg/mg-20161005.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20170401.ebuild b/app-editors/mg/mg-20170401.ebuild
deleted file mode 100644
index d27d2b759913..000000000000
--- a/app-editors/mg/mg-20170401.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20170828.ebuild b/app-editors/mg/mg-20170828.ebuild
index f97521cd70b0..283cf4ff08ca 100644
--- a/app-editors/mg/mg-20170828.ebuild
+++ b/app-editors/mg/mg-20170828.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="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 2fb6fcc3b55f..72335bc7b4a2 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -3,9 +3,9 @@ DIST nano-2.7.5.tar.gz 2031723 BLAKE2B 30cd6418c438d6a908d7bf0f64151f6fa3c9aa41f
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
 DIST nano-2.9.1.tar.gz 2839465 BLAKE2B e0d443dc3c86446478edad73042c6b4698a86fdfe3727deac858fa99d52bf319e2b3a120ba57bf79f3b78d9d3d7e8f4b5bdee234f6450882fee06647be371191 SHA512 7eeefd4cb5f02f1ac14ca10c536f873a1a85f3a5ccc5d5c40a12770b26dd0d5b0bbb3a0770b394779c8234891d7226e0d06d72465d7687c971bc62606100d0b6
 DIST nano-2.9.2.tar.gz 2839256 BLAKE2B 6e27ad0ff72a17461d614f2222ef33bf2abaaa0f4576a8e378524b090c702adafa86e78d976cf5b5dcd2ca1da802aeeff9b3f4bc5e81fa31b8164ef2979708d6 SHA512 b45afb593a04029a137f49551242f2dae901482878cca4aac6cba1c0c8af38a83994daadbd025e90f019cfa9d1273784de4491bbadf47104914904af804661d1
-EBUILD nano-2.7.5.ebuild 2281 BLAKE2B ad2c9f6a6b66c74e309022de21f0e233af8e0f091d7be79843753b244509c98e5c7115b3dfcd42566d2d3da46c1856a72dfc8da96399ad5eedd3a3d73395ecce SHA512 65c76d2744ad7bfc0fca1b0c9dcab041777a542c921f0526de18251b64bf32d12fe71fb8fd050eea4da074b56c12f0086036065e7ecdda4dd5b66b06382d81a0
-EBUILD nano-2.8.7.ebuild 2319 BLAKE2B f99da827b19d8399626fe7c5727a5b42acaca8414011f3c1780e4fd8a79606a86ae152c066b7dc984cea95e3738b792c177aad397ce8961799b2142c49090bfe SHA512 ee6a1c89dff812a1f17f759f220b1c8ff1445f23728466bd5ae3a3bfcf8a1b4df6463670d6ce4cea9d486d439e792124b821c9068f5f706272bcb8a3c02b5691
-EBUILD nano-2.9.1.ebuild 2265 BLAKE2B c47ba305fd6dd42749764ea90bfc9f5b5482b7a5eadea6c179e01f082657398bf89d586f17f0e3eec23df78f6d4d76038017314905acb06cda870b4b80dbd471 SHA512 0bd91b9afea8c8f6592e84047870098c9948687d516fabf8e18be5fa8a2690db0b76f96fd45aba59743dae4cb6630fe2b76825628f0b954550ff95de3feedcb4
-EBUILD nano-2.9.2.ebuild 2265 BLAKE2B ae9bada0b50e6cce6d136e56cdaed2e40b2b86564a5f6367587f19690641cda8431d6399c5ed959c16acbf859edcdae51eed961cb57729644bf39514271dc71f SHA512 05be72b2e1dc44db6211f154165dd6268fe51bde7468ad3f2c2628bbdc161fef47e90672f43a0200048134711fcb415e6da3386dfc601b8ea052c33277cf8cf3
-EBUILD nano-9999.ebuild 2265 BLAKE2B 678ff8f900f19d4879d857dc2f06a99edd0db894cef8d78abce94fce25684930cce93c0e9822d693415b5c5a5ca87217c4f6ff7b0da7ee4f65312eca5c9a6cdb SHA512 9d4902c001632ba5139d4dc14ad8faba1f1bd133c85092682376ec8835c5b491fdc2cdb1abda2aca311fbc57e72b93ab6f38923e067c744e02c6ee6795357d9e
+EBUILD nano-2.7.5.ebuild 2269 BLAKE2B 5a5dedd043bdc83e044660a1d36fd2a54205e619cc0b718304540d4d8fe80d49c7ab72360fbf380c151fb756efee43b81e6ceb38b34033ba09dc01b1d246a161 SHA512 7f144e4200fc635dd42c949f9214e2542f433c8bfcd31fd77c5821b215244ee49501808651975576058486cd1e9811b93dd94278ab4a4b403ba8ac21eba4725e
+EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
+EBUILD nano-2.9.1.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
+EBUILD nano-2.9.2.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
+EBUILD nano-9999.ebuild 2253 BLAKE2B 0c5d1fa1a6cc54836bf07a83a4eec32d38217c4f5133d185d4e859219a236f73587d75fd2be1c03deace487032a35c59569e2df098af5b0ff0c88659916f74ed SHA512 8729d366c735abefbcd7d123599ef93edf0b3bad87507df4847751d4c117de6a2110484f509c4126b7417ccbcfc9bdda058960a4f7b888466e8f84bf9c5399e7
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.7.5.ebuild b/app-editors/nano/nano-2.7.5.ebuild
index 0b2e3ecb9995..1b7c160db489 100644
--- a/app-editors/nano/nano-2.7.5.ebuild
+++ b/app-editors/nano/nano-2.7.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="5"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
index 5f5529b425ce..dfa5e6cfd21c 100644
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.9.1.ebuild b/app-editors/nano/nano-2.9.1.ebuild
index c818fcb3401f..74791e406856 100644
--- a/app-editors/nano/nano-2.9.1.ebuild
+++ b/app-editors/nano/nano-2.9.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"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.9.2.ebuild b/app-editors/nano/nano-2.9.2.ebuild
index db4a0b612a33..74791e406856 100644
--- a/app-editors/nano/nano-2.9.2.ebuild
+++ b/app-editors/nano/nano-2.9.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 4463df57a3e0..0aed36a7b0ee 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-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"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index 72ba6182b12f..8bbd8ba0d9a4 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,7 +1,9 @@
 DIST qxmledit-0.9.7-1-src.tgz 20151952 BLAKE2B ea3af07aa9cae37456a55d3dbc5e3330f1dec85702b1b0bbaa033316e7fb4deb1030af70196440e9b39e58a131a51906071843569a543546cbe27cd6461b7f25 SHA512 c2304c0d46925f36ae2e411bae805406df60339bbce1f030ebbbe42b203133770ff011cb9751e79ac6807f21425e73f3f66f7081a5b14d6701522c2aa1e9a9df
 DIST qxmledit-0.9.8-src.tgz 22814833 BLAKE2B 13b2888b1feb95222f9912e1ff6367c86f29b939987293ad325fcd89784357daa9fe67add24e9ca7879181f0a3344a127f3e99486054ed0d7bfdef6cddc2f546 SHA512 41caf161de1efd3c210104f362b1ef50ecfbec0c50d4efc98aae03f40ee0c8f51f0b8c322b3017b797f19c7ed668b456a850dea0b4adf7106557eeb9ea58a78e
 DIST qxmledit-0.9.9-src.tgz 23502055 BLAKE2B 63ee7615b7633d1385aa84a37138180963a124d2cf1d678e1f75e6629d402b5a40a5f18565aa671a005e760d1bb955666f1c8c37589689a052bb098e708f59ac SHA512 1c7c4f14471103ae1a05c28da9a84de626ca367af232eaa6998fbb14c8aff18108e486f47592f869e91af2722c7b197073877fa3a4e8bff8d8aca6b3d8b400db
+DIST qxmledit-0.9.9.2-src.tgz 23502125 BLAKE2B 4b3997d231ac9217a469b6dc2f828dde525b5e314ebf300624a5fdcef9b300b3b9f56c958de81ab8b07f5f02bd370a52b521b8a9440ddea997f83a81844de7f7 SHA512 2f3c1f8c58592fe09b2740833e0a1b581916f3f43bb6d50fefc5ea388f1331b9cd4093b3953bcecc33a947ff0ae1baf3e462e41d4dc5dd4789ec1b9dcaeac9a8
 EBUILD qxmledit-0.9.7.ebuild 1626 BLAKE2B 0e5765a479747ee6f71d8561cfcb9bf436069cd6b06cf99987e6d31416ddd9e5059028432226bb84b5f6cf1f82fdec6d90c8a0b55911c20fd2bff94f33b6fe8c SHA512 d6e2b380de9fbeaf7409f5c84f0e77306b93482fdca7d92117f9467c29cd30ee32e58670bd2b43e11bd323ba7c864c8444d4133048a3e58719cbf9d71fdc1b6b
 EBUILD qxmledit-0.9.8.ebuild 1605 BLAKE2B e53568260de89369dc82e8dcd400a06cba0462e309ad166c9f9814fb3371dbaefd3ed1d7f4cf1beb5988994f3128fc041845ba3a20693f0485d7c9e7bfb6c055 SHA512 a6104331447473700fbaf4c50afd7c0ca8b9808bbd964a0e24f7dee2e84e81168ed4d1b8b278246b8f5479bfdb15c8f3036501b8886d37133eb9c9e6f47b1c07
+EBUILD qxmledit-0.9.9.2.ebuild 1501 BLAKE2B fd41601b23a5df78b211ca26a1159c9d77a82a4b5cf46ee1e79811a7828131f1da9e1b92013ffed1dd8f2e5828f5a9cad112d4f060d72676d07d64b75f70acb8 SHA512 fd7f7a3c10327c6ee8e2260df94c790aaefa82ef9d9cb6335c675a346334020f3ada3695e5fc00a8591d097814b848d5e1567c6b260257e6eb45aa0422493d2c
 EBUILD qxmledit-0.9.9.ebuild 1501 BLAKE2B b4ce57ddbc6a2f98466e27004d68ffd11aae41ebe909099d8ff6f4c811895a4b96163221bbfaf979f857d76633c11b08393ab2b83e9c463955874b6465203354 SHA512 921f42b2f09bcc3d1083b11475d05a6a6245de402625d963d88dade48a9349efeba6d64add0853c383700d2b22416e1f34b92b0f530000f100ae821d94b40c14
 MISC metadata.xml 866 BLAKE2B c60136947b44f87b59bfbe827ac1739ec06aaec646dbb3c6e815a83529465eb7a43e61b4b03c559ae05f1232f1aabad5d55775734c58fb4847be4f0e76331964 SHA512 c97f333d504c0dd0d08ef5b9b20520a89596e2b11c140bd1b15414c44e5685c109b245a34e150581d2a1ba4ba940f6aec5d2e55dcb61e4a7283ec17a2e85aa3d
diff --git a/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild b/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
new file mode 100644
index 000000000000..adeb17ec6d81
--- /dev/null
+++ b/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils xdg-utils
+
+DESCRIPTION="Simple Qt-based XML editor"
+HOMEPAGE="http://qxmledit.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscxml:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	media-libs/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+
+	# bug 568746
+	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
+		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
+}
+
+src_configure() {
+	export \
+		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
+		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
+		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
+		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+
+	# avoid internal compiler errors
+	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
+
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	doicon install_scripts/environment/icon/qxmledit.png
+	domenu install_scripts/environment/desktop/QXmlEdit.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 0ffb254d4a92..bad8d49e131b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -6,9 +6,9 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87
 DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
-EBUILD vim-core-8.0.0386.ebuild 6754 BLAKE2B dce17b159afde5cba37cd6dd7010dfdf84f6752bb82a85993142bc13eb103afc99d27b48039fe61db115a55a364a95e11b123342630478eb46de0fd00ddaa585 SHA512 ecdaf79298f242819af450ea366cb51b428f4d0054203dde424bce6ffd754954273f59802a3b1f582ad1d3455d2b844d3b6613f06fe3b17fe43e19102984b118
-EBUILD vim-core-8.0.1188.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
-EBUILD vim-core-8.0.1298.ebuild 6652 BLAKE2B a33f1686491a154817145f17894957e3250e06c70ec58198cbc888627d419bd6a816fe3ccf3330f8bc70afea740df79080bd5470f033710d87d81dd38c8f4fad SHA512 0386e3158f88b003870afa1f1401316b336c5eb95fd6c641558911e4b61e885e193c84259903f16e851830a3e4d0a116314713900e8e06646855313e8340c659
-EBUILD vim-core-8.0.1428.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
-EBUILD vim-core-9999.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
+EBUILD vim-core-8.0.0386.ebuild 6742 BLAKE2B 7c60a03815ee7bf63b9676c45d12f78511c526bc3dcd4eb7a3ece264e141650a15e9ce8fb0111b3f0aacd75056205ef7bbfed3d828c4592b43cb09eb3c90f4b1 SHA512 20b78ddb0bf153bc0e6111703d6a77f500ff8cf4cb71b1c01c22619027619f9dbbbc9b25163c888d5faf780dc5c4b05a2b8a8ec888ca592167e0ebee4b86b49d
+EBUILD vim-core-8.0.1188.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
+EBUILD vim-core-8.0.1298.ebuild 6640 BLAKE2B 181c42a16392ec1db680179c441f959b19aed2b990ad6de67b6de6ec16f18917942122942702a13421966a57789c50f92ff8a1075e616546bcbd6ed530a64979 SHA512 0567d733921eceb6ad368d9cf85549ef2e4c76a5f0764bc1daac7748faa1c736fec2f457b8a9a4ba7d5d344ee336421df0aed5bcb6c99822840dcb38d9c3b908
+EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
+EBUILD vim-core-9999.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.0.0386.ebuild b/app-editors/vim-core/vim-core-8.0.0386.ebuild
index b0e2eda803b3..f7d16fcf1349 100644
--- a/app-editors/vim-core/vim-core-8.0.0386.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.0386.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild
index e383fc5b1c03..004a0a1c69e6 100644
--- a/app-editors/vim-core/vim-core-8.0.1188.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1188.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.0.1298.ebuild b/app-editors/vim-core/vim-core-8.0.1298.ebuild
index 6ba13d6ffe44..66cb0f645856 100644
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1298.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.0.1428.ebuild b/app-editors/vim-core/vim-core-8.0.1428.ebuild
index e383fc5b1c03..004a0a1c69e6 100644
--- a/app-editors/vim-core/vim-core-8.0.1428.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1428.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index e383fc5b1c03..004a0a1c69e6 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-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
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index df0918eddd9c..708dd8a8311e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -5,9 +5,9 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87
 DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
-EBUILD vim-8.0.0386.ebuild 10124 BLAKE2B 1076b778939e88d839a2ff357bcc1b2e5d728f1cb323b1fbfa1998afe49a7127dd0e8c7baf76626811de7843913b02e64a8bab9c73327c53f93214278bfa69af SHA512 df3604a0c5025cc34bffa597107e7ee0013a4aa691ad284cefbef701ede72d0db5648d01d20ddd4791b1a30b5359dd2cb1a8f70b0e75e57fcec7b4f045c8d040
-EBUILD vim-8.0.1188.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
-EBUILD vim-8.0.1298.ebuild 8786 BLAKE2B 66667022052f7b087151ae1e34cbe2a8906a2a9175161bb440841072ef28a07b4f9c523dd6bfd87b132fc71ffc088c44aa4a5ce5e71ccabeeb0b2d894839469e SHA512 42b6343787c813eb56a8c241641bfd24755297088c14d378cf3c4c6feb86fac399e13eb58d4d04410c7f2b10df66d484ffec45fbedf62a80026f82ed4b3c05ab
-EBUILD vim-8.0.1428.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
-EBUILD vim-9999.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
+EBUILD vim-8.0.0386.ebuild 10112 BLAKE2B be488042fead28b68b34d1a69e5243beca8815f298a01502bcf34d43f9845d760cd1f14eb4c2be5d73595fe20a53cad116a6009eab2a99c016f9c25280f45493 SHA512 7dd69bd0129c62720819eb65888c89b0e6670964d6558be11ad3a694a4d1d6c09e3d5c3c1f102d99fde71ac645cc6f026e4b2acfde9192f4b768dbaaf3a52d82
+EBUILD vim-8.0.1188.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
+EBUILD vim-8.0.1298.ebuild 8774 BLAKE2B ad2c5d10fb90fb37b8ac2f2c4bf12db008458814adefb0bb05f36568504a76b7e227b25b28c7aa1cab9ba04fc0acb06804be45f3d31add426d74aac4f099d907 SHA512 787969b3fcc6d1595616063fdc8d43e90d8f8a94649b5c7ab2366078279755d923a637e7c015be9d6cc7f9206662e19b8cd8c3fb2267183b0dbb936eed1b4e99
+EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
+EBUILD vim-9999.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
 MISC metadata.xml 849 BLAKE2B c0edeb64be8810f6aafa20ed67a4eec6a0961ff6af3b1390217fb185ceb03a405239dd1ebc4f1f76b1dfb3df3ef841796b0881eea8e8db810afdc828580d9b5f SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b
diff --git a/app-editors/vim/vim-8.0.0386.ebuild b/app-editors/vim/vim-8.0.0386.ebuild
index 9067dade25c4..796d1755732e 100644
--- a/app-editors/vim/vim-8.0.0386.ebuild
+++ b/app-editors/vim/vim-8.0.0386.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.0.1188.ebuild b/app-editors/vim/vim-8.0.1188.ebuild
index be9a4fdae498..5b4fa3b57665 100644
--- a/app-editors/vim/vim-8.0.1188.ebuild
+++ b/app-editors/vim/vim-8.0.1188.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.0.1298.ebuild b/app-editors/vim/vim-8.0.1298.ebuild
index 95bb24280538..03c93322d81c 100644
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ b/app-editors/vim/vim-8.0.1298.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.0.1428.ebuild b/app-editors/vim/vim-8.0.1428.ebuild
index be9a4fdae498..5b4fa3b57665 100644
--- a/app-editors/vim/vim-8.0.1428.ebuild
+++ b/app-editors/vim/vim-8.0.1428.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 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index be9a4fdae498..5b4fa3b57665 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-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
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7ecc2e46fc70..02d022d0c256 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index ebb2ad09b640..e6b4996f6d7a 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -11,7 +11,7 @@ DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
 EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
-EBUILD ruby-mode-2.3.0.ebuild 502 BLAKE2B b691a5125dd82db1b59b0edbea820a635c71dfba24f5aa41207409048f95bc60481acf40d76cf32a9c5ab5bd8d84ef3a083cd2b4f648efeaf42c93d85fb2341f SHA512 cd2124551ffabc0e170ec37112f2e77356d31e11b50e31e81e734339649e417fe145898ccd4971f200399b4e8650b79eb3da148601dd271ca01102c181f1c71e
+EBUILD ruby-mode-2.3.0.ebuild 500 BLAKE2B ca7d66e47421a5efc8510ab841109286c8b59f39c107e8c43688d6be7710d30569d332e3aa34414459f04f8b6facf360f9f08d647a56df2da2800c24803daf14 SHA512 1777a948b8c36cededed450f6bbde323720cddbae3b5cb03e37548a4005602751db955dfacd203dde8eb88d6c3d79f05594a5fbd3a5620f1f9c845fb488f9f61
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
index 294227185d71..56f3a56dc091 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 4d4dd4702a02..c3d50160fbf2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 619753253ad8..cd0ef6e322f4 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,6 +1,4 @@
 AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429
-DIST cadvisor-0.28.2.tar.gz 4109967 BLAKE2B c55268a0768adeea75ecc2baa1093d5d5360d1e0be56cea467fe759278c7047060c4b78179a3a35801afbcf6415ffbeb7e0649c92e79878e5615c73a37eeabeb SHA512 e682b8e062ba373e5726a8076d5be75322e7c592bd751aa32da9a99e5d380a77fc4b376aa478b0beff18bae2bc8432d3a70542605681410d5e1e0b1919a6c252
 DIST cadvisor-0.28.3.tar.gz 4110487 BLAKE2B d6b9d6de67e5672a3ba57ea0c28f38e2e96ec43910f8f5bbbe17b377ccbadf026d4418928234149e9ad3936f4c0871d7c371dda2bea49111735a33520154b2d3 SHA512 da111d74bfa3485c42a03a027ccbf833886e561f3244a081ad5439f7a714767cf4666c43c17b0b976089ea40916089aaa2c6070ec4aefc19798a1d5325e005e4
-EBUILD cadvisor-0.28.2.ebuild 564 BLAKE2B 7e048727b92b8e24f69d67804f73b292806a0d60252a548796d2ba8a2f7d96f2e4da31c88cbc1c10d2fc796b6da7f079ab39e0cf2f0ce394210a16f7b298d053 SHA512 3673e73cbe50d3383d12580b7e1dad55e02c2aa229b27b3dd1e03299a8bbae3b8defc0661e369a68245a3fc4eb5ae0ca23384d36b4d1b33cccf99dcc70e0fe99
-EBUILD cadvisor-0.28.3.ebuild 606 BLAKE2B d05563f9fd2e57e2c817ab1ff977e52f61765ee7ac4144927d5aa80ecb4982f27eff9fce99d140beb57cf1349ae443be19b540a0836cf265d9dba55b1dd0d868 SHA512 6867dbc96bd9cb2689c6cb21ad4e0a895c6b5a96f733c048752e75d3c086fce42263867d5dfcbf2369c8fe662e2c5835e7b69a04042a4b8733ebeb70ce22e67e
+EBUILD cadvisor-0.28.3-r1.ebuild 1067 BLAKE2B abc96e7260ef9e215c4c9343484b4247d8d492537103e25c12dc890a0bc707eb2a1509f860aac3c1228548c8d0f7e91ff25d2441805be6ba0564bed95ce1f8b2 SHA512 c995afee18eef221f57339d58588a3ae98a659e83da0079b84175b98e36cf2e512d216e78e4b72ed0498497dfd5955438130a2eb9694b1fa2cccfdbcb2afd92d
 MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06
diff --git a/app-emulation/cadvisor/cadvisor-0.28.2.ebuild b/app-emulation/cadvisor/cadvisor-0.28.2.ebuild
deleted file mode 100644
index 25f12f419338..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.28.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild b/app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild
new file mode 100644
index 000000000000..a9f0af88b2da
--- /dev/null
+++ b/app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="1e567c2"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+	sed -i -e "s/git describe.*/echo ${PV} )/"\
+		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+		src/${EGO_PN}/build/build.sh || die
+	default
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}"
+	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+	popd || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	dobin src/${EGO_PN}/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-emulation/cadvisor/cadvisor-0.28.3.ebuild b/app-emulation/cadvisor/cadvisor-0.28.3.ebuild
deleted file mode 100644
index c3666053995e..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.28.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dobin ${PN}
-}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index f71361f01c06..993f735e9f85 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,7 +2,6 @@ DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858
 DIST docker-17.12.0-r1.tar.gz 11008332 BLAKE2B 95a95bdf64bc6d6aa7a60d515d5661589c0e94ba687d5d766010579a5511dc85f2675dc2b22d628b153ef6fc018be9015ea80a4bcdaea4c10689a7c70eddea79 SHA512 7381bddf4b2538b2b76229d962925eee74a38ddbb18a6f988ccff2a2ce0ef334148ea76d9697e89acc6c9018cb6f785b59c27450dfb930ead01fa5684c6a90b1
 DIST docker-18.01.0-r1.tar.gz 12530532 BLAKE2B 4fe85e5522a45f14dac343714c3ac5f7be3ccf710b54bb09ba06fb728d40d874c67140991aed62f2e5f0e9a66153f1953d2d29288775b707f2a27702685ad5e7 SHA512 e58b23200df811549d8c2ba4b915458b3496b982b264f0aa0ff8c6406e0deb20af2180ea20ac1eaab35cc2a14bea98d6d14d197fdeb54f8c7949dc1b6a336872
 EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
-EBUILD docker-17.12.0-r1.ebuild 8776 BLAKE2B 3a2799fa9294495adf9e1e1c29ad68b65890d49a73e16c92f350efc83218d8220fea4a9a6c3b5a265a19d4ea30d4de127630e35a726a41bb7091a9f38cc59c30 SHA512 cb78f0faecf99fc68fd85f52558bcc92cc6310b781a467ba158d7b2de6d7e6893f7d5e1629af9984f9154fc24bff4d17ca60d44ec96856f6890564b7ca925fdd
 EBUILD docker-17.12.0-r2.ebuild 8810 BLAKE2B 81f3030489b812d1f1773458a88a6100e285f882ce516ad95b335a84ab8d829143ad793786a8c6af67abda4a4fd0e4ce5e1be0e0d27c2fce2b35ebc54ce5f6a5 SHA512 b99df673d64bca410bc02bed15ead277c8715cf7a753f75b1e543b3f848bcdee5d1b6632c06198173bcf039cfe1f318c8e024a7198d5364db902973aa5614915
 EBUILD docker-18.01.0.ebuild 8810 BLAKE2B 81f3030489b812d1f1773458a88a6100e285f882ce516ad95b335a84ab8d829143ad793786a8c6af67abda4a4fd0e4ce5e1be0e0d27c2fce2b35ebc54ce5f6a5 SHA512 b99df673d64bca410bc02bed15ead277c8715cf7a753f75b1e543b3f848bcdee5d1b6632c06198173bcf039cfe1f318c8e024a7198d5364db902973aa5614915
 EBUILD docker-9999.ebuild 8077 BLAKE2B 8b65d3c59a41acd2020f1a43cf79bea2871fb7b911170741eb3c217e9acd4a5a24b2c2e204e3635cac3e392c72bdafc332b25fe0613991e37cb3d7c55700d399 SHA512 1fb9025bd12796909a623a3ebc9da52e4e8fd73d11f60e25907530fcb62039d7dcf580e4e6f22f103cf1a07aee8bfd6975fa11bd0829952d23613d4ae7ade9c4
diff --git a/app-emulation/docker/docker-17.12.0-r1.ebuild b/app-emulation/docker/docker-17.12.0-r1.ebuild
deleted file mode 100644
index 6d61dd58db34..000000000000
--- a/app-emulation/docker/docker-17.12.0-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# 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="c97c6d6"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}-r1.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.0
-	~app-emulation/docker-runc-1.0.0_rc4_p20171108[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}"
-
-# 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
-	~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
-	~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
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	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
-	./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/kompose/Manifest b/app-emulation/kompose/Manifest
index 9d3824b68f69..fdaa905dba6f 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,5 @@
-DIST kompose-1.6.0.tar.gz 5227025 BLAKE2B e24e5d142db7a1e55c8e2c05db2a7717a6bc178c3ed73ec2732fb10ae39c90dd2da41ce604fc590e8888ef1b92d5ba68821f66f54e2285d90c2bc9e3af3f1da0 SHA512 57e8b3530ad260d0ed6a679119c559f616c45d407db8929797dbf321e32917bc236ac41e1042f65aa8460026d54cb03180e8b8264dadb6fe05ec6d21293140a3
 DIST kompose-1.7.0.tar.gz 5230263 BLAKE2B c2e50ceadaa3f88b5d6a9c6fbca93a0a45a16fb4d208a9194578174d9b67697f70d52f8f7a517609b56acf0cb646a9ca4e9137e1a830646e1084c10aabfd1cc0 SHA512 bcda4d891cdc8a0e331aad3baca9e88be32d302ed1ab89a561874881ec9e1dd04f7158f9315ee59a49d4906cc9d08821a417ff04a8ebe9871edece842b2e85b9
-EBUILD kompose-1.6.0.ebuild 889 BLAKE2B c3dbaa96f72b9bcecfe6bab9ce40c33ab61dc588bae8db80374d0383c7b746d36b15afd5094b67783ef950659cd15d6a3e92e74d111c6cbc702bc156a7d802d3 SHA512 6201ae62bd4bbd69e844e9c4d691414cce1e3fb4792a96813fd4e7060aa987fd23235e40eae20f70b0b96189d6a010957212c1d266bfb59e62f85df3d9bd24ef
+DIST kompose-1.8.0.tar.gz 5230179 BLAKE2B 47f2770eb527bb3b40e1734f9e5173ce4de55ef55460f624dcb22374d94d4a4ae650d82db6508dd0e441535c03da8a0f61d7600425e44604b580ecff493ba987 SHA512 4e618f9e9adc65abd2be503dd28b6d7761945a99788e910cc072d04b6088e953152f9354fe168fe7bf22252f698b957e2cc23440d242bed62c4b7415dc513e33
 EBUILD kompose-1.7.0.ebuild 889 BLAKE2B 575e0b5251fd3f41ee591cffc6cac87702171d45dc6018ba077db331d069aa0cf6617e3d3bb9a7b474590e9707354c860321b081a5dc6bdf7c8d6f2ad722f7b4 SHA512 b935247e6d46a5fd34c4205da74719b28e31f7329f89f78f8ab5e97b2ba3d3704307500ac5e99face463814763284ab79e66c78b874d80432d116f6e69da1cd8
+EBUILD kompose-1.8.0.ebuild 889 BLAKE2B 60e02b868aec4525aee7666909754fca33ac499f6f31148a67d6790f472ca4e033d1f7738b8a2af5bcefdc5d553c41aec56d546afdacb288f55d06eb917ea31a SHA512 86ab3ebd33ab93727adbf2018c0d6e65b49c7fc94295a55c15e3e1e002cef71af60b13de8e9c70f4efe5f4d4550852c3e024316f206d8b2b00861e4a3e77d028
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.6.0.ebuild b/app-emulation/kompose/kompose-1.6.0.ebuild
deleted file mode 100644
index 4e83fbfc8c99..000000000000
--- a/app-emulation/kompose/kompose-1.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="e4adfef"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.8.0.ebuild b/app-emulation/kompose/kompose-1.8.0.ebuild
new file mode 100644
index 000000000000..402f0a13667c
--- /dev/null
+++ b/app-emulation/kompose/kompose-1.8.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 golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes/kompose"
+EGIT_COMMIT="v${PV}"
+KOMPOSE_COMMIT="0c0c027"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Tool to move from docker-compose to Kubernetes"
+HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 959925fe5d16..22cc465797b9 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,5 @@
-DIST VBoxGuestAdditions_5.1.30.iso 59494400 BLAKE2B 37f70eb8dd17e0492a106fa5e2cea1ed93b0a0a955e75a3a32d5bd45c447c6c4ff8e78e13b19922a34e8e982d1de5bbf0815a8e81c2a8ea2596477318d7acbf5 SHA512 3205444339a0c85a3b234ba462add21033b5b3eee18eecc15b150b21f5f9f1aadb92b7049bef6be1201e1acfd1edd6f2924c38d56a52770113c8401bcca9abcb
 DIST VBoxGuestAdditions_5.1.32.iso 59512832 BLAKE2B 73fcbb3d1db1056970a86e9c1c1efe1f8ddc3566c327df5bb8e14b22b827fc603dcba580a6db60c75f3dff00f268313ac196d49355e184395793363c6d16df68 SHA512 073b103308f7cab18ca096bbb863d8cdea8efd8aa4896b2ab2a6326f549f1cf6afb70ccb55baa1dab85485879e522584a9f91adb4434c5f8bd649e73dae65900
-DIST VBoxGuestAdditions_5.2.4.iso 57868288 BLAKE2B 8affaa8a4bfdc434081e62a194b751fc143f748995b769cf565497751787a15fafc627b994ef8d30ea98275039cf8d85e6e5cdc3a7d806961f063c9c6fd1423d SHA512 51445f43ed337f7ea850b599c7dc80837e697de0ef1eb33e79b2dccadda50c1cb1fd37e98387648564cb47c4d593f7138e68410033c83ec0a4a65f04a057723d
 DIST VBoxGuestAdditions_5.2.6.iso 57866240 BLAKE2B a9028dc084eaf8e2a759112a2dfcc9f15486a1479fbb0c3ab77484e2775b8ed8df3759d265b73bea18cf20e02d82c022c8af1f23e9a640b89f69d2a6bd8c3e26 SHA512 23fe9512455d77b4cade7f731c9244439882ae54068158384e96c988ba7b4e2721ba2414189f6366f7c2d13f6e5355a0fa0bff501db6087705b8d1242e9d0f2a
-EBUILD virtualbox-additions-5.1.30.ebuild 727 BLAKE2B 6d7493b2ff01130ecc416dca8fa0fa11813904787a0707729ca7e179a573bc8024328b260e3eee67141672e2ba0c4fcedad1a49451cefec01d07487c85fe58de SHA512 7b86aa30735d2282551667ff47ffeb1fb2fb10af9ba05315c73407dc19ac4b9a7e2dca6515b748ab89f6546d5b5a7c206a0e53ab421ed949c404394e6be9999d
-EBUILD virtualbox-additions-5.1.32.ebuild 730 BLAKE2B e5b284ab1db5180cfc90866b279dd411e5d17fadba41647e1621d341e93b15fb76af3d10350fd1053d28c28b177db420a1fc8165ec74c4147bf3703b653a6a2e SHA512 3eb253c90747539da53100924213a60848405f18514228b6fe08b41749bc63275bed9f0bb3990e1759009a2c2107015daba1ffa5855f1bff93fced71b7dabbe3
-EBUILD virtualbox-additions-5.2.4.ebuild 729 BLAKE2B 9d3eaae2546cdc5a3b174b250100e1b894cf227dfe64583239a17de8a7324ccc8b1de14532cc16da695c38eecfcd8ff1958fb7508f3e0d0b145f5becb30912ce SHA512 b3c4774741bc62a014e57f26de9cb0ee4366d8ad31a6ffa51101085e591af034f44e1de156227719d7bf8bf12120528524380b0c782777f2bc98b0e8e11cd0b8
+EBUILD virtualbox-additions-5.1.32.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
 EBUILD virtualbox-additions-5.2.6.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.30.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.30.ebuild
deleted file mode 100644
index 4fd01d14b29e..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.30.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
index 78890b53d45e..dd3165781272 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.4.ebuild
deleted file mode 100644
index 967492859a76..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index da8ef02bb651..d14dd1f563c4 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -4,24 +4,14 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz 19589163 BLAKE2B b35d9bb90216a77706fe5f0de624affaff4177d4b6e561f7c76003efd1a386a1f5b5f6b1c6b559cddde6ffb55ab5f7eba3e4c9b2135f31c09313b473ba6579e5 SHA512 c1e13fc59b9556f980bec02bb2860e717f752d42c3d810f70267e5c07898bb1aba9d3f3403fa5aa388478aa609397da49dcf10311836d68093101715a6ae200d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.6-120293.tar.gz 19468503 BLAKE2B 5e1e490352fb06ceee868171583e50f8ca634a53799237cd1a3632566b6ca14d526e714156ccbeae48bf01aa4372a89d8926601cf5c1d8d34127d2d1e6a53edb SHA512 f81715b5e89ae21080d9a1b23cfd9be30bc35b32963c1b710262c1ee88bedc405dd9d2ff96761b8725716bd98625eea58fc076de6d42a4728078ebe303e195af
-DIST VirtualBox-5.1.30-118389-Linux_amd64.run 88186323 BLAKE2B 4700613906658a223134130e99eb4f669ffc875e732e9b43d237926b9a33d385d6056240ae5f498d13b6a0cf26c600b293657fc64c838db498bd3935fa23a8e4 SHA512 b6312abbf5c0e4bf22aca50a81d297a0ed21d5b4b72242e21750ac088c56817dc90ac1ae068dd9006f4f736130510f26f55793b8c09999c590da09908e304280
-DIST VirtualBox-5.1.30-118389-Linux_x86.run 87397839 BLAKE2B cc0fb245f98883dc19cfc9a64d8c7a9593d8ae784895a9a8224c146779ab65901052ba5d62f57c9cd5bc46d23e208cc97046fd6641eb8848e90c4828bd745813 SHA512 643ef90453e3a6a6d3fbb365176a72de1743230a58ee45f1cb22fd8bb57c9cfe6013ec1ffdb0076a248d1987a1e3fea13ca71ef9ca983cb8e6378d30c76451fb
 DIST VirtualBox-5.1.32-120294-Linux_amd64.run 88360402 BLAKE2B f548855260467be536f2e5ff95ae110636b1fa824a78058cf9318b21592d9643bd780691984ff803c7b0ec998f8e1720d81731fb26df42718cfe3c7b56ad09e4 SHA512 3b7e722ee231ad087b4d2419406e46b6b33a7947d6dcc8ecc0456f04925fb551810c5f27a54d9c99b0d729c1bb0d5d79d17bb8720291c8210ab88c15215244ec
 DIST VirtualBox-5.1.32-120294-Linux_x86.run 87387598 BLAKE2B 657842740d52f046c969196ca776e5572e3bfde55587575bdcc2a957863bb890a40954c9fa014e9184ee77e1e5a81388eadbc5fcfcd22a21c0485e25074bb900 SHA512 38cb01d89edb1fcb44940bdd94c69af824577ebc9fa30a5a2c7c837142fc70848326325b9ee131ad878a9dce71e10b9762854ef0aa66c9060c159abc40c89241
-DIST VirtualBox-5.2.4-119785-Linux_amd64.run 88575441 BLAKE2B c0cdf3cb1c17f1de000926e0b1db9902c965040723a62de95ef518bd4180ce95d4c2c5830abbdbf65823447af22d71f574b85e8ccc322ddc05137556f4381401 SHA512 f5741e29348a7a307146b8f34e0e9c4bccd8368879ba7c4e3836de21ad014f31ecf1bb7033173f8651483d4a11ffca7c8b475f9149474533cd7ab8c31ba8cbb9
-DIST VirtualBox-5.2.4-119785-Linux_x86.run 87653837 BLAKE2B 069005e59da03e9cc6d8ef3cc296c192095c4b37bc17de5e768d13f46e1d8bdd7573e6b1a2b359cee5a37c2a2bb9808707317c07b4dd3d76cbbc0ed0824f55bb SHA512 245a90b8312988d6b19765ecd404bc569b370c400353294a564dde4ab57a006fda3e24dd423d7ba3afdfcd20484b95adc86d598ebbd640f1742d9c92ed010021
 DIST VirtualBox-5.2.6-120293-Linux_amd64.run 88554959 BLAKE2B ca35ed89b47a65c82abdc5268ec2b85fc78f405981e0919198effb99ca307fa74e2329d3901fcae9a18fada1dbefc2c39feec78609b818acf89ed09036f3693a SHA512 501e3de48553e3664242303c6f403784ffa71cb064de36c141a2be67aebe1d44161aab62af2101ada277cc02d98678fffbabbeb3aee69a5f97dca5dddb3ea553
 DIST VirtualBox-5.2.6-120293-Linux_x86.run 87725517 BLAKE2B 301a44c5086377cff6e8cce794238661bebd6417a645de64227cfd5dccda5091d2bd88c33beaf393ceba61d912aed672eeba6ca084dd56553e042dfb0709a1f2 SHA512 f44753fdaad115aea5a576ac0b04463b7c25958c5c0a2cb20de76ef24045addbbd6fdfee60b0070149f78add2225f3384a523abd7938ee83f2fd9e79414b0742
-DIST VirtualBoxSDK-5.1.30-118389.zip 9861374 BLAKE2B 4890a76c5bdf6ec8215095ce3246ee518a6cf527136fd896bec3503175115de05e52f946b5c44fa82ecb087900a5eb4f2bbd0cfa79a4eba94ba4d48f757f9604 SHA512 89d3407860f202329e5958e724b848884a9047f01000090d1000bce22005311b3650c1ef1fb1fc998c29cc77887af856b64a5ac76154408cae7b921860d8a9f1
 DIST VirtualBoxSDK-5.1.32-120294.zip 9860157 BLAKE2B c9222bc865bdd70cc2ac516b27d1a1c91e0c05b04129a0c9793701ca8080c184ae2d8157bf687995c074aa03b8242e931164b03c5942e4d57589def16aa21b57 SHA512 aa2f0b647e177f95543c41beca64546a5d9b68f2081365ceb9a4494e500747de55fc71e899f31d65b96a9b5a1c8bfeaf8518ddb45791fb25e0ad992776c4c186
-DIST VirtualBoxSDK-5.2.4-119785.zip 10150272 BLAKE2B 58b16d12f6d2939ef0a45e0bf627f7977740ef9c3f277935c624f6b226cfa84390ea3d74a840c9da85bfc392b60ecebb2a8bc1dae51db92848bea42deaaea536 SHA512 b23637d9eb086c999733a5a0725a8a97ade5af11ccb7fa6e74bd20281270333d551ea22ae404f462726a2250593b624cbbb8169af9d16a07bd2383bdc74da92e
 DIST VirtualBoxSDK-5.2.6-120293.zip 10149320 BLAKE2B cc42df0d5e6a3f100fe5b205c6ab930f5537a9671c69ade26f60fe0922dd57ee2e82354e142acfcf08da3a5bd89ae796fa17a02b672185a7d7a78685df93f4b3 SHA512 73c50891df9094e4a894fe6a39026f2fc267f4cf6be9ce3130a8e20650ca7787c76cdf456c3d0035111ec3110d8300b5a9d15a4de3f2bdaa583980a4b83d5d6f
-EBUILD virtualbox-bin-5.1.30.118389.ebuild 8374 BLAKE2B 6ede0b42eae71f3cb90571607182fdedebd609642a1086a88990d31487db9688719271c068d9aedf3cb70a75dc59175b0456682415d22577ba8d09d9448fa1cb SHA512 f56f6be68888456ff843aa4c0d104026b2d17dcd32259e8ef2a716407494314952fc03560c14e5f13af96885587310d2d38404163745c1dc0a3c089b1d3444fe
-EBUILD virtualbox-bin-5.1.32.120294.ebuild 8380 BLAKE2B b91eb7b11d57d95cf669f4501b6d13e812181c4f205d0b4d1a0a5f97a5dd7ad343a47729302aff062a787c15c3d0085ca448b6e13477f572fd6537845e28a625 SHA512 ac90ac7a566429d8160595672b7ed34acfa3bacee444b3324d13cd452b97228beab63220036dc602e65fbb323a82f154435542eb9e898835c1cf768c43984618
-EBUILD virtualbox-bin-5.2.4.119785.ebuild 8376 BLAKE2B 396e12d24098e7274d5b538a3b656b6bc5b28ccf965e297fc9ea18b3b090408d006e34da46970a75d6d3f40653528c74fa7151893ef112f850ad444f80d06ae7 SHA512 40a0618b48b9981fb9295e1e2a0b3373dd7145022b32aecc497ec7321534887c50c45645e5b6a22c5962c8e892c213a3cd8540711566b2f2b0e73ae63cb6ff61
+EBUILD virtualbox-bin-5.1.32.120294.ebuild 8379 BLAKE2B 9f53e6e59c0ea3401ce96e247d0896642b2755df7188910ee09896b4dd780fd8474ee17f49be32417af8da25e73d00aa42a659a9f720dea671673090123c7cda SHA512 9ba2af13d6fe7f2b05c501ddda7eb8eb7900b101bdb6bc9150c570f0c1404f2ee238ac786626818f15b26eb46b1531b9710cea37432aa6fcd4eb93f834f4f2ab
 EBUILD virtualbox-bin-5.2.6.120293.ebuild 8381 BLAKE2B d31bb147d4495d803ddf8938c634fb599f765a5dee9a67301c14c12ff03e7c1c2215b804eb99d3cdcfdffefc02d56bfcb00adff3b652d8d77c50e61aeaa97999 SHA512 9593b0c466361c72198f033f3cab26eca13e4173e05f4b85bb3fc878996d421903f96d1756af9200522e7d142a63556320b1e8845305e8caee3cdbe4e914b7dc
 MISC metadata.xml 769 BLAKE2B 79832f104022a0c85b74fe12bc7a562d88830e25b82ec18626a6ecde48bf794a618de880812974a57882ac15f5cacd516e127780542b9fb514327e5706846bca SHA512 d4d7b28e05404c670993fb8798b5b5de23d3f446e12195665d9965214e59132996dcbe45a28965a9beef6e5156635d0a5a1799641a613c27dbb8b335d51f0dc8
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.30.118389.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.30.118389.ebuild
deleted file mode 100644
index fa2dda552ac8..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.30.118389.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
index 767415165270..c0b989d91810 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.4.119785.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.4.119785.ebuild
deleted file mode 100644
index af542eaeea1b..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.4.119785.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 5a3ac5675814..e1fb52e23b62 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz 19589163 BLAKE2B b35d9bb90216a77706fe5f0de624affaff4177d4b6e561f7c76003efd1a386a1f5b5f6b1c6b559cddde6ffb55ab5f7eba3e4c9b2135f31c09313b473ba6579e5 SHA512 c1e13fc59b9556f980bec02bb2860e717f752d42c3d810f70267e5c07898bb1aba9d3f3403fa5aa388478aa609397da49dcf10311836d68093101715a6ae200d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.6-120293.tar.gz 19468503 BLAKE2B 5e1e490352fb06ceee868171583e50f8ca634a53799237cd1a3632566b6ca14d526e714156ccbeae48bf01aa4372a89d8926601cf5c1d8d34127d2d1e6a53edb SHA512 f81715b5e89ae21080d9a1b23cfd9be30bc35b32963c1b710262c1ee88bedc405dd9d2ff96761b8725716bd98625eea58fc076de6d42a4728078ebe303e195af
-EBUILD virtualbox-extpack-oracle-5.1.30.118389.ebuild 1085 BLAKE2B aa3c98d0f7816f32be63ef9ae0f5839e86693fbdb5a388bfcf3bb35a7b5750d99d8aa817bb07f40e99b219264a192b5b5bac5445c3fc65fe26c5ace6e92fb94f SHA512 a018d8881652c86d254cb87b68bd134d51930009f815001a6e06a3f40539305dcc3846395f8f59312506a74a9e517c0bb63c1a22d53be60b14a999f66617b79a
-EBUILD virtualbox-extpack-oracle-5.1.32.120294.ebuild 1088 BLAKE2B ef04dfa15fb7b2928c7dbd5c9b1e46d3caec8e2ef6980365f6d41ab3d51118425abd4e0267e5f558a1f5062f95f46c7bb45a944b9fae4c4abdd995699437e4ee SHA512 abaf8babb193c67c3f02fe0c88cd626f65663ea7f5badd05a929169e8f682450a74988c2c1783a2a9d9482fea1ba1b4741ec6fc6968832c85eceaa4a91133a84
-EBUILD virtualbox-extpack-oracle-5.2.4.119785.ebuild 1087 BLAKE2B 7438822221f0c3f20dafc2460dfd0831d83fd8b1819b91c4e6dd21c827611f0adbd23b6d1fc05f11856724e8c97d163b3b17de6b6d0a5e54f7fd83b2df03a5c2 SHA512 dcf3ae05bd9bad1806fed11baa6a182971f2dfd448b7b015cd5191d984dc1f8335b206030feac3fc64e1e21a9d55ab1ad5c4f6d9ed806cb25770c92f1eb110d9
+EBUILD virtualbox-extpack-oracle-5.1.32.120294.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
 EBUILD virtualbox-extpack-oracle-5.2.6.120293.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.30.118389.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.30.118389.ebuild
deleted file mode 100644
index 3c6c739d35e3..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.30.118389.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
index c1a50be17a27..adb086974170 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.4.119785.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.4.119785.ebuild
deleted file mode 100644
index 4d09c1248e68..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.4.119785.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 5911e198f6f3..489f67570a01 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,14 +4,10 @@ AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c0
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
 DIST VirtualBox-5.2.6.tar.bz2 118530572 BLAKE2B 19d32a9252e9594a4c09828bc2bc739c46daf409745c01f764fb54bc17faa667081a27534ac11666cbf1b417057cb99a416faa42e3986ce4d2c08378e7e7240c SHA512 ed6f801c055e9b8e152118a1ebfecdc15c310fac2b007ea3cd4a404d17cbbbc83782a3baa76b979c72b9399616844291576846d820f8aefb7c4b4ec2eaf36482
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
-EBUILD virtualbox-guest-additions-5.1.30.ebuild 6048 BLAKE2B b6541f7ccd93d301d76515945533474f87e51c8b85d3434bf9b090b9e99ac4bdca083d19dc2408c37746c38b0ab169f3b103da12468cab2a45f848352367fbca SHA512 75b70e9f6c2c05d1c7840473e1f5b2d2764c12393832a8a9570f98c3b0aef88c39a44c30311ea7bfa4153b303addb25d66795d73bcff964407d2086568ce3d7f
-EBUILD virtualbox-guest-additions-5.1.32.ebuild 6051 BLAKE2B bf40a36113155925a568650477873a09b34986c1e109ffec89a8a5cd89957d62f997d838c24bdd215368ddb197736b9690b1ab14d80d7a76b12459722595d05d SHA512 4fe27d081d95d3c2b19644b1e8ce652f781d5055b158d5c14eb8efdbfbbdf52dbcf1ccf2031d35d553d92fbc92d3e3d6ee28923f2fbe65aa3f477d75f2f378e6
-EBUILD virtualbox-guest-additions-5.2.4.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
+EBUILD virtualbox-guest-additions-5.1.32.ebuild 6050 BLAKE2B 7e7e412f7ef41931b1edbe289c9bf83686da85ab6e62ed0cc6b1654af764744d21b043a57d1637be882ab4eaf1ba514c779d937fa3e9b9c0eede5bc6b778be18 SHA512 109c99a1e80c09f0bc87587c769a9812b45735e3d17175d223976235765913b78eba4cb1ef51253134977807fea07d3efe0e2e06c16b52972480b8c425ae360c
 EBUILD virtualbox-guest-additions-5.2.6.ebuild 6154 BLAKE2B 95ce4ae40cdd8d81a79b65566a96ab9ad9ac4de057ae41296804d2f8c95d1ecb33179a25244462d8c68dcade2f92a26898d7822939cd133081a27af2b0edf657 SHA512 1582add77c42d27941444a43bd01e55783da0fbf771a710f759091603f475bc99fd57af484dd4d1aac64bf9cbf05f1eb8a5a07c6bb941f57a0c3107d91b42cd9
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.30.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.30.ebuild
deleted file mode 100644
index fc79a1b2edde..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.30.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
index fa09607a1819..6e4ec727e56f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.4.ebuild
deleted file mode 100644
index ac4efcb4574e..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.4.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox
-	!x11-drivers/xf86-video-virtualbox
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	rm "${WORKDIR}/patches/011_virtualbox-5.1.30-sysmacros.patch" || die
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index d96030fef6c4..4f6df2bcc0be 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,12 +2,8 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 BLAKE2B 9d23df0a04e70765b0eb1ec123e7b835a8e3c35d5c89c08239cc3dedcbcf7a34ce49324ab607490738639a1b5d7febef9083ee4b6c3344112695bc2ee079081b SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
-DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B 00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
 DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea2307b13a3f5ce17a19edcecb0340f94d34995e557b016195443a53edc9d68a313d064008e5af04c7fff28540ec513c6e9a5955e02e0 SHA512 10ead68e53ae6bd72e39b31d536fc36e0999fe506a6d7fd6a6f9e462d539213ad65deb56e2b926baa5cc4b16fb4071d89e105889e873fda0e4a1f20387a7cd39
-DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1
 DIST vbox-kernel-module-src-5.2.6.tar.xz 635096 BLAKE2B 8c168b9e1d3de395ef663ca81edf63939cb7670f769995c20f9d4cb4f87194b22812707bfd62d52dd85e19de2562c27c182aad22f40928358cf07a0c5ac15d79 SHA512 c85f94e08357a11574af306b00e71c445b80ef6dea6c47d9cf1003c0d9f36d265ebadd2ae27b3dd96f41cc544e501d3eb0551559bebf25d35b9861a282f489bc
-EBUILD virtualbox-modules-5.1.30.ebuild 1739 BLAKE2B ee506a122a4f99f714d23f2ec8cf4c094d5bc9a591b1a6465110e78623944c1922dbab68bdaf388bffbc59cbf426a6c31cf46179a87e8e7fce5fe7f462d8e6c6 SHA512 3282bab435ac11bc356cb8aedc384c5686d8480dbec352b39e80331c488c1a8f8dd87e80dfa2ac778a95f345f4f706c297ed360ff3b5d41c6c67b6e07a16d510
-EBUILD virtualbox-modules-5.1.32.ebuild 1740 BLAKE2B b7abb5d1ad734bea3664d7018b51b0e12ddc0e88f86c279172dcc5fa56033cf6041211a58fb2b175babbb71b7c82cfdaaa5d50043a6026ac4ae66c6ec138663f SHA512 a2e14337796ed7b52bb4e67b922567c798b0851899554599a9c3bcde9381d2a1be581065ffa89191a6ea4eda5905c5a5639680862d67e6dc52895001a7b69116
-EBUILD virtualbox-modules-5.2.4.ebuild 1499 BLAKE2B b5a34d365a0b3372c72b7c9a56e5a7ebcd86ab799731dca63b5e074c9010cd44af554add0cb5b0aa74dcfea7c5c7bd3f19bdbc152681f1c7fa43e970f8a8d8c1 SHA512 1a72712277d4517fa8dc6c5fad96032ef1792a3cea95703d7e66c43816e13e00c1ac232f3b0404e27726fcaa12ab7b6ea5006df76b5cc961043630b811acd116
+EBUILD virtualbox-modules-5.1.32.ebuild 1739 BLAKE2B 075e707c8710c1c74e7bb279df95f26088f0a2ff47a4b4b3cec48d8f95c18ac078d4181f1feaf4d5a3e4bdd47c17e4b96854ab93705ff5febfee0f061d3e023b SHA512 9ddf65c8b8997dd7fd153e743aff01acd01d1f8c1778758be42eef94cc588c6dbf2f976884ed55414cbcae6644b6e875632e4f9fb4a06b51b91eff6a29ec97f5
 EBUILD virtualbox-modules-5.2.6.ebuild 1499 BLAKE2B 1ebe9aca2a473ff23c839c92091e572be6a8b1d140585cb717610b3403f539ba2b9bc6495298c337341271fe812b7792294e492350388c62aaa9ef21e5512d02 SHA512 5b5aaa85b3e7d6be210a299c79a79f012f733f6df2ecdb08d581ad9078fb7517d5165407146fc957ef4221ca0348db61780becb842d6fd108287d1387c5692cb
 MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
deleted file mode 100644
index 14b649c9c34f..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	if kernel_is -ge 4 14 0 ; then
-		epatch "${FILESDIR}"/${PN}-5.1.30-udp.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
-	elog "\"vboxnetadp\" and \"vboxpci\" to:"
-	elog "  /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
index dedd001c9bfa..065ee9010815 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.4.ebuild
deleted file mode 100644
index 2c9761e6f22f..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-
-	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
-	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
-	elog "\"vboxnetadp\" and \"vboxpci\" to:"
-	elog "  /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d77f87b31c9c..5316d0aeac06 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,15 +7,10 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446
 AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
-DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
 DIST VirtualBox-5.2.6.tar.bz2 118530572 BLAKE2B 19d32a9252e9594a4c09828bc2bc739c46daf409745c01f764fb54bc17faa667081a27534ac11666cbf1b417057cb99a416faa42e3986ce4d2c08378e7e7240c SHA512 ed6f801c055e9b8e152118a1ebfecdc15c310fac2b007ea3cd4a404d17cbbbc83782a3baa76b979c72b9399616844291576846d820f8aefb7c4b4ec2eaf36482
-DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.30.ebuild 13879 BLAKE2B 710bc0860cb92d07f23863550306e58ef464f6e1c57d125771b691a7caa88f0ee08ef0c6d56b3fb7390500354a823d944ca32b3f3e9fc99bd7db29b135752a11 SHA512 6ac9319d23c3dfeea7855ca3cb3f97662033d118e94d4eebe388b1d73235d274ebb12980d38d0b3030cf62c20119ecf21a5b0b1da6fb82fbf116ae7423a6bc0a
-EBUILD virtualbox-5.1.32.ebuild 13883 BLAKE2B fdc6eff28ee6b32838fe5961a25f2bb6818b2910ae5b96ce89554bfee0f2dc3d2ebbc340dbd63bd7703e3208fee709da1e565b3b9fb388f82953a587a8aafca6 SHA512 df433c38e81c9f7252d7811886877a4e9d1094518f4acd61b1342e5dbf92142bc514d5a01df7867c6ddeccd5c412c309a0dd0d3215cdafddf828f6d365f2e154
-EBUILD virtualbox-5.2.4.ebuild 13870 BLAKE2B a309ccb4e128a738c42afc4537d5e8c4a9430a4671c2963871a11eb7d762b867bda6f298f913bd6726aecda3db913798a21291a837b4bb1a551cbe55aea79546 SHA512 8d343dd8c173ed96a93f8f7fb518b048a3082cadf32fe949a6e4cdb48c272ad44e85c44df55c0dd9d12606ec0a89da83a8dd5429661a94e684f1f375f8bb8021
+EBUILD virtualbox-5.1.32.ebuild 13882 BLAKE2B 5a18fb55794831de6c43c6687b4cc1ab9c8d924861e23dc9e8fb13bc5922812df0a3636794efde02ebd7dd1b778e0313aaee2f7951e3d19600311df90a3a5000 SHA512 8aed9a072dcbcb7af288870cc6b165ce012da6255b87695a97bce532d1791867cee366fe0b69746371d508b495f363aa842d1c42f092fd1503a8d9ed899be635
 EBUILD virtualbox-5.2.6.ebuild 13872 BLAKE2B 5f161288ac0f1bc38cc30981351ad89b076e824f76c936f252230baa9f105d57e437d5f51cdc1bcce629c0db7deed48125c0961b93ced54a1d6569bddcbf8044 SHA512 00bb0276f62dc829447bbf662ad2cbba9c50057e4fb2c03bc59c9771dff10f0c8c5de86508a10d87340e6cee762a04ee801246ca3ce7e4eca5a7807efc7a5fae
 MISC metadata.xml 950 BLAKE2B 98d5a25b631c928a86d8b716936c497aaba8f7bcbb0441c771acbf9998a89168bdfcb5d09e03d58e3403b3d90dd6acb611b1d47f4a0e4bf87a17c2f03ecc78ec SHA512 f09b74c1738a060749799ef652162824b40812de13558582cc660b57f1c379eb2d915ab53c1f2d55bb0c6cf4f917e0a6e55dabb5bde8b592a1eeaf34c3078363
diff --git a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild b/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
deleted file mode 100644
index 31a7801b26bc..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.30-patches-02.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	java? ( >=virtual/jre-1.6:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-	)
-	use alsa       || myconf+=( --disable-alsa )
-	use debug      && myconf+=( --build-debug )
-	use doc        || myconf+=( --disable-docs )
-	use java       || myconf+=( --disable-java )
-	use lvm        || myconf+=( --disable-devmapper )
-	use opengl     || myconf+=( --disable-opengl )
-	use pulseaudio || myconf+=( --disable-pulse )
-	use python     || myconf+=( --disable-python )
-	use vboxwebsrv && myconf+=( --enable-webservice )
-	use vnc        && myconf+=( --enable-vnc )
-	if ! use headless ; then
-		use qt5 || myconf+=( --disable-qt )
-	else
-		myconf+=( --build-headless --disable-opengl )
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
index 68d1ed27e21b..8c962fe7c1ff 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
deleted file mode 100644
index 292349146a95..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.0-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	java? ( >=virtual/jre-1.6:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-	)
-	use alsa       || myconf+=( --disable-alsa )
-	use debug      && myconf+=( --build-debug )
-	use doc        || myconf+=( --disable-docs )
-	use java       || myconf+=( --disable-java )
-	use lvm        || myconf+=( --disable-devmapper )
-	use opengl     || myconf+=( --disable-opengl )
-	use pulseaudio || myconf+=( --disable-pulse )
-	use python     || myconf+=( --disable-python )
-	use vboxwebsrv && myconf+=( --enable-webservice )
-	use vnc        && myconf+=( --enable-vnc )
-	if ! use headless ; then
-		use qt5 || myconf+=( --disable-qt )
-	else
-		myconf+=( --build-headless --disable-opengl )
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index f970dbd26fd1..f34eb704ad04 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -1,4 +1,4 @@
-DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7
+DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
 DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
@@ -11,9 +11,9 @@ DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd24651
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
-EBUILD wine-any-2.0-r1.ebuild 21761 BLAKE2B 284bb3e6d41d93470f0907570fcd3230710289c15770a656e5195b95bda32290a934656cdb94b6f9b6c408d0ac65b8aae420256ab2d5c23dd0f610d88f97aabc SHA512 cd2f0668056dfd36332686379dd2bb27be509da4d56d22694aa35bb38c459a651926ec90249e939277134b24eb218eba0f3b14649aa3060283061e22b099a194
-EBUILD wine-any-2.19.ebuild 21634 BLAKE2B e6fe1603afaf4942d4cc651b0020c0f882ed4f29db3b645be426015ceb491bb9018ea1bac8ae3f85b8bccaf5dc0e8bb94df2f94ce309031907b66217e57f81a2 SHA512 6651b4a83e316f08426597f967e030755a92ddf46b3196e485b352e6733009b9000e2875d4651f3e17a0b22bbc8b50920dd04e45e2429d5294752bfc4319c1cc
-EBUILD wine-any-2.20.ebuild 21722 BLAKE2B 1e6b71226c3fd8e787dd2b622d91e16300ab271720bcd7b9f451842c9ce94dd99414c5de80ede5bd6709e1672b611bf9ebb578c704ac01f21e0d9dff4f3a2dc7 SHA512 9b3c70eedeef4f7cff42511c683854620154d9430f06909fdd9d797bc078695f484bce973639b2fd473105c74982bd8a34ba324d1d2c36d4c5f3e14bba259bd6
-EBUILD wine-any-2.21.ebuild 21722 BLAKE2B 1e6b71226c3fd8e787dd2b622d91e16300ab271720bcd7b9f451842c9ce94dd99414c5de80ede5bd6709e1672b611bf9ebb578c704ac01f21e0d9dff4f3a2dc7 SHA512 9b3c70eedeef4f7cff42511c683854620154d9430f06909fdd9d797bc078695f484bce973639b2fd473105c74982bd8a34ba324d1d2c36d4c5f3e14bba259bd6
-EBUILD wine-any-9999.ebuild 21722 BLAKE2B 1e6b71226c3fd8e787dd2b622d91e16300ab271720bcd7b9f451842c9ce94dd99414c5de80ede5bd6709e1672b611bf9ebb578c704ac01f21e0d9dff4f3a2dc7 SHA512 9b3c70eedeef4f7cff42511c683854620154d9430f06909fdd9d797bc078695f484bce973639b2fd473105c74982bd8a34ba324d1d2c36d4c5f3e14bba259bd6
-MISC metadata.xml 3380 BLAKE2B 3f887b2ecf1dfc1873b97a59a27c5e648ff4e7870f8c673097b817016de92b280ea4c1405ec3deacac8ca091d3c7ac2f6ca1c1e7d46580475839172577c5c96f SHA512 eb5d7e8b3e996b32c86de67c317211cf9cf7b4e97aaff69b2c2343de4401e0a83240084c5ad461e4b96a2cd09315a97ecd5ea62bc75f1803d99f3bea722af4e1
+EBUILD wine-any-2.0-r1.ebuild 21736 BLAKE2B 43507c717b8390c4b170253960d71310ef059198601e527672987832bd44cf075c8ed3cdc1981d9dac5ef10a9179487b718412d4998b6a2bd8dd84a3f9c6250d SHA512 295cba1da91a3b32eb16949ab2524472106c802338a50b4fc643e36b4801ed2e049b5545f2d1bbf894b38fd20f69d119609937db847cb46c062b548674fee11c
+EBUILD wine-any-2.19.ebuild 21609 BLAKE2B 928da0cff62c4d24a63809680c971ab11b59dd6e5d6c285cc408985560102737127646987b5e95f4c954037cd63bb3fd163acade8ce0719743d3843bb885b1a2 SHA512 0fbe43dc924c977c69a1a671400f74408ab6e15c1238c86bcbd11c9b9f437ddc5096314779eeb74908b8e9e66196202706d56175e13119431a839154e3e5b9dd
+EBUILD wine-any-2.20.ebuild 21697 BLAKE2B 6b303a5d3e547da807602200ca235c5d6009b31913e44ee9ec6c785b9807361d9a6613390c7a582bcde345226eabe144cf16a851f61a0e18ccf74e101d262bc4 SHA512 fefc155ea1386f43452f75812db6cc72e2c261134d11b3ed21189d384bba33d266c17cd394231cf24d39b10d99bb3dcaa622be8ef2abf6aeaa649f4240da83e5
+EBUILD wine-any-2.21.ebuild 21697 BLAKE2B 6b303a5d3e547da807602200ca235c5d6009b31913e44ee9ec6c785b9807361d9a6613390c7a582bcde345226eabe144cf16a851f61a0e18ccf74e101d262bc4 SHA512 fefc155ea1386f43452f75812db6cc72e2c261134d11b3ed21189d384bba33d266c17cd394231cf24d39b10d99bb3dcaa622be8ef2abf6aeaa649f4240da83e5
+EBUILD wine-any-9999.ebuild 21697 BLAKE2B 6b303a5d3e547da807602200ca235c5d6009b31913e44ee9ec6c785b9807361d9a6613390c7a582bcde345226eabe144cf16a851f61a0e18ccf74e101d262bc4 SHA512 fefc155ea1386f43452f75812db6cc72e2c261134d11b3ed21189d384bba33d266c17cd394231cf24d39b10d99bb3dcaa622be8ef2abf6aeaa649f4240da83e5
+MISC metadata.xml 3581 BLAKE2B bfeffcdc9b676741dc5c467fb564a063ea9501c629896904b079c19545a2194176a5c433c39efe66e3c6744cf798077df80ed3ef192a04129679749cb9136656 SHA512 9f8d69ebd57f5766b1cd289fb1ee681a10053edcf0d4636b7f13a7f16719e4eaa3609d7c34df607cb6cd39171f45ce2206618f8c102816ae0dc4adebfcfdc953
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml
index 2abb35cd0a3e..20330724652b 100644
--- a/app-emulation/wine-any/metadata.xml
+++ b/app-emulation/wine-any/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
+		<description>
+			This package must be kept in sync with repo/proj/wine repository.
+			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
+		</description>
 	</maintainer>
 	<maintainer type="person">
 		<description>Only CC on bugs that involve USE="d3d9"</description>
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index 29a108cac284..bf410a00dfd0 100644
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
@@ -192,7 +192,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -428,29 +428,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -590,16 +591,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild
index 63346482c6e9..bdbe5cc7ddea 100644
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
@@ -191,7 +191,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -425,29 +425,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -588,16 +589,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild
index 8104783ba8ad..dfe4cca912e1 100644
--- a/app-emulation/wine-any/wine-any-2.20.ebuild
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
@@ -192,7 +192,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -426,29 +426,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -590,16 +591,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild
index 8104783ba8ad..dfe4cca912e1 100644
--- a/app-emulation/wine-any/wine-any-2.21.ebuild
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
@@ -192,7 +192,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -426,29 +426,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -590,16 +591,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 8104783ba8ad..dfe4cca912e1 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
@@ -192,7 +192,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -426,29 +426,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -590,16 +591,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 0e11ac123d86..c790ce805799 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -1,4 +1,4 @@
-DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7
+DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
 DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
@@ -7,9 +7,9 @@ DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8
 DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a
 DIST wine-d3d9-2.20.tar.gz 48822 BLAKE2B b9ae137e05f672990707aa3ae88aa569a517e644579ff545b35393074ca03ac0c6aaea7494a90a4f6c4278f7397e1e5078e90383f5debeb4edfe46c8834446ff SHA512 f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0
 DIST wine-d3d9-2.21.tar.gz 48813 BLAKE2B a83b558682f19a44f62c33c8782f4415250c537373654b36c4b1aa6e078ed09594ec1f0e5b76093d88b835786dac96047a1584aa94953256d6ca2804e08ec3df SHA512 64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a
-EBUILD wine-d3d9-2.0-r1.ebuild 19254 BLAKE2B 747f450622806a64166c9981c7e78a5149fec575a1d3d7905b7316f1bf76db91beca6827016f5b8cd7986325950bfd2c2452cc798f37a0c2b970a46d3773fdd2 SHA512 c76f00ac09fc90d36de3982df34c30f5c28f578acbc904ba1bb8e686afe43898eb78623d23f5a54d50d55ddacc489b54c3e6a3ec51851434ba18ee71da610f79
-EBUILD wine-d3d9-2.19.ebuild 19127 BLAKE2B 88be387d562541476994aa0d7a17735d8c9970bca128ca727cb7a0961f6108614b10a7789a95b25ca164b5f2060dc282e932a14466e591247b6b5a5fbfc28049 SHA512 b2053cbe76df4fcbf418b2650a5cbb862a051180e24a025c11a7f4a140a63e2b2425cb5b10eafe066ec0bc9791ed1f0ce8742553f9b01091e9e05aef68119d83
-EBUILD wine-d3d9-2.20.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef
-EBUILD wine-d3d9-2.21.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef
-EBUILD wine-d3d9-9999.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef
-MISC metadata.xml 2847 BLAKE2B 3812c6a1ab5c6e0afaf377d01df19779bfbf76a8dad4061f08c352e9ef7a6ef1eb7a4546f189373929930a147cdcb2d55f29473cd5cbb6de3625680b02a34a68 SHA512 aa92412a3858822c2bf82c517008a2730eb9710126b1ef336020c3085c4e36503ee921661bd88a5b20d9fa01b539fbcee617620a7c7762665592d8cd711863a0
+EBUILD wine-d3d9-2.0-r1.ebuild 19229 BLAKE2B 696516d3ab3c4f7b626099ae04c9a2e47724fbbcccbc3a33016fae3e1625ffef80ad68af0ddf96d1f822101d73abe051ea5984baf2a238b9f01276b2f86a593c SHA512 b2e4f2edf8f1052f0735e5935b616632527df2dc76bf649635bc35c8493a844a359148f76c10e46e4a6b89dcacac89253e3bcc7376bcededb9ad0cac146e55bf
+EBUILD wine-d3d9-2.19.ebuild 19102 BLAKE2B 272907e0e28cc2b4441c79aaadbec99fa70f011ec48e77b802249e26024a6ad20c358673934167f67835bf57a7ef44a22cdcbdc6feff2e90745e2f9ebf145ab3 SHA512 f232a329a6ffa8e7e085fd5477ea9b5dfe20dd4f3c81f855d3a4ada0979e6a102333002523f1325c92e7ed120482075fd49c9f613a33763e4ff8ca0822911031
+EBUILD wine-d3d9-2.20.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be
+EBUILD wine-d3d9-2.21.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be
+EBUILD wine-d3d9-9999.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be
+MISC metadata.xml 3048 BLAKE2B 827d51a456d0f97c612c123983e8549d3419731490f821357ceffb205b7ef339fa13618ccce938cda63eafceec361a0136ef7c7ebea0b3256008f4c8133818d7 SHA512 55daa64049533568a1e27d9620ee066167e36c51d27930f1db55a451a8cd5ab8425fc4457496e2c5222f2337f38b87573c46da63c805969734c4df6a1f4f02e6
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml
index 44e32fcafe35..375e22626d8c 100644
--- a/app-emulation/wine-d3d9/metadata.xml
+++ b/app-emulation/wine-d3d9/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
+		<description>
+			This package must be kept in sync with repo/proj/wine repository.
+			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
+		</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>commendsarnex@gmail.com</email>
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index 3f8f0715fe47..27edc48d213f 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
@@ -172,7 +172,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -373,29 +373,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -530,16 +531,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
index 0df97c34f88d..442642abc178 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
@@ -171,7 +171,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -370,29 +370,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -528,16 +529,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
index 7f16ff60d600..ddbc7bcc947c 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
@@ -172,7 +172,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -371,29 +371,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -530,16 +531,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
index 7f16ff60d600..ddbc7bcc947c 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
@@ -172,7 +172,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -371,29 +371,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -530,16 +531,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index 7f16ff60d600..ddbc7bcc947c 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 D3D9_P="wine-d3d9-${PV}"
 D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
@@ -172,7 +172,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -371,29 +371,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -530,16 +531,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 8df54760e647..fe5a1825ed1a 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,4 +1,4 @@
-DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7
+DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
 DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
@@ -7,9 +7,9 @@ DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd24651
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
-EBUILD wine-staging-2.0-r1.ebuild 20793 BLAKE2B f3a87dfdace4173abd2b7018bc18cb1910f6c404b7e0411080db4949475f43ee7e159955e5af966f5bc99414ce3085a63e58fc926a4aace4832e8121aeec5f6b SHA512 dc32bb4279dd224c264a72580d6e2f2e421b6f053eeeb65f869a7fd4f6b842381d32314b6fba6dcb22d2f6124653e7473ddb391e68ced474fc1c7c923ec589e1
-EBUILD wine-staging-2.19.ebuild 20666 BLAKE2B ed7752952c7b8ae3948949a7f5b441c52fd2dadf0b9ccaa26fa9dc6e2bad7d795aaea8fbd660d3c4458e1a272a588ef7e4a03c24f4a0aec2093897c6fe816004 SHA512 ac30d2f1224995a68f47b9b27216d4cde51b82368300e7bc28264d20b3c12ecf999ef16bac1b73bce611e4027f9f95f6d56fd2002e3f53608c7cddd8757ab1f2
-EBUILD wine-staging-2.20.ebuild 20754 BLAKE2B dae90a610b9229b68ae696688274f27a6435aaa61f3964e72059ee63d676c2498799914fbeae58007f8d590166a30087cadaf66cc5151853357b9a075c16677f SHA512 50f126afae4310a0599bbda609264ec905ad537f233757c9b03a87bf99028632e1f65fe1502c0c6089bbb2c86fc232589d68930c46b5a813f0d2a1b365c4bfec
-EBUILD wine-staging-2.21.ebuild 20754 BLAKE2B dae90a610b9229b68ae696688274f27a6435aaa61f3964e72059ee63d676c2498799914fbeae58007f8d590166a30087cadaf66cc5151853357b9a075c16677f SHA512 50f126afae4310a0599bbda609264ec905ad537f233757c9b03a87bf99028632e1f65fe1502c0c6089bbb2c86fc232589d68930c46b5a813f0d2a1b365c4bfec
-EBUILD wine-staging-9999.ebuild 20754 BLAKE2B dae90a610b9229b68ae696688274f27a6435aaa61f3964e72059ee63d676c2498799914fbeae58007f8d590166a30087cadaf66cc5151853357b9a075c16677f SHA512 50f126afae4310a0599bbda609264ec905ad537f233757c9b03a87bf99028632e1f65fe1502c0c6089bbb2c86fc232589d68930c46b5a813f0d2a1b365c4bfec
-MISC metadata.xml 3027 BLAKE2B 2565248dcb436a4b8edad34c23e9778962be2410b1560817f9b250c34d009d23c22d926443d40b52f8c3f6d7884a0c4fb0eff4f1c46396c1db0d9c79c3a103e2 SHA512 d1c58d449c2b9ab201da4338718b724cfb7d282b22b506375a7d9531d64d601414f2ac734e5cc2cb812cc4904351cacac731456596818201cd9361bbb1393d20
+EBUILD wine-staging-2.0-r1.ebuild 20768 BLAKE2B 4e4636ae0fa3aa767b4d0079766bd22dccde5e38fb802f33a7d6d71e175f294357bb345620b93fb1baab1244522bdbf30267f38f7682e1734b3a2cf6c09533a6 SHA512 16db4fab8967c5df32575e3b722b2456dbc660e37b0413c4c8ad52aff3a3049e415d39f82c89a4e5c1f7227b4fa82f76e37c5c0996ce49580eb51224e5dd5abf
+EBUILD wine-staging-2.19.ebuild 20641 BLAKE2B ec70d1acd751fb84945c04988c5ae708f477a3ca92d0bbe013e74eb064a4d020665811cb831482f036a74fdd00d58b342a0b434f49af853bf5bde1ae5a794021 SHA512 5bcf05dfff4b06b8fceb56ba148b023493d36373dff4b5c384c73b1ac73dea7f3655460364ed7ae6886026fbc5b04fd1b1d6581c0450174d8fcfbb598c996df8
+EBUILD wine-staging-2.20.ebuild 20729 BLAKE2B ef27e8f9c5eb0225a2c990bd66473aedb4ca094dafb709aa0bcab9f72e53f7396542a89fa50f58dc1e38bd8aefa5ed6d3cf32b87f7077b5f203052a89c4f7a08 SHA512 69dcdf44b1db164dcdabe35c2f51ab25a96cc936f3ead901ab3a028ba31fc70749f18d6cb58c6a0c8071338acfb9cb8a5f320fe97b1c12df39773c4e5c658062
+EBUILD wine-staging-2.21.ebuild 20729 BLAKE2B ef27e8f9c5eb0225a2c990bd66473aedb4ca094dafb709aa0bcab9f72e53f7396542a89fa50f58dc1e38bd8aefa5ed6d3cf32b87f7077b5f203052a89c4f7a08 SHA512 69dcdf44b1db164dcdabe35c2f51ab25a96cc936f3ead901ab3a028ba31fc70749f18d6cb58c6a0c8071338acfb9cb8a5f320fe97b1c12df39773c4e5c658062
+EBUILD wine-staging-9999.ebuild 20729 BLAKE2B ef27e8f9c5eb0225a2c990bd66473aedb4ca094dafb709aa0bcab9f72e53f7396542a89fa50f58dc1e38bd8aefa5ed6d3cf32b87f7077b5f203052a89c4f7a08 SHA512 69dcdf44b1db164dcdabe35c2f51ab25a96cc936f3ead901ab3a028ba31fc70749f18d6cb58c6a0c8071338acfb9cb8a5f320fe97b1c12df39773c4e5c658062
+MISC metadata.xml 3228 BLAKE2B 72b86a3a7eb0deb4c442ecbcef9d8613cd432b36c1cf9b49e662b34e3c10263f0331512b047bc88a812c81f0e150dcb78a9534e3d5485d939b4c8a7c26065bd5 SHA512 66e0a520786649b5e61338fb90b8be203c6c31424269fd0b3df9c50cb552e9ab8587ccfd341a67036f6941a01aca8901821596f6220b650062e2a08209a29b6b
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index aaf5b4f6a919..e9e31879e220 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
+		<description>
+			This package must be kept in sync with repo/proj/wine repository.
+			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
+		</description>
 	</maintainer>
 	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index f47c6e1f34cd..22f656f5a5da 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -182,7 +182,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -406,29 +406,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -567,16 +568,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild
index 4e29daa68e01..bc6708782715 100644
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -181,7 +181,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -403,29 +403,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -565,16 +566,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild
index 3985d3c668fa..9454c3d09a99 100644
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -182,7 +182,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -404,29 +404,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -567,16 +568,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild
index 3985d3c668fa..9454c3d09a99 100644
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -182,7 +182,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -404,29 +404,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -567,16 +568,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 3985d3c668fa..9454c3d09a99 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -182,7 +182,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -404,29 +404,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -567,16 +568,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c520f76de7f5..32e1e34bcdde 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,4 +1,4 @@
-DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7
+DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-2.0.1.tar.xz 18845444 BLAKE2B 82e692c9a216087ea3b51cba659b12a79b25b44aac2ab572b9cf6d12c29b8fa5cee3c4bb9f8e9dca526ded2c6ba1f77d2c948b783914427ec2b93409e64ccaec SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d
 DIST wine-2.0.2.tar.xz 18854952 BLAKE2B ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ecfe7def4082747df4c55d0ee5c72e132bc77b49935fee8d0faf7f4d2cddfda0c712b6042b440dda1946e682b6 SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90
 DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb
@@ -8,14 +8,14 @@ DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c
 DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
 DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5 SHA512 14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
-EBUILD wine-vanilla-2.0-r1.ebuild 18011 BLAKE2B 91c7603cc221480e35bfe3148e2ca419a8695084b6968dad417723dbd31e323abae5e60f187359feef380867c452b8874f8bca2c4fbcf0cf8d895818b54797aa SHA512 5032c75158bd2f316443763dbb6f6848b72dfd01be1aca3dc11f515579a7c2232de43f7071fc6d3e696a516df850d67e83d4edd51a1f41d3c27147488aca76b4
-EBUILD wine-vanilla-2.0.1-r1.ebuild 18010 BLAKE2B a1f38c14445e0941645ef54b9ecb36e48239bf50c50e355b1033fb7d8c51ac72d5787225660f4bfb8007c66f97810633b5825dc92cc7606ae26592cc5d0f54ef SHA512 0592b96c356dd8681b48626d841fdbe8afc7e29551b00bed54b7d56c82e9e3c5bc83796b2b1ef70cd731b630d5bccff4f47443751cf18ed75f4cd43a37d26171
-EBUILD wine-vanilla-2.0.2-r1.ebuild 18010 BLAKE2B a1f38c14445e0941645ef54b9ecb36e48239bf50c50e355b1033fb7d8c51ac72d5787225660f4bfb8007c66f97810633b5825dc92cc7606ae26592cc5d0f54ef SHA512 0592b96c356dd8681b48626d841fdbe8afc7e29551b00bed54b7d56c82e9e3c5bc83796b2b1ef70cd731b630d5bccff4f47443751cf18ed75f4cd43a37d26171
-EBUILD wine-vanilla-2.0.3.ebuild 17820 BLAKE2B cf3be13348718676571c4e236f44e0a5598ac94951410d64cdfd2cd254121804b05d2794c0ac8a765c15750f13db8c68b6444603158bca3c04a24bf5fdf15ddc SHA512 fe9abc2765e8ce51e5f96fe9496dea6919e4affea5160226b8bfce643c3116b3e81a6a01117098824886f73dc5a0cbb2307b1d8e2365dbd1890e41623c8e7c1c
-EBUILD wine-vanilla-2.0.4.ebuild 17822 BLAKE2B adbecc5efbbb353c1b0571283716d402704cb89ac1c4463952b49388932752bb404df6d1ae65cb7b15facb2821ff036052d25bed36afaee9060ca3f9159cba3c SHA512 f0a5ea445785e400f34d93cecff58ba7bf1132c9ee745bc4664babfd0dc4d34214151e47fd6940f25601ce8fb6aeae73870e7ba256a37bbb45b379b34c275ba1
-EBUILD wine-vanilla-2.20.ebuild 17971 BLAKE2B 5fb351f9b5b91748fa13e7340a9d48a14b27b3396b6dd909c96d020498b99811ace09a17c315aac5780a9ea07a187060c89a8da23c79b0f72bed638dc9534f66 SHA512 efc843a7505bcf8d041f191d16671c5c664df3cc8322dde6d2c36f2785f8d4fa461305bb68e7b8bd529f69c8aefd3b1162086f4da92d794852dd41872af00095
-EBUILD wine-vanilla-2.21.ebuild 17971 BLAKE2B 5fb351f9b5b91748fa13e7340a9d48a14b27b3396b6dd909c96d020498b99811ace09a17c315aac5780a9ea07a187060c89a8da23c79b0f72bed638dc9534f66 SHA512 efc843a7505bcf8d041f191d16671c5c664df3cc8322dde6d2c36f2785f8d4fa461305bb68e7b8bd529f69c8aefd3b1162086f4da92d794852dd41872af00095
-EBUILD wine-vanilla-2.22.ebuild 17971 BLAKE2B 5fb351f9b5b91748fa13e7340a9d48a14b27b3396b6dd909c96d020498b99811ace09a17c315aac5780a9ea07a187060c89a8da23c79b0f72bed638dc9534f66 SHA512 efc843a7505bcf8d041f191d16671c5c664df3cc8322dde6d2c36f2785f8d4fa461305bb68e7b8bd529f69c8aefd3b1162086f4da92d794852dd41872af00095
-EBUILD wine-vanilla-3.0.ebuild 17971 BLAKE2B 50643ab7d10ac86633e2591d0606b857c4c3718836712b5b34d1ac7cccc659e999d5d728060c3d531fd0c9d174fb42c77c08d6da08c53ac8afa03ff687e6687c SHA512 bbb3118496523eece509dbf59d14aa2d377e642b6ce66bcd51b1fcd1f130e4717d9fd35f181ab96ddbf322f3d242087c8397b7f792d4e804e70345430875ea90
-EBUILD wine-vanilla-9999.ebuild 17971 BLAKE2B 5fb351f9b5b91748fa13e7340a9d48a14b27b3396b6dd909c96d020498b99811ace09a17c315aac5780a9ea07a187060c89a8da23c79b0f72bed638dc9534f66 SHA512 efc843a7505bcf8d041f191d16671c5c664df3cc8322dde6d2c36f2785f8d4fa461305bb68e7b8bd529f69c8aefd3b1162086f4da92d794852dd41872af00095
-MISC metadata.xml 2603 BLAKE2B bafcbc708ea156b90b68c69625eb5f293e5a5fc28bfe44269d37bd74b26ad685d6183d0381eeec7f360ec31911884569ea4d2141e9a011e089c3f1cdc4874f2d SHA512 3488427cc15c66af3bfca0ded6a51bbad6f3b3a0935dcb94fc7061056356b6d83eb8a5fee21e6b12f9bce6824d755af9c81b98c755821f9bd0e714929868a759
+EBUILD wine-vanilla-2.0-r1.ebuild 17986 BLAKE2B f5a6f03172293021d546083053064990c075bc99fd78a42ff9d812393ba409a3f201b819ffeaa99b79b9fc031a4fdbe9ded904d300e985f2719e533f8155d174 SHA512 605ca911fcb54117e7b791a2ac1792a1d0d5176422f0461b101564d70f0478b95385c968b0178267ae7c8faa30597f5cc8fa66aa818b984dee32d1cc08d747c3
+EBUILD wine-vanilla-2.0.1-r1.ebuild 17985 BLAKE2B d0e25c59d52f1c91aa040741e4b31c2fdaf0f9b76462d30bc3e7572365a81fc1a0df83ffc7652199170469927b37040ec9f997fbe42ec3f5a439456438bcf9fe SHA512 11ec639568e752a0bb2ecb1502673ef6574ef0d8c25a6dfad644d9beb7aeb7717320db7e98d29bde0cf214f4a5daf314883d2a4a3173fb71f82ba02e8adab13e
+EBUILD wine-vanilla-2.0.2-r1.ebuild 17985 BLAKE2B d0e25c59d52f1c91aa040741e4b31c2fdaf0f9b76462d30bc3e7572365a81fc1a0df83ffc7652199170469927b37040ec9f997fbe42ec3f5a439456438bcf9fe SHA512 11ec639568e752a0bb2ecb1502673ef6574ef0d8c25a6dfad644d9beb7aeb7717320db7e98d29bde0cf214f4a5daf314883d2a4a3173fb71f82ba02e8adab13e
+EBUILD wine-vanilla-2.0.3.ebuild 17795 BLAKE2B 778ff850aaa3ceb42e2051ab8b2acaa29a1da6772e2aa72141da041ea49bf377fc2fc77a80eda5d0030a865edc5091710efe3480cd5d8548e194c31672b0c4be SHA512 c253d0aa79d98a0f260a8f4704d16d16920492430b1d6ea0289aed8a787e9a55465516e9f634e90b2b5c041b2e7bc51278a02bc0206617d428d5d96f85a4a70b
+EBUILD wine-vanilla-2.0.4.ebuild 17797 BLAKE2B 69ad64890ecad9829728d79394478ab16d7954af61061e95519e1189daa3b6734844bdd7190d1dfed1058df01c493bffd0b64b9da2c6bef77ee0a3187765df15 SHA512 d27cdf3fd57708d3f8ae9396cb097131b2de78754cab54bc2f054364c91a5a132acb7c9bb613eae422669666df9f8279b4b62f6123a5c7d15372c480eb88e8c3
+EBUILD wine-vanilla-2.20.ebuild 17946 BLAKE2B 1e3e83d73529e47b3360758781395ca472581a15c68e08a41b7c0ba35613ae7867dee2d3d7e11f649adf0f77e87d758a20936a3870700717a4a30809f855e433 SHA512 a18cb8d34216e3001ebfa81e0462032ae458a4f64f3277217620d1774126597479ba10000e9eba4961561a4ec931c3ada5a793fa628e067d72d7275a5951f6c2
+EBUILD wine-vanilla-2.21.ebuild 17946 BLAKE2B 1e3e83d73529e47b3360758781395ca472581a15c68e08a41b7c0ba35613ae7867dee2d3d7e11f649adf0f77e87d758a20936a3870700717a4a30809f855e433 SHA512 a18cb8d34216e3001ebfa81e0462032ae458a4f64f3277217620d1774126597479ba10000e9eba4961561a4ec931c3ada5a793fa628e067d72d7275a5951f6c2
+EBUILD wine-vanilla-2.22.ebuild 17946 BLAKE2B 1e3e83d73529e47b3360758781395ca472581a15c68e08a41b7c0ba35613ae7867dee2d3d7e11f649adf0f77e87d758a20936a3870700717a4a30809f855e433 SHA512 a18cb8d34216e3001ebfa81e0462032ae458a4f64f3277217620d1774126597479ba10000e9eba4961561a4ec931c3ada5a793fa628e067d72d7275a5951f6c2
+EBUILD wine-vanilla-3.0.ebuild 17946 BLAKE2B fd08d40e1e0c79b66e8917d46ebf4d3cb0e30ccb64c49500ba76d2f37507ce38f41109f6935094b6a4c4aaa91756b1912214bde513af52f78e4706e2cac4618e SHA512 8e22c1a528d173f6a5a088c42eef5a57b4648ad55c8485ba08da4b92643b71c1c0c94ab97c14741ed0e2a9e023405ac24ac11a0eeddb9279c8927a8cc447f7e3
+EBUILD wine-vanilla-9999.ebuild 17946 BLAKE2B 1e3e83d73529e47b3360758781395ca472581a15c68e08a41b7c0ba35613ae7867dee2d3d7e11f649adf0f77e87d758a20936a3870700717a4a30809f855e433 SHA512 a18cb8d34216e3001ebfa81e0462032ae458a4f64f3277217620d1774126597479ba10000e9eba4961561a4ec931c3ada5a793fa628e067d72d7275a5951f6c2
+MISC metadata.xml 2804 BLAKE2B 6adc35db3f840da4d6dc4c5256098025d7e219a4fc0fb4fd6834ad7ae2255088a14ee7e8f222d3a78b886df5c593653a7f60af884c7492df78adcc11f64ef80d SHA512 2fd1871de4cff8aa9c2216548c31c66cda90e8b24e273583a064801b0886838c9d27d0d9a508498d3b960047fbd814f624cbdedfe0c56b62a6cf9d82fd9fcfbb
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index 990972b6ffb7..411d8ae7e5d3 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
+		<description>
+			This package must be kept in sync with repo/proj/wine repository.
+			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
+		</description>
 	</maintainer>
 	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index 423245563fe6..b6970b16cc73 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -340,29 +340,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index 1c0dacadef0e..f19e2fee2149 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -340,29 +340,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
index 1c0dacadef0e..f19e2fee2149 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
 	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=(
 	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
@@ -340,29 +340,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
index 2aad417a855e..dd5dfa1b3911 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -155,7 +155,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -336,29 +336,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -491,16 +492,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
index f9492b16f21d..c2b9e49b3b08 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -155,7 +155,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -336,29 +336,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -491,16 +492,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
index d1fca61ea408..55dd4bac5b71 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -338,29 +338,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
index d1fca61ea408..55dd4bac5b71 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -338,29 +338,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
index d1fca61ea408..55dd4bac5b71 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -338,29 +338,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
index e4a4223882aa..cda136eb494a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -338,29 +338,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d1fca61ea408..55dd4bac5b71 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20180119"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -157,7 +157,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864
+	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
 )
 PATCHES_BIN=()
 
@@ -338,29 +338,30 @@ src_prepare() {
 	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Depends on wine-2.0-prevent-build-of-localized-manpages.patch"
-	# Duplicate manpages input for wine64
-	local man
-	for man in loader/*.man.in; do
-		cp ${man} ${man/wine/wine64} || die
+	# Requires wine-2.0-rearrange-manpages.patch
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
 	done
-	# Add in proper manpages to Makefile
-	local search_text="wine.man.in"
+	# Add wine64 manpages to Makefile
 	if use abi_x86_64; then
-		sed -i "/${search_text}/i \
-			"$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
 	fi
-	local l
-	for l in de fr pl; do
-		if has ${l} ${LINGUAS-${l}}; then
-			sed -i "/${search_text}/i \
-				"$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			if use abi_x86_64; then
-				sed -i "/${search_text}/i \
-					"$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die
-			fi
-		fi
-	done
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
 src_configure() {
@@ -495,16 +496,15 @@ multilib_src_install_all() {
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
 	fi
 
-	# Failglob for bin and man loops
-	local glob_state=$(shopt -p failglob)
-	shopt -s failglob
-
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
+	eshopts_pop
 }
 
 pkg_postinst() {
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index be50637a8504..b421d99c2e98 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,5 +1,7 @@
 DIST winetricks-20170823.tar.gz 639027 BLAKE2B ce0de22ff3363bd6fd675d07ea235ed5fb03ea7a84b3242329c094d6a9190c61813a1f360e74ece49d43d2dbf48dbbb1e94c4febc6e1a0d84cf1df895b0be6f9 SHA512 edc805be1a1c4fa64ae16b14fdd46786e259b88a0cde7afdf24bf934fa79f4acf3d9e599727fa589f155ec265569953b9e419cda79d54057157cbb1510261e3a
+DIST winetricks-20171222.tar.gz 645227 BLAKE2B b3d798071593851eb7293270ab40438f114576c58e9c4df2ec685192a1eb1b2f8fbbb9d71a7575472575d56941a6fdeb1b7b2c33e87e0e40885ba8489764c392 SHA512 fcee2dcac4c68a2c8f61995146d83a81ee85364e400ceadfed1ae1a6f49ea389a6d044fc9ae2324dbbaf93ec3eb616ab167ed880b1a583e89708cf66fb8c5965
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20170823.ebuild 1844 BLAKE2B 7a1ac74d1d2ecd27ea980cb07559dd6149c917aa1f0370ce1301caf77f855831ce93b9bf962cb5ee83fc77a27c530f83de94d602474ca52ba15887c215028012 SHA512 0b92d6f305586196e0a469b60fd79e2cbc99a18057a40f0051c8be2f2278c9dd2daabbd1271a8553388aa6f0f09a22a97f4df1e8a0aab25982f7475c22412f6f
-EBUILD winetricks-99999999.ebuild 1846 BLAKE2B a24b3385804984effe52049039d69f9329329ff45bfc3c82911ce2b7dda720f14650fe22ee7cbd9be5a829104ee6f153a46f36c3d26fd1c164d0a896d02d98e6 SHA512 f3e7d1df5c674e3ab7d68625c35bbb77788acd583862e4e784a8d38f29753c11cd465484fb96900a92bdf2191d265de64696846543da352d8e0655060ad25ff4
+EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
+EBUILD winetricks-20171222.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
+EBUILD winetricks-99999999.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 MISC metadata.xml 847 BLAKE2B 7c0cec1bc4d544c3ead723b2a3821e0634c7d6390c9b7c159832bf302b96a7a9110eac78940de88042d043cea50e93ee1f0cbb756c68992eeb635d46b0ae4c69 SHA512 54a9b20cf84169fdad35f89857cf5bd7d17906a53c760079f789653f89d5dece00fb8bfd8014d1603159cfd72fe0b9d93b1e28c0c788b522c642f224d7d22f10
diff --git a/app-emulation/winetricks/winetricks-20170823.ebuild b/app-emulation/winetricks/winetricks-20170823.ebuild
index 33701ee6fa54..111786b25a30 100644
--- a/app-emulation/winetricks/winetricks-20170823.ebuild
+++ b/app-emulation/winetricks/winetricks-20170823.ebuild
@@ -32,8 +32,8 @@ RDEPEND="app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	net-misc/wget
-	x11-misc/xdg-utils
 	virtual/wine
+	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-apps/kdialog )
 	rar? ( app-arch/unrar )"
diff --git a/app-emulation/winetricks/winetricks-20171222.ebuild b/app-emulation/winetricks/winetricks-20171222.ebuild
new file mode 100644
index 000000000000..58d2e71829ba
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20171222.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+wtg=winetricks-gentoo-2012.11.24
+
+SRC_URI="${SRC_URI}
+	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
+	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+
+DEPEND="test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		dev-util/shellcheck
+	)"
+
+RDEPEND="app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	net-misc/wget
+	virtual/wine
+	x11-misc/xdg-utils
+	gtk? ( gnome-extra/zenity )
+	kde? ( kde-apps/kdialog )
+	rar? ( app-arch/unrar )"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		git-r3_src_unpack
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
+	else
+		default
+	fi
+}
+
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+	default
+	if use gtk || use kde; then
+		cd "${WORKDIR}/${wtg}" || die
+		domenu winetricks.desktop
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins wine-winetricks.svg
+	fi
+}
+
+pkg_preinst() {
+	if use gtk || use kde; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index c6636ccbdade..58d2e71829ba 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -25,24 +25,32 @@ HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winet
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde rar"
+IUSE="gtk kde rar test"
+
+DEPEND="test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		dev-util/shellcheck
+	)"
 
-DEPEND=""
 RDEPEND="app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	net-misc/wget
-	x11-misc/xdg-utils
 	virtual/wine
+	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-apps/kdialog )
 	rar? ( app-arch/unrar )"
 
-# Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
 
-# Tests require network access and run Wine, which is unreliable from a portage environment.
-RESTRICT="test"
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
@@ -55,6 +63,10 @@ src_unpack() {
 	fi
 }
 
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
 src_install() {
 	default
 	if use gtk || use kde; then
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 7e48412514b7..b46455f088f7 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-cdparanoia/Manifest b/app-eselect/eselect-cdparanoia/Manifest
index e7105caf4c4b..b4141d72ab49 100644
--- a/app-eselect/eselect-cdparanoia/Manifest
+++ b/app-eselect/eselect-cdparanoia/Manifest
@@ -1,3 +1,3 @@
 AUX cdparanoia.eselect-0.1 364 BLAKE2B dbdf0c69f8ab295bed4529d7c2178f4c5bb64862d7192eb37c280eba47fd566fdb1ba60109b3e289e35e9a55b4d6fb32dfe06f19ca51d4cc76df6ced769679ce SHA512 000d15d17432e7fd7d1e6c56b3ac6069f6ae20a08e20f0380879695bbba726102469fda8ef862f3e23fd8878b1a986e60f4d8194cf19a85eb39b6bf5378a262e
-EBUILD eselect-cdparanoia-0.1.ebuild 702 BLAKE2B 0812d0ef7f2f333ff5c49fbad58135c84e84944c71821f7750b37ada8719addaf0c29fe0904032aaaee71b5c71ba258d65072981bfa0015817bdb9c7c6e625b9 SHA512 a7820b97a74a5930ee3b4415040d0751a591221fbdb5b502b7553f48043ccdebe8af06a8c0f1f167e5507307278b01a247d26c5b9c7d9cd948c64b5e5bc0bc4d
+EBUILD eselect-cdparanoia-0.1.ebuild 690 BLAKE2B e707e6673f91471a4e7aa5eb245ea4c1d47b04081c140d9bb188c01cd9d6c9c2c2646f98832e6cded98fc4a597d5e3e1216a74bce9eec211bc56d82122e12030 SHA512 3dcc5db8a690e6ce306c8b4a9c11669af3f977a7d2376d32a7ca5c5d2918f8ea5f74388044796b929d27e4d147e91f200ec5395fbb406cac5c98a226681b885f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
index d3a3a4e0470d..e4a74f076ea6 100644
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.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=5
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-electron/Manifest b/app-eselect/eselect-electron/Manifest
index b655ed8ae248..7dcafc28ee44 100644
--- a/app-eselect/eselect-electron/Manifest
+++ b/app-eselect/eselect-electron/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-electron-2.1.tar.gz 9658 BLAKE2B c5bcd58f5b82c3c9f4cb1e6cfb26665b7524b0d973a717437a18f5ee66fa5fe30bdd4e82673efc8199dc4a637a0b93ba537a62fc060d68b3bde7370138f815ce SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47
-EBUILD eselect-electron-2.1.ebuild 679 BLAKE2B a8ae13313585c69409f6cb0553b2e9a19080edbb22d8395fddcfdac3528f15fac8c2b0300fd9932e9e572c607c39e20c02747a81edca347d04b64a57606790bb SHA512 8cbe1fdc46d06aa4c26da9e5368c00ea145bec9ce489cac42e744f0d71f54aa70a9dd95cf25db798604e8de81768f5caa797ce2a32ced24a6690de9f2a221680
+EBUILD eselect-electron-2.1.ebuild 667 BLAKE2B 04f7602b7a9fd969c1c865561f2fd5052be9e648337fc2ab70e2e90bfd620e9ad8d1c1a23700ee1a3ca0acd19b85725e511f058e44b3d03de983760cb71acb75 SHA512 e187c4b75826f699c8af078b6c3b5818a1d9ddeab512aa102650795d10953c94801499f48a827b24f2c63691a50937ce68fde140e32d14848f83813693722d75
 MISC metadata.xml 455 BLAKE2B dcbd535eb72a88c4a949554a47ba91b4520df72c76bdc29120225968d2ddbe8c61c611766d97a184ff4337e1987c0c6b67edc60e116e3cb4b70101ad0e121fde SHA512 daabe898c9c09b6ff40b7a5454690794eb6487f4c30b76e52c20a70636898c4069802631b000a6ba62149561019e14296e3d13aebacbd5fcf9d301f8e2fab2d9
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
index 5a7856b25c22..e355c30fd392 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ b/app-eselect/eselect-electron/eselect-electron-2.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index bfc2a35652fb..74c27e320f35 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,6 +1,6 @@
 AUX fontconfig.eselect-1.0 4394 BLAKE2B 47b3570309471efbe4c0c5bfe64949a2933ff6067fe2766e03eccd3b2de6ea044debbe3de92ca6384db76ee9d25d8a541be9a1e65e24b7e0c468e6cf0fca1d9e SHA512 5ca29ddbb672193eac8edc1acdefee0f7924aaba23d8ce40317d3dacd339e820462382d3fdf233c2cf4e4b258a2956e7b86ec6f4f541876789ab234aeaa81f42
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.0.ebuild 551 BLAKE2B f7a3bf8b63dd9602e7c77439a58f0d882a93e431947d5a9724449ca3b4aca50f460c3e02b014fdb65e131f23eb1b841f4453e0ae074c1584d6a506ece3e98ced SHA512 52eb2b736b3a8b20766c5929b25d9fe5c2869b42cfdbfc45b6f88f0f5dff9e868b24b34674e402028b2f4e102aa19c75662a7578777f843727dc5ab5ab83340b
-EBUILD eselect-fontconfig-1.1-r1.ebuild 801 BLAKE2B c202977df177767cdff389d86c88d19b0af83f8b982c1395a359fdcb6c12020c8f4f391c6b66dff3e0e1c135026f7e99ac78c672fa39b02b08bdd5b5ff411e43 SHA512 66dc53bc45395877bb24091e1f86293147c2706619b8d70f45e2cb3b0c76cded73a58fca4a77f4618d84057ce89ceace70c007006f05937cb52ed53ed7e6123e
-EBUILD eselect-fontconfig-1.1.ebuild 782 BLAKE2B 0e875b722b091c3d72b59dd7836afe867bb1f3b0659516c40e0f614945ec40a4c42598900a2ecf688438dc7c79269b95d49beb6680756cb2dc2c632b0ee7af17 SHA512 ca8389be9cc0142995cea604b14561d83c76a4653ff7f1c5c996523ab4a2ad81c7c682383932a79cff4731aafe9a9ad5ab7772f35a6b38c185497eca66df1dc6
+EBUILD eselect-fontconfig-1.0.ebuild 539 BLAKE2B a3cd1e5ef58f98f0e9cc3c18da5df4ee0269c2ada31a906fe912279dfa0cee243d44f0c4f3ef521c0aa2c09d22dc4b1463f3a1cfea2ed8f4ec1ab0d68c49e282 SHA512 68acc24ab35339f07dcb35f47bb29ec1e437569d9fc072d51e019e694d026c5269668a38ac6cd70e8ac899146b53d24c7e3b59aff018b8f52829370e46985e87
+EBUILD eselect-fontconfig-1.1-r1.ebuild 789 BLAKE2B fefe90a8991b2783328a29ef49a8e79d609a7edde161706c44e3c8fadd343444d32914fb3ab3b3857db015c38a07667b32372549509881d248b6ae9a91bafc4f SHA512 3a9f09a980c5216f2756928cc2a2c419c7653aa4770a78ab5ac8082a3a92a74203cd4b216ef468551142d00acf2fc0f452bf691ef6da3a2d6771ef81684bfce9
+EBUILD eselect-fontconfig-1.1.ebuild 770 BLAKE2B 96bd9038da098db11b9a23233854bd3f670a2efd2717ab8dfcd18c01e9342fb0700b2d8694e450540b58653b19ab6c83e9190b0243379fe79d4ad73adb5cae05 SHA512 5e3f6004e1297841bde7a6bdd3b8ffee0a53449af8b6eb84d37b19838555003e8d130679436cc0a250e40b934ebb6995a4dcb9601ea0dfe570f65163351aee9a
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
index 4aea1f15fd3b..76d9a10826f0 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
@@ -7,7 +7,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index d84940dd20cc..1bc8260b7b6b 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.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=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=""
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
index 7f7516bd8305..db2d84e22d1c 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-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
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
@@ -7,7 +7,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~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=""
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index dc27d6da6925..957e8f3f62b0 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,7 +1,7 @@
 DIST eselect-postgresql-1.2.1.tbz2 3645 BLAKE2B 17262fa368b30142599145b8d0afcdb4cc82be70e40bb7b72f157abe70eb31b7f35f6acb135ef7fab0f6f95044a2150b3550968903722cc741158d21043f72a2 SHA512 9b24cb7620dd3de979ef595c60ebf607cd9da5c7d3c4da19ebe242c25961883e2db54341f916690abb9fe7a76663d9f1ac73fc76c90389f72eff425aa6fb43e4
 DIST eselect-postgresql-2.2.tbz2 4428 BLAKE2B f18b7daaccb9ab2fe08bb6e7f88dd41dcdf69b951a3c20b65ee2955ff33fc614e5740ddbbe8eb8f55d20f5705d47fb2da8c3f3fc89e403ea24eb4b8d912404a0 SHA512 2a0b9b3c8c75792fb6b6f90f034562a3bef7c9391cac0d7c95a6a86db38b4c9840fce2fa0edb32b745905f974920ee1ce5dfb21d33f22c79d1bc776e013edf76
 DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
-EBUILD eselect-postgresql-1.2.1.ebuild 672 BLAKE2B 14f4da8c135dbaaeaffcdadd7bac6dbb12226f6ea19b131b9337e1b5a9f8e51bb13fa93090da5321d13a44f886fabb3e1925468cf12fd177221ac0b2a4c7d157 SHA512 d137b8ef89461e40a8f2fe1afaf290e4e029a5b1374e00b3f9a4b96d0a8d5490bd71da30aaf33f3cd690c03652764f1371074d2f0320c7cfb57972a0a0ba06d1
-EBUILD eselect-postgresql-2.2.ebuild 945 BLAKE2B bb913d7263445a49e360994527a2c9f5cc52f2a668c1303a7d1e918f1007affaea79ce37b9a0801106385eb2059324e4d1259d4f93817f014f4369c90f34a9ac SHA512 094973b5db9a173c6a4045d7cc8174dcaf5bac1ff9711a4f39f39acc61f7876135a645c511e2abe7818ba069f013e0328bcd233721ae6e4a724d608887628f64
-EBUILD eselect-postgresql-2.3.ebuild 943 BLAKE2B 3a6a1e2917b10e77ade56c63351d48b0eaf6c5937eb62173d7b346f4aea769789519a08e550f10527c4a11eba516f8fbf595cb7e2578e629b9f580bdafa513f9 SHA512 293d53431dc6c7e0af5b7f13d4a646b3f9c4694bed86a57d3c0ee23f9b8ef706d4343ac7f0c2a21e945a64408d6ebaeb9ab4886ccfe64da689ca66bd3652d436
+EBUILD eselect-postgresql-1.2.1.ebuild 660 BLAKE2B ef4ce36a08143aabae164306cb7081c31690d0b9a29fc9d4dcb54c650668d1dda08fa3ed8ae39dca7a1d3bca4e7afc08f6c7e871812526d3528dc844fd0dee8d SHA512 e677531aedefbb4fe5941ae86af4743e08f118399a52cfa2c4f93fc473486ebe26cad2626467c808bf4b714e8be948a61cc605f0278127116c863c26cf335d05
+EBUILD eselect-postgresql-2.2.ebuild 933 BLAKE2B 7cdbe38a7fdd232c19bd48ae58d3ae0f45c1466f91e25794b800962e9c85987615957797815777ad39713ba702254e9637e65c0a6244e505929e2caa43d1d455 SHA512 9b9f7385d5ba7f24aa76a691035afa4a09ad7599b2ec2bd28bb9ccee6409a82f33ed166adb222da1079c437bafc30eae0b6fc5b6c49a69f158784af22846338d
+EBUILD eselect-postgresql-2.3.ebuild 931 BLAKE2B 1b5f3e5e20f28577382f74d84c95918e13d1fec34455dd877b3a2872de89fe232e97cfdf3dca5dd266ba1f9d901404cafea9a752598aa7b68e41cb20e10c16bd SHA512 6ce4389c77f936bd70b63b79389b298ac66943a4659ec34499bb1a29db149ed9499a7f88231bdf4c82b1c873480cb90794bc74b4dd1b4870e46c3bcaaa68ba83
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
index 33c97cd5baeb..eb35bc0fe1c3 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-1.2.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="5"
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
index 4cdbf680c4fd..665ff1f31a8d 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.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"
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
index 7545dbe10cca..f15a7b3400e9 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 30ca2b0a74b3..0836aec6a42b 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-python-20160516.tar.bz2 46549 BLAKE2B f8703ed35d9607a940fca1bb1d9612de62a04dd1fb065fa31db7438ee08b766b5ef84a4ef10f3f58654acb7fda4bc5e32abceccd0ecec632b364e4a55834ba2d SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a
 DIST eselect-python-20171204.tar.bz2 46655 BLAKE2B f0bc46c796a1b9e01f964994219b9c7831f99844a12e97429b40482e28a590a2d825f7b6fbca27b0ca1ce616e5cfb388272af686ea2de65fda69da0319fddeda SHA512 f89183ca992bc38f2308a3217602d5ce6ec4b3b5b614f2aec48fb5b3b7e50a2e44dd18af36a7cfbd4b45d05346f2be97605e35fd274558e9173c6974681c8fa9
-EBUILD eselect-python-20160516.ebuild 1101 BLAKE2B e189b7c13192a28b4e5adab450e41927f31cab66a447a0aae23a14ea02f09449351a5bc588a64df75858c7a341e173bed06ec7040fbd4a41bba2d1ac6fb29ec5 SHA512 a8ebae6634638f735adeb741f182aa10484225a6d5458f7bd08fa0b043d8160c9f164d64854d682e1b867c1be8c9a5a42c475efec9a784bce80fd9ac08054924
-EBUILD eselect-python-20171204.ebuild 1122 BLAKE2B 0dc2853efa4a8058b511ba480722490a40dc927da820f40b02bcaf904b31c3712a46408b1566c73ed83d20116c76a8e0d00ebd40c8103f97bf5f4e3d0afecaa6 SHA512 baab9007d3839db2b08aa15ba533bbdb6f958020fb63364809ec8b1d0910ac35f7f609ef090302acfb3815dd385ca6d1d4a239f93c2815cf026e1ee6b3b676e2
-EBUILD eselect-python-99999999.ebuild 1123 BLAKE2B 8f4ee6df6062fcad95144c8442c1ca28573a1f987c8310f8786f188ba0c8f800649be00b0ff0c7290f28f68b7d2a19164dada26bf7561aec13813c3d4ec5e955 SHA512 a71ce16b06ec69cbe0c1ad3c33c4534ddde120995033f8fc6e64484f97b5b743e75a62df2baad531ac5767aaa9d1b8b885aa45fa00b44dbf2a9331403aba31d0
+EBUILD eselect-python-20160516.ebuild 1089 BLAKE2B f530b036157ee01b3950033151d752b6544881c785b95e75a5a653bb6f7568e185d39aa5b8c2e00eab650e93e9b6184b4d2ec5bf90ac09417f452932caf2a119 SHA512 24ae15fd8f95adecb4d7b09a3008dda42507df30484ca60988117c364f3f3c2eafee23e5b56660960cb7c4eee09672b4fe3ca7a8d49e42e2398f68bcffad0502
+EBUILD eselect-python-20171204.ebuild 1110 BLAKE2B a7e022e832256cb81eb9cf0a48f6728a79a3d4d572f94c9c22657870b8666d36aa3ba22aa5091f8d834199dd2da2893d91d68e74161dd7b0b4921e65cfd5aea0 SHA512 bf432e5bf15b7a9ae99550f7f57a34f46c35ea63655a1c7a97ee731a3cd2002b910887ffe032d6ebeb6664c9e15577c8a921eaf8109936b3d52f981d1f53b628
+EBUILD eselect-python-99999999.ebuild 1111 BLAKE2B 32d94580e545a8853b66bf9c30977c52c45adfb98e1de9f0aed108bbd088f8f6de1a7367285161b26d88125ab2dc8bd74f985f4677b2d6abf64ab42da9f5b55a SHA512 33d648c0e8f7ecfeb3e5f5d9838887a64bcb2aea9b3c40381d5306c72cd71c823cb55f9baf1129bb80c0cc7f9ff5223d6799aad9d863a974d484baa9960658a7
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/app-eselect/eselect-python/eselect-python-20160516.ebuild b/app-eselect/eselect-python/eselect-python-20160516.ebuild
index 86d4d850fdd4..7d3e622fb11b 100644
--- a/app-eselect/eselect-python/eselect-python-20160516.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20160516.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-python/eselect-python-20171204.ebuild b/app-eselect/eselect-python/eselect-python-20171204.ebuild
index 1d093e2738ae..2962423cf2a4 100644
--- a/app-eselect/eselect-python/eselect-python-20171204.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20171204.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 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index de64bdb6ec6e..bcf52199d557 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.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 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 586a6d2108de..b8abd76d36d4 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,4 +1,4 @@
 DIST eselect-repository-2.tar.gz 5441 BLAKE2B 28608b7e5d06747afea4ef28b0f45ac97dcea0310201d857f1248e7fc586a331fce01c9017df83c332cbfb55b51b52a45361e06db8a7d4b788a70f63eb4c83d8 SHA512 7667053b7d06117f49366d7bb6ad39b1b0715c778e49e18649ce38b364e58c0c31f4fa077a459374c52d3bb7f550002a4368cbb7fc14fd9961815bb1355c1f61
-EBUILD eselect-repository-2.ebuild 873 BLAKE2B f6fb58f5a89342c1a1d615b5cdb269785e1a82b392f4cec5611ffdbc6fb3d84d8877f58418c0c597e29036a47a3da3135b3246cafe113ee4798ea012c6c591e3 SHA512 f854db694f468bd3730025b97c8d34e5bf6f692d9a92fa7585276bbbb2490164e784497795d3597f9bf5e48565aeb48c6465633bcdea37f06dfd7d93ff1a356e
+EBUILD eselect-repository-2.ebuild 871 BLAKE2B 85fa325fcf6d9a2001755649cdc32a9994ac1dcb195d75c8d81340f71cc70bc2075553826e24a62f2305f43836b88864ac0822ee71cb1023c957a079e98a28f4 SHA512 d3f073230230a59e4263516860eacedef023a53c44e0c2e9b65d61166964bfa99cf6d70c452c1dfa156f132176bb4fe1b3505f2a52ebef22d473fe09cdf4b52c
 EBUILD eselect-repository-9999.ebuild 848 BLAKE2B a0487c133cc3096374e30c2e2d024f346e4f1f3e8573ef29cc416a8ba9066a61fa6ea0fb2d7acfb6bb3ede0eb31fac7fa71f81ecc04f73b7dcf47d800ea6015c SHA512 0c3cc2c3e2e894d2fdb1ddd4123b76283c56120da2332f5b364b9e4941b39c11cc28c200162f9f2c994deab34f5b97580116431652058a971282171923daa261
 MISC metadata.xml 337 BLAKE2B f1e5fed0f35fa48ba72720ef703cbd6cba18d0e8a15097b49544d86caef6752fa672f1904f511f1c54f3a7eb0cf195b95bb1bdee20f0317431c077839269ca77 SHA512 e3da0532b27d28ee74ddb0b4c2bd7fb4f2e128b86de2001583b03312692a8c8b0ae943e3e3ebabc6f109dd816d783543cbd5f91fb92a5f6055d07a0c0f11f4af
diff --git a/app-eselect/eselect-repository/eselect-repository-2.ebuild b/app-eselect/eselect-repository/eselect-repository-2.ebuild
index 54b33e1a1bd0..ecaae93b6729 100644
--- a/app-eselect/eselect-repository/eselect-repository-2.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-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/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 6b772c78f6e5..8689b1d15a86 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST ruby.eselect-20161226.xz 1900 BLAKE2B 698f004e548924ca7c58dfceccc3d21029d6460d21dd67e4466e3a8c4bfdc3a7976c51754ba376c5acbbec7c1146368b532f1cda079f8b5f6f86b7b08c700214 SHA512 69cf17e42d9908fdfc9b08a3ca2c1f406a5968fc1c22663cc4b2388ad29d3bdb8aec4f0210ce9d5c118514aea81a4465a299347dd702f859ba8660fcb3882f17
 DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
 DIST ruby.eselect-20171225.xz 1972 BLAKE2B 919a5d3847fd38dd86352623dca38523a323b0450f3fb2f04c5fb426e905431a6ef2e221c7221b67b9c4a989253ef2cda70a1dd2df710eb9331234bcefcc0dd6 SHA512 3398de77c5a836119f52980d26702c891af1bc7f83596829591d268cb252843242c2e00c42e10cfe3468a4b92e47e6d551108d21d1e322edda7e4756a1b5ad86
-EBUILD eselect-ruby-20161226.ebuild 713 BLAKE2B 53e7d63bb8b82efe844104fb13b8e49d0dee2b35f068e3a9fffd4e08d3574c88dfd352b01adbadf145ccd1da46c3add65c5be5282844c5792f4e0887370c72d1 SHA512 8e4c92d618cfe16135b0b29a28b94aecd3c2916a697839e2cc9d6c9ab02b27828627e32328f181c5bc93addab9e0ffdab15b11794bd7823a34817d57d1243c89
-EBUILD eselect-ruby-20170723.ebuild 718 BLAKE2B 37edcbd343848fdbc38533c55cb5d74aff967c6f20d31bcfc03e8efa5690376ce658bbe427d747b4dafe195501cca254bb0cce8b1db40ed0d38a21046d76a8c3 SHA512 cb634b6e7137cf2cbc1e64d887e85458c0731b958b61111554cad2b4b54480525be0a66c42184869a096408fd8934a30ab044c4390a8dba051f560a03bd4109a
-EBUILD eselect-ruby-20171225.ebuild 719 BLAKE2B c1ee41f4819416dad913333ce7abfc7bf29b7dcc96a97c2d0dd7a415ecddc21578bb432f9861cdb5efacfd241132a38792fceb58f2a934327b52afff12254664 SHA512 067c046d13b7057529220ee394147e1dc1e7c705d5ad7277fc6fb4676ba652a196694ade7fdc3ae52c70e48543ed89a35bb807e439fae7e16e553541d3645bf7
+EBUILD eselect-ruby-20161226.ebuild 701 BLAKE2B eef3dab91ba6daaa5b240d531a8feeae69049afb14cf715d2080085e8069f4e79e2ae80a39f6c8786a73d5c97ddcc6b05b94ae28febd27b9a30ba7da91dcb026 SHA512 894f7ebb1e56082a4d52986cb4d3d603c6930c008967016cd8dd8c64324bd74ce1e8eab9b0b10af2840e61a3739a3b26ff1fb0edf14057115a340b583099b3fe
+EBUILD eselect-ruby-20170723.ebuild 704 BLAKE2B 78fbcc203175cb60051eea4f9cc21833a9c4c154e7a45b6279b2c18d11648f3f86292e4ab8bd927a879107a0b408d46c0dd3173f9dc0d07e8c4c38e6912a1748 SHA512 5223dbe649a3991814de1a06f63aba5e4f451e5a4efd599980b8f733063028c656b620e4e74ee0cffd8c0e5031e5bd8d81042c8e448887fb75fac71ce1833789
+EBUILD eselect-ruby-20171225.ebuild 707 BLAKE2B dc9eb32a9b6734361961492814dcb3c5af2524c79ee191f1fcafc76553ae18d7f54be4d99a760d67004fe46c0c84f2dfebc8249eacf823a14bf28a17d9b94ae2 SHA512 3b6e39cdec4c229bfc4488b0046cd9cbb80ba766838577403e9e6b0b0d224c26cfe64a80c021bd41afab87b71418a3eac411dc96c2de7cdee51f5d319257a4bb
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
index 56df5b3147fe..48a1fd35f9d1 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20161226.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 @@ SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index e012e78a7e2e..6e33ae96638b 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild
index 8cd0413703da..427ac228334a 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20171225.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="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index cedade9d2880..545c6187be38 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9.ebuild 652 BLAKE2B ef160425ffbd6a09ebdc6510e4c3f6de9e2bc01412d861c0b0a73cab4e69ce4e8e76ae3fbf7d5635f6872198be492d93fa68c46b481d68f0f88c830b12dcb7c5 SHA512 2de5261d3b13824651fb804371286006076224a739fd2b1e948688330e32ab3e2d1215f87c6d8f12db06a729c560b3d6ab224e2aec87e9074c276009a8234006
+EBUILD eselect-vi-1.1.9.ebuild 640 BLAKE2B e601b38de3e7d8c39b33d2b4a49f2b3fa5182b8857a5d6077e92851d65778705a2d8786cdb36ee7c145c79ec598067231b5202b6bc8007b3c3348b5702ea827c SHA512 883f4f64a47dc5ddbf3cf691f679a63cea92bc8581ad4466c9c3e1b22c16142f7aaef361cfbcfd52e2aff702f82084e09252418ae684708a78c75d62c75d1f81
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index e6a17a84a8ab..84c843b00658 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.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 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
index 7349bb948e48..eb3f2db1686d 100644
--- a/app-eselect/eselect-xvmc/Manifest
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
-EBUILD eselect-xvmc-0.4.ebuild 563 BLAKE2B 8f9da6aa8f6e1ac162927cf0cecf7f70ab7dc083d9a60086628a2c7e1e566e084507d48da87d88e880d6a89cbfeee7a52654d5229c6f4b1539eada204fe6973d SHA512 9dc057d497eb906ab84e8a3037b4da3c065fc21dd290467f42bdb4a6dae835c071e8b45aca20293259c631491256e0809d41b172fd97aab23b558e63ab940193
+EBUILD eselect-xvmc-0.4.ebuild 551 BLAKE2B 1b389fba3f0dc4c52b77273409d306a6a32e6656b1fccea7a87158d29b230adb2ed88e5ac2ae2a383209fe5cff352575990213c282976142ed6b451db05e2ed2 SHA512 cbad3bc700aadabfd33e54ef7e5755c5deabfebb71a41a4703951c940ee3633ea55416ce78cf3cb02a36c8497ff974492a211d65015f5ed0fa93cef241b63149
 MISC metadata.xml 331 BLAKE2B 94766ef6054386b5218ddab7910b2b9f4fa8904ba9d6738871a4c4fafec2433b42d489c8e156447ad473831fe55af2e75cd6e385305af8c40459ffa8ca1faa9f SHA512 f4c7dc245325bf6b4b37c893183e3dd9c43c9f05046e231f31f7fcfce8ee9e4108c0f4aa231b7d8f0fb4206fdb80186cd54dfe03ea7a037f6a5d4a61cf3b0d0b
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 36648b5744f4..06c08baaf0d3 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-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=5
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 4c2bd291deaf..7285ecf3e423 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index 3b4d0d0b52c7..54a850c1b4ab 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -1,8 +1,7 @@
 AUX chkrootkit.cron 78 BLAKE2B f43e9a4a0864c3914658298622aaf0e97374e4f8518c085f0c6c1b439583b36567652376a601eb039ca9d6a8bdda0cb18d9c58b36ab61839113048d32ce9fb54 SHA512 6839f3372d28673ee436349a107dc33b77cfd676fd16cda1ccfc5211514e840593d0f106e4e0a9331c4b658860992a9169f3a7cdd75c835a780a41097e7bd758
-DIST chkrootkit-0.50-gentoo.diff.bz2 5010 BLAKE2B db004fbdd94552d95bb4386fe82614811334e01239c2086d309e4a23e1d107dcae107becb3a8d16953624cda68664e8d4eee53e2fd3aa6214e8dd5a85dad1b04 SHA512 067a0a33fad2389a7ef942f76a63bed6c206d08576a77fd758ae171960804fb74d3164bc6eb582f5d8b722e9e863dc4380f5632940bc9a8c1821b46ed1062a50
-DIST chkrootkit-0.50.tar.gz 38616 BLAKE2B f72d78471f804c2c80d4036452beae04cd49770b18b46cabd78e9a27ea0b3e3cff3833ab6a804fa16c70c2c32f9b45d4f0d50986d680256f1f92603da948497b SHA512 9f26fd34e85b58b13dedc5f38a889ae258bb2c0f1ff40e99c149e23f93890e956f94204b1bb2241584454e99168c53b583f52777083454237f3ba343424dba1c
 DIST chkrootkit-0.51-gentoo.diff.xz 4708 BLAKE2B 0dacba47222319d9e5bb5d39e0eb4b7074fb3025be885c5fd9564c10f592e04ba4afe2d0c792a2e54fe4c9b1103e366f65af949e7c0db730bf61981fe8fe2364 SHA512 13dca9c272d85d35d736e14896058612f62e1781aac034f06882fe63d956f074a3c67bf308c104f0080323bb127ba01373967b2c28481741d17d83310fe52dd0
 DIST chkrootkit-0.51.tar 174080 BLAKE2B 36acd12801d2ac599b71d0c59165c1489309df0365442aa575bb4c505bbfea5d0daad837fa9b7b40c2aa3841fceda199f37fe5832f0685ad3a0a82ff5e653a3b SHA512 adef6823d069b32305605d0eaa3d3701c6a87900646d9509cebe0fd8a2fec0523595d0dcb4576b32245e7638388d3b43858dbc42be68de9971ac8461fcfdeb34
-EBUILD chkrootkit-0.50.ebuild 1237 BLAKE2B 6f5d11cf720c83d6674be0d18b5ab750b321f4dd01d616dd8dcfeb051603d7bc164f0821cc959d0bfb7444d6d40baaa11a83ae5e7b788f9ce0967e6fd247f672 SHA512 9700c79624724a90d50949f31e19f76c03168b8abf512281f5f8d7f4aaa3984053b764f03280fb5c9cda1adc360c156cd1ffba8799976d57e815bd60c4cf215a
+DIST chkrootkit-0.52.tar 40031 BLAKE2B 8bd3518edc11a22dbc7e866de622454f55baa9fcd06a4034489596c0a24d867fec16d134dbc0aaf8b936640177d7dee8e061e39813a3ed261ae657d70f54a47d SHA512 45d66227c185c60166c9ea2a1f89f4594fa7c943c280fd6da5b59b5b355d5fe0d36806ef133fb29f9b2cac0bc05e9c10773ed4fae923a7115cc900818a596d42
 EBUILD chkrootkit-0.51.ebuild 1332 BLAKE2B 5d5bdb9a5edcb3bd08944f89592f24446f45f890859a80930adbe99831b26b5860e4f47804c1c27f101895c15a40b0c3d2c796c9dd687fd10bad3a3a25b1c971 SHA512 094c6e7003e1e5588d74e392ca2c6924f4172c42598601066b9858de5b01385abe444a1be9f5d81d55e0ef1125257914e68ba9bc5108c7fe018ee3cdd1a01232
+EBUILD chkrootkit-0.52.ebuild 1353 BLAKE2B a70803c73793221b5e3c27b12226ba387efde5f7c0efb6c3b0f33734659d96f8e7c1e98571c3118757fa7e392da82c8e611a17a7c0a7461d3f4723cda0d369be SHA512 101d3f6d06dc36995ec149616756a3b70b7a1626f98b9ddaa64934e6d3fba8f25b31b402b5c1556a0a59f3b5f601995a699f3ac0e4955861b1510dcdd8716733
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.50.ebuild b/app-forensics/chkrootkit/chkrootkit-0.50.ebuild
deleted file mode 100644
index 5c44abd63000..000000000000
--- a/app-forensics/chkrootkit/chkrootkit-0.50.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool to locally check for signs of a rootkit"
-HOMEPAGE="http://www.chkrootkit.org/"
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
-	https://dev.gentoo.org/~xmw/${P}-gentoo.diff.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="+cron"
-
-RDEPEND="cron? ( virtual/cron )"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo.diff
-	sed -e 's:/var/adm/:/var/log/:g' \
-		-i chklastlog.c || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=true sense
-}
-
-src_install() {
-	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc strings-static
-	dodoc ACKNOWLEDGMENTS README*
-
-	if use cron ; then
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}"/${PN}.cron ${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use cron ; then
-		elog
-		elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
-		elog
-	fi
-
-	elog
-	elog "Some applications, such as portsentry, will cause chkrootkit"
-	elog "to produce false positives.  Read the chkrootkit FAQ at"
-	elog "http://www.chkrootkit.org/ for more information."
-	elog
-}
diff --git a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
new file mode 100644
index 000000000000..7920cd74260a
--- /dev/null
+++ b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool to locally check for signs of a rootkit"
+HOMEPAGE="http://www.chkrootkit.org/"
+# Upstream named their *uncompressed* tarball .tar.gz (*sigh*)
+SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
+	https://dev.gentoo.org/~polynomial-c/${PN}-0.51-gentoo.diff.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+cron"
+
+RDEPEND="cron? ( virtual/cron )"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-0.51-gentoo.diff
+)
+
+src_prepare() {
+	default
+	sed -e 's:/var/adm/:/var/log/:g' \
+		-i chklastlog.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=true sense
+}
+
+src_install() {
+	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc strings-static
+	dodoc ACKNOWLEDGMENTS README*
+
+	if use cron ; then
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}"/${PN}.cron ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use cron ; then
+		elog
+		elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
+		elog
+	fi
+
+	elog
+	elog "Some applications, such as portsentry, will cause chkrootkit"
+	elog "to produce false positives.  Read the chkrootkit FAQ at"
+	elog "http://www.chkrootkit.org/ for more information."
+	elog
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index b6f248903efc..552862a0bf50 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 2751de5852d4..9593c40f37b1 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -5,7 +5,7 @@ DIST poedit-1.8.7.tar.gz 2483945 BLAKE2B 0cea4dfa19bbd7e6563a2872836cf3dd53d45de
 DIST poedit-2.0.5.tar.gz 2505740 BLAKE2B 2a10b77a12fd0c687b8c67c23f78e8be21a64461ddd5aef0bdd10626a6926b4f86c2a5b136809b4df2e8533dbcb29d98c197b37d64ff20804986f7bff4166db2 SHA512 097c93306a5b1bc74c7fa0cd49bc7077046219cb1c5e07ea4a45a0487700642eced1f186810c3bf74da74b72d5ebe84efa541229589b42603cd6c678ba4d2950
 DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
 EBUILD poedit-1.5.5.ebuild 916 BLAKE2B 75f6707faecfecb698b1466486f31aed4408de4a9b815a9198d1905831dab190f620e37198ab94963a8e7295e21829e1953115ae70a372ef6636b8bb7b5feeca SHA512 ada45e2b8c4572a195a52818c825aa8aadb6087abf97ff17d4abdfd48fbbf25ab0fdfdce9e59c3a4a24c8ff639f982a5ad6e220e919d7edab5a9bf951976a95a
-EBUILD poedit-1.8.5.ebuild 1744 BLAKE2B f5fc79a550f737b4edc9b7e72da9bfd35777b79df91b849a6aa4054c63a7639694ce68f36d1e0d5ee22605849094a63b5f45e54db0bbdfbececc3f1a7ce6b1ef SHA512 21e51e79fcb924f22045ec92930387d88975040d0836ae0fe6e489a8766b387c798d3fb6e577df2264a3bfa31e0211324cc64878e3bc1e5afa5cae7ecdac6b4b
+EBUILD poedit-1.8.5.ebuild 1743 BLAKE2B a7190c1296eb7bc8dee83e70d9edc0af9fd1158c9ef0bfe8de6efc2b1428a1966a728d2d544b8932038c1881838f578817ba6cd493fdbb515ec6e34d49c51418 SHA512 c7a38437a1e09e549ed738601e91db85041080ccd39b8fa9800106229150cc85a62d18bd1464a677eacdfa7010706935f622f20db0661df53fc6eb368e3b387f
 EBUILD poedit-1.8.7.ebuild 1606 BLAKE2B ec7112f82b5df0527101fc736188a96d7a1fc7cdfcb43185e69cf039c1188c67333417f00383d0b87156a5dc7f7aad3afa4b6cd45cadec19cad5452db063555b SHA512 f56dbe7135f8057674e55eca5b9d2e9c254079ddb2e1e070fb7586e070d51012a5286cf35e13e37ee0bc8fd650fa5852e8d7422f733964b89927b2c28656357e
 EBUILD poedit-2.0.5.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
 EBUILD poedit-2.0.6.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild
index 5788f46b30ac..ebcd2aedf23e 100644
--- a/app-i18n/poedit/poedit-1.8.5.ebuild
+++ b/app-i18n/poedit/poedit-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE=""
 
 # db/expat req for legacytm (backwards support for pre 1.6)
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 863c5bb96280..5c633a477cba 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,6 +1,8 @@
+AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
 AUX uchardet-0.0.6-enforce-IEEE-float-precision.patch 2126 BLAKE2B d21617c868050dae26328529d14d4a0ebff4c3662f5844d6b3d237d2ba7cd86c804f52709746487b0e56e448c32ae257562a93fd5f546abc4bc1dcfcc27c023e SHA512 13384690ca74320ddb1972703b238367b07fd9aea5f3ff1b12ccbc05c9c0eadf545ab517437cac5a0dac8b16ac9399b9dfd4b8b27071dbc996637101e4e5766a
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
 EBUILD uchardet-0.0.6-r1.ebuild 776 BLAKE2B 699f07cb86619bf0936e2dc3386ed0bb67441800d9ec5ded75979db482e19f9b9be0de8b524bd727503ebdb726b6881f5eb7e0036b8c33afc327198117e9aa4d SHA512 284034bb4e4a3187444d8c1154cf2baf5cd5cf59b6bff01d4262236b7ecb5d76e710c1b7494ab02860b80df68710472ef005e3bc6275b83d5a94edc658d83b8b
+EBUILD uchardet-0.0.6-r2.ebuild 812 BLAKE2B 2bf8702803c194a125d348928ee8a772b52d89280caa07730c1b4b72de914ac75fa704d2fa7608081dc7a738979aac95d9068c7236321b1e844bea35a28e038b SHA512 e453c18c1aaa8c8b61b35718911abe489559df4780b091288a830f4da9ee714fb69c9542408e39d5d9d5d9917e6650eee68192510f7196a24f180f39fcedb0f1
 EBUILD uchardet-0.0.6.ebuild 783 BLAKE2B 947e2267fe823edcf3f1f905257a0f89b38761faabfc71adf62e2c3359d8e7f8ffbd1b911387261567f010b2d3fe35c427beed2ae828657619872cfb7685e72c SHA512 ead9165ebd16fd687de82e8650541a7656cc03bb8ef6702edd6169d05d0781e2b381d6e447884a9aaac44b9b977b70699e7bc9a5b7a5f78b0df2bc5be1810d10
 EBUILD uchardet-9999.ebuild 675 BLAKE2B d0c43896bf44a7600447060eb482d1a75e9f139726adfbfc28a8725c2b7c8785b9f0c938701ffdd9fe174dfc8f904b21f09b8f323ffa1627acfac2478e57b818 SHA512 03cc70a615cb016220dab9988d7cfbb76d9af0f176974f213108f083f3f27ea510850764435f54395b5d77e12e38ef86f685509340775f6101f51ae65dbe9abd
 MISC metadata.xml 472 BLAKE2B d9ef3c52d66ba665481312bd5f99c8be7ada8ea593c851d103451b388c3d37972762a33c9f7d2552ace1dfcaed4bf907145985c081eef0ffd29ffdb6d1c26108 SHA512 3cc702714648db5605638ba28364caa1e0ad0be1b9fb519b434f34fa993f76ba29a9ccdef0e8dea8f4b0fd89514c7196328a1f77efbb9aece30adce5063f7536
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
new file mode 100644
index 000000000000..2bc4977a5f00
--- /dev/null
+++ b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
@@ -0,0 +1,59 @@
+Add configuration option to enable SSE2.
+Add -ffloat-store flag on x86 without SSE2.
+
+Gentoo bug: https://bugs.gentoo.org/631852
+Gentoo bug: https://bugs.gentoo.org/641716
+Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
+
+This patch is an aggregation of the following upstream commits:
+5996bbd995aed5045cc22e4d1fab08c989377983
+77bf71ea365a19ac55c59cf10399b566a02d82c1
+939482ab2b5a6585bdd2e5251f3f2f113d64686f
+cd617d181de03a7a13c2020e6c73cd14585e24b6
+f136d434f0809e064ac195b5bc4e0b50484a474c
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9a699e..d140a24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ ######## Project settings
+ cmake_minimum_required(VERSION 2.8.5)
++include(CheckCCompilerFlag)
+ set (PACKAGE_NAME uchardet)
+ project (${PACKAGE_NAME} CXX C)
+ enable_testing()
+@@ -33,13 +34,31 @@ include(GNUInstallDirs)
+
+ ######## Configuration
+
+-option(BUILD_BINARY "Build executable" ON)
+-option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
++option(BUILD_BINARY "Build the CLI tool." ON)
++option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
++option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
++set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
+
+ if (BUILD_SHARED_LIBS)
+ 	option(BUILD_STATIC "Build static library" ON)
+ endif (BUILD_SHARED_LIBS)
+
++if (TARGET_ARCHITECTURE STREQUAL "")
++    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
++endif (TARGET_ARCHITECTURE STREQUAL "")
++
++if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++    CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
++    CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
++    if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
++    else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
++    endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++
+ configure_file(
+ 	uchardet.pc.in
+ 	uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..72c9db158092
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+
+PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTARGET_ARCHITECTURE="${ARCH}"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ce628146b86f..457c9ad682af 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 6c1e781857e2..281f83895038 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -3,5 +3,5 @@ AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c4
 AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5221fc3ffcf68618e6434dfe7eaf83a361d4c6faa7799ce5342d5c546edc3f0930a499 SHA512 cbeaeac8a993711822086a761b624783bbf4ff11cff5c569a4c0cd3e6e174fe36904a661155c1460f7b43e0b2d6b631cd9e290d76138520021a702567b0494dd
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
-EBUILD beanstalkd-1.10.ebuild 1074 BLAKE2B 619ab167190fb03a054df43f7b2cc660a925260eabe2fe9eda7d206a8979fd155a868e025f35b8439b21a1e61e6045d78b74ec5eb763dc247ebecc4db4b920a6 SHA512 193a42c77ad21219125c1ff7d0e9d7044e050cdec7538f63abd77e5cba8cbb7d9f920a9a74536a140a83945e00b5a3927420c83349731adabe2cad78203b3e65
+EBUILD beanstalkd-1.10.ebuild 1062 BLAKE2B 0e81ee56bb61a007986c12af4733891272807ac362c772adf7e8c0d4c1385e4f098cf3a93d1b4c8068d8f645c79db3a5fc2668f54b07e831fc14260175b7058d SHA512 0799c734bd5eeeb4d8dd171c65f2c1aefb6cfeb43513e11a5d5d2ccc8dc1a40785af1baab54314ad8564236580aaa721446d1c4f17dc94c4cd48630a001e59ed
 MISC metadata.xml 436 BLAKE2B 72356d3a95f45dc54e13946b8d41e698b60d44205e9ec90cee10d916f71ed0e6ed2a81929cbc705c8eeae00587790b2c4d2439a0ca366f28cf123ddcf3137f38 SHA512 7766293e42fb4786e971b259480f4e697745d23db9b332e24c7edda52d8ccbc2ebdb1ed1b1c9265f22d9ec698fc144acd6e7576cef66f3a33db8a4f102b08140
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
index 425c18c7b37e..f49d66ec2e70 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
 
 RDEPEND=""
 DEPEND=""
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 1b963be89ea4..ab6d183d03ac 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,5 +1,5 @@
 DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.0.2g_p8.ebuild 1037 BLAKE2B c52f72d5300950f86f257f666f4980690e2559a72d01848c607b4817b0d461f5a6f933bd413665bb2555bfabd86fa5df932ec990fbbef48a4cc9477aeca6df20 SHA512 f13e9af911a18df0ccfa4e1c1c6edee75b7eb4e2af81a86dda43d1c3eec71893f78190a8aae0469c65369ba8a92b686d012ffffbcb3774e86b67d6f4ed957612
-EBUILD c_rehash-1.7-r1.ebuild 1000 BLAKE2B 787661f3e96c0e4690da58e4e7ca32fbf757d3c3db83f83b7d6de62c1b1913c2177cf0a0a6451ac0e5f3b3c4878c03798185778f3475eb0d6e9da5f5f99897a3 SHA512 69ec809562afec3fdb0b1200742e8c8cf642ccfb8815e293e32c119e4d0dbc6273b61bd22298e86432ac87996e58a3e6328facae17d9e5da8246a403b86e0056
+EBUILD c_rehash-1.0.2g_p8.ebuild 1025 BLAKE2B 29c3c7c33d8b09fdf79a76b35407ce312d0ac687c5e1d68e6cd318c4a8ab658ca0a6b1a8ca9126e00c58c79f0094d1a62ef0b0100793739ba57843e0fa45c041 SHA512 30345ccdc557112cf9d8cbf00992b03acc77efd20617c8a57b4207e570294ae2e3de4da6e212b0a03a313dfde377ce20a8dc56db10591c8cd2b1075b0a02f270
+EBUILD c_rehash-1.7-r1.ebuild 988 BLAKE2B dcc13c585ab94199751eafb43a8dd37fd10c9918d9eafafabafad7d97268db0f80cd449a2b4694eddd20b4966a217e66ecc11d36a02e777af8a122def38e28b1 SHA512 b0bbdf4bd5fe3f16bbcdfe407907c88965879070bf3dc4183c34d7a312d3c3b845c53457eb38fb787ceaea481f5214aa4068f82fad269cad499e312befcc453c
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
index 67cefbdc05a5..b6f24de2b58c 100644
--- a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 76eec085b028..c03bf490dbaf 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-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 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index ef84cae5802e..4dce327f6975 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -6,8 +6,8 @@ DIST nss-3.30.tar.gz 9500552 BLAKE2B 634734400562db5b35f170c5d138fbad45cfdc972a4
 DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719889b36027dc2e52c4f585c2ce7bdcd947dcf5d938013246405c04e1b9dbd802b229e0acc96fc07f321bb51a SHA512 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
 DIST nss-3.35.tar.gz 9620041 BLAKE2B a4115117ff017ce36f030d9f69c75111177166651968739353d112cc5d2c4732b33b8c684c5957a66bb969ecab1a15fb2cd6bb237d959d307cdee43ec638cd73 SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 BLAKE2B 62d319e8e5a91e087692455ea9b0ae3428fe32cf68a3194112599adb2fe1782754950708f22463caf848bde08d8d5b535ac6e7ba306b1418cc47271a514569cd SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477
-EBUILD ca-certificates-20161130.3.30.2.ebuild 6248 BLAKE2B 067c2ca4532d086a86c77bfd0ef21cb282d21b7643d8af6e237ead84e29dcd23647feb1690c47b9d8da43659ec14f251ad7e9d4d5a2985fe76e1b4b531770d2a SHA512 ad3ce9a68d80b6604972d8a78de462aff6df914cc1452c1c5d972723f1a8be1eb9582f214fcd5b4c65a2638356054beaeac9f3bb1b310e563ad44c9b7add0564
-EBUILD ca-certificates-20170717.3.34.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
-EBUILD ca-certificates-20170717.3.35.ebuild 6278 BLAKE2B 88a549b2fc25e86dde39c60d0244cbc5bb85808b82a8cb51d91d01f4ec4d5ed1ec9ea89bcdc65cfd760c250fe4754bd02b3c1c56e10d21ec2483c0cffc6b265d SHA512 862478347b0b585336996a672cd72913fb3c12908943862b8e2ac1e611bd07bd19473bc0b11b754a390468f6677e4d70cdb843479dbcd19fc897babcb22a1174
+EBUILD ca-certificates-20161130.3.30-r1.ebuild 5945 BLAKE2B 5b6b9a89b0c9d22f6199d0e57e257c96f3420b33a457554b8fa146fe7c291fe3117c2e2eedca4029d848c6068b1e6a5572c0785db455a795ca552dc13f022632 SHA512 58c4adc50e9dd6057ebf59cb87e545297aeef88444150edc88f0485be60cf00022c9f31196c10db52426a9a62249f0b87eb92b0dcf900c1a22f0a81ce575dfe7
+EBUILD ca-certificates-20161130.3.30.2.ebuild 6236 BLAKE2B 4c03bde354f763bdb5eec9a1301073d722958f4a43a70ffd44d838725a5cd40fcd165d19690298d0452df05e65e278581454b6b4d1a8467d8d9c8cb0f33643c8 SHA512 444a9cc25ce4e6d250c152d8b324548240bc759c08d6f230a3b6c274b34d65aa2e2ea9b15e87dbbb74dbe62739a345b21fb4c8c365ee2695f31d99ede256ea55
+EBUILD ca-certificates-20170717.3.34.1.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
+EBUILD ca-certificates-20170717.3.35.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild
index 7d330280280a..78bc30b3301f 100644
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20161130.3.30-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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
index 4dc1cd363d40..7b73e5336387 100644
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20161130.3.30.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild
index 7778372001e5..198af98ddbf4 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.34.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.35.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.35.ebuild
index db831330cdac..198af98ddbf4 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.35.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.35.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 17bc46bdb7a3..4d3420e1468b 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,3 +1,5 @@
 DIST ddcutil-0.8.4.tar.gz 558405 BLAKE2B 4bb93d6b9b28a17ef182c1f39e3b6351070c5541fd8eefccde2a6d771e28a8c656abe1e00a58ee935290cba79af09b1c2d6b611532827455b5ec83532bbb46c4 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c
+DIST ddcutil-0.8.6.tar.gz 613272 BLAKE2B ce7072a819c5a2aa125ae8f6d5550cf0a516714f0635672015a0c24c9e525d34139c903ce7791955e0b30b8d4c66e94453eed60f8d8d024caccb49204d6fb853 SHA512 4ec473a37dc135700f4ce06634e6aa303199f4d743fba02c04ca509d0c31d45f59da7c6cd9818efc1fd8bc20dae518c5656fc8a38e9f00057677b1e997434fb0
 EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
-MISC metadata.xml 1277 BLAKE2B b3718287464fa3633a0f18ca66a1bf1ace627b169eea234098918b9c7d7213e53e69d4e3ce44fc69a2e579f94e12afc9f4dd085969f8490921d48b0a4ba41a23 SHA512 e71e364fddc851248f3c87be147b2ac046326172a2726b0614c60136a99223ce12d30999140c35534ff86d024023f80f8a7149a8fe59a8d6bfb2771468b514af
+EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
+MISC metadata.xml 1410 BLAKE2B dea4b476258ce356539c12acbd0d12f17fbecf0a260d7842e0cd826fe0a38900d2c88efdad3bd90fa53e1aa9544f08ccf8c736578c12d51863dde14dce3e9be6 SHA512 b4c9b19498494e79fef9898f78674458faad0f790509bc3562dd50d5a26b4620e242e7a2be5d6e13b51aca22c7f93f4b4b30b0e85415998648812750f4d5d01f
diff --git a/app-misc/ddcutil/ddcutil-0.8.6.ebuild b/app-misc/ddcutil/ddcutil-0.8.6.ebuild
new file mode 100644
index 000000000000..6444e7739e03
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/i2c-tools
+	virtual/udev
+	drm? ( x11-libs/libdrm )
+	usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils
+	)
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Bug 607818.
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		--disable-cffi
+		--disable-cython
+		--disable-swig
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		enewgroup i2c
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			enewgroup video
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddcutil.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+	fi
+}
diff --git a/app-misc/ddcutil/metadata.xml b/app-misc/ddcutil/metadata.xml
index 3eec1aa83b5c..6a7c0c183edf 100644
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>j.scruggs@gmail.com</email>
+		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
 	<maintainer type="project">
@@ -18,6 +18,9 @@
 		a USB connection.
 	</longdescription>
 	<use>
+		<flag name="drm" restrict="&gt;=app-misc/ddcutil-0.8.5">
+			Use <pkg>x11-libs/libdrm</pkg> for more verbose diagnostics.
+		</flag>
 		<flag name="user-permissions">
 			Adds a udev rules to allow non-root users in the i2c group to
 			access the /dev/i2c-* devices. If usb-monitor is selected, users
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index faf34f5e0ca0..57dfc2ff328c 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 405 BLAKE2B 0d1e023e9865f0278bd2fb5e0ceeb0bd8b92befe5544186d163946d7efe6f0a6749184052927b6d60adfec8b2b703168a85fb968bef50702ab42bbbec8bd73fc SHA512 b29f54c662494f9ed0d26c44a8a9a85e22d0d3d70c870fdb8eda3fe1a97ed188e5b8299ed524a5e00f7cb1a3603be340e544192e75b98daa6afda6b2c185faa8
-EBUILD editor-wrapper-4.ebuild 912 BLAKE2B c2b9161989d62c7f2e99a025cc9d0d1a9a4d187cbd456ed8d4e84391558b8499ed5b3acd49443206075930b00e27b080a395e40fb798fbc736d0774662f84053 SHA512 03668099c3b848c3cdb13ad0824f222b9dad2e2520375eb44c4e3803430ee9ed5367dcbd83d80c574cdb0dd24ac38d2dea889742bbe374cd5877ab3370b5f3b3
+EBUILD editor-wrapper-4.ebuild 900 BLAKE2B 8bc6c390923b917de50aa6619f6dc87c6961984963784a09b26824965ea15b6427a854810e20dce80277d107e2aea66015e19589348280433a8cc8a35186b80e SHA512 9c181b10b0b88c470a0f868be425c97a48df84eff9f84d94b3e0fc8bcdaccf5ed74c37494dea7af4a2022b0347ba8be3a7f7d86f8a2ded81346db31d9a809f27
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index aa73fb35f8f8..2bf44a1d635f 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-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
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 S="${WORKDIR}"
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 424b47ad2f3c..f15246ae52d1 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -3,5 +3,5 @@ AUX getopt-1.1.5-libintl.patch 353 BLAKE2B fa5f6c7eac124d16344b52227ab704656cc44
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6.ebuild 1817 BLAKE2B dc431cd29d805735ebbd7b84209ea7db49ab954df883c02410f7d4e48fc7c3bb05b912ace92e43b818c98018c838a1c8f2a212c7b326829739bcda76ff24a0c8 SHA512 34e003fa1048eb95b78503398684056dd2012d2a6cb69bba375bab13d780000df1951710cb59a62ecf8f278f2a4c8e3ed81974bcbfb2c9a238221731f00a585b
+EBUILD getopt-1.1.6.ebuild 1805 BLAKE2B fb17973221578d2a6f596402458c4b284d85fb44c2bb5d3a15af93eb01d665dfbba6ec52f991ebfe73e3b5aeb8b4ad5965606a6ecc3bb8bf0dd562a2244bf054 SHA512 bbabb00afadc32048bb079dddf714392e98dad887cb3d0fa50d53d4bf4eb49848624fef44df390b9b950b3fe74a199aae2f23e21fd8b270d91d872542cb244c3
 MISC metadata.xml 342 BLAKE2B 799fd88b4f38206d301039f579ea9b29920c98946ad0c5fdc57d2ae32d280843c5dfbd4db50d3f4cf7aee7f287d79361878d366ecc8b415406182639a3cffca0 SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05
diff --git a/app-misc/getopt/getopt-1.1.6.ebuild b/app-misc/getopt/getopt-1.1.6.ebuild
index 4203c9fb6e90..b81506dc50a1 100644
--- a/app-misc/getopt/getopt-1.1.6.ebuild
+++ b/app-misc/getopt/getopt-1.1.6.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
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
index a551b975af51..dec371a77245 100644
--- a/app-misc/hachoir-metadata/Manifest
+++ b/app-misc/hachoir-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-metadata-1.3.3.tar.gz 52304 BLAKE2B 31da89c0ca95c381fef3354a56f45569ca0f69e8e14518e1e83897dccd5be8a77d8636127f3363f9b28998e39dfccf0d008af00f0c1e49257fe95012aa2c738e SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a
-EBUILD hachoir-metadata-1.3.3-r1.ebuild 1548 BLAKE2B 479929627709ab54cd0dd670fb5f030d8afd4b2eb0a2dc580aef769b4a65c3fcf0d62d7c3d5b50df0725911ac359fc30a9ced01189749f994e4992e7de7eb8c4 SHA512 6af1f545e7a3cdd447793d5f89ef8eadbf037265a78a63824ee5cc0f6d7b29d4dcc630c81a235eec21cf5197c4b60300ad118b3182f63925770e5f7e2e564a0d
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1465 BLAKE2B b9324bffbaea594c93cafa43f148f7bef9e8efbbfb292c476a0047c76dfd1a84394e3b387ca9e0ff422a3456cb6ac4819c691265b83d3656b2f6e0fd26f01d3b SHA512 aea4671801e563fdff3dbf6c05d880ef90de4def26721410dd5de76aedf6ae9a9b01b94f2ee51aae45d0c6c09c1c56523fa13644c969e0cc1af1577a6cbcc989
 MISC metadata.xml 428 BLAKE2B e53b795402d41bbf42f54ec1745cfa0d238a7e185d8db0fc06fdfb5faec4d6d72c6b395003f365cd8a33750ec35b7b0c62753dcc0fc949934d5de457a6b254a2 SHA512 c76d6bc6b172d7329562c87557d9695e5629a3ceafcc126f663b5af51af7f728a6f64dd875832af4acb2057ac63d23dc71526724a61395c3e34303da4177acd7
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
index 2dba4bb923a7..0a763ba01dea 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-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
@@ -14,14 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="gnome gtk qt4"
+IUSE="gnome gtk"
 
 RDEPEND="
 	>=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]
 	>=dev-python/hachoir-parser-1.3[${PYTHON_USEDEP}]
 	gtk? ( >=dev-python/pygtk-2.0[${PYTHON_USEDEP}] )
-	gnome? ( gnome-base/nautilus gnome-extra/zenity )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
+	gnome? ( gnome-base/nautilus gnome-extra/zenity )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
@@ -34,9 +33,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	mydistutilsargs=( --setuptools )
-
-	use qt4 || mydistutilsargs+=( --disable-qt )
+	mydistutilsargs=( --setuptools --disable-qt )
 }
 
 python_test() {
diff --git a/app-misc/hilite/Manifest b/app-misc/hilite/Manifest
index e886beb85993..de0aea7b8eed 100644
--- a/app-misc/hilite/Manifest
+++ b/app-misc/hilite/Manifest
@@ -1,3 +1,3 @@
 DIST hilite-1.5.c 2872 BLAKE2B bd6f89863100906a731008cc3c1b0480e3aa655119d73d651f425a2686ab0a861637f5818c671d453ce26fd831251699e6eb3b59d3e5b5938e2e1cb4de19a367 SHA512 571fb962e430d3c9e5494d802f529529a5bd0bf6dd7f398e7c55dd5a8effc568f9153edecf50d2e296b97eb20b2ddaa52c2214b9dd989449aff3b93a0547ad45
-EBUILD hilite-1.5-r1.ebuild 680 BLAKE2B 4ae0278eda9f9db4f52d8805466713dbaf391be94c6653aac7549740d34dca86a401a3fe103641253c3ec8f562cf5f7c18ac1497638c661db1e7db26b740abf6 SHA512 0c58ad9052d519e6fa86362b63b342cfaaab936931f376bf5530103b9932c4af3ff436499dd5a1c69e4515ff0ffc33ff92ebc354a971240e8af01147ce5b64f2
+EBUILD hilite-1.5-r1.ebuild 681 BLAKE2B d848208a9e09d10a110a94d91bd53e1ae9bc860783cf384170cebd9f11463057ba89eeb42224e8c535c086b37b65cf09f8ff85d5cd67bcde95c3da8d70c74c97 SHA512 b789ffcadad98af2d6adf30c49553aea634e7d78d9d764721dc666462f6d769a2bb69b22a84228a4024b243889011545cda5078d1296cf75cdbb66cb3fff4ab2
 MISC metadata.xml 341 BLAKE2B 95a2d672cce1e13ac46dfcc1661b556a241aafdaf9afdb2a5a84afd4ccc94bce8edcf5483f5deda7cb62a834be32be1f7a0fed38d26b96159e4477e668201df0 SHA512 792aa66d85af91677e5d075168e80f3c4d21a804047bcae76e685e612d0c57edf61167712639a5d3322d9f4c35d25b04b6ec2b8d1cd2150d396b8b4e95e8fcad
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index 2bd3b5dd56ec..0eb05fd3e23d 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 4bbaad4a8808..887e68a56a6f 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 615 BLAKE2B bab6a5b09b3fd5fc503fadd860de19752bee95f5af2bbadd26f1f1ab903b9a6e1cfd0c5e3eb6a0a7be819a0386b87bd6859460ed7dcb8fbeff038bb4c3b2a73f SHA512 c412147fe1b96ce8b197bcf6d75203082be25fbd604df2652be1655372be5a37e8cf5ca34604321450ea54b52232f2c28cbf635907e885ec3b61e0a384e88f56
+EBUILD mime-types-9.ebuild 603 BLAKE2B 258d7d0314407b15c6b631b08939a39ceba6044bd47dffba4d5442d2da022536bda2714ef753c195d6e49db87ae8f7c7c77ce6f4be1b167b0b07460fefdac50d SHA512 589a9d7908120387be3bfc042212e98ed09fa6a9c347f63b166afd40f0d31285689a6562ea229b79b34010f095eae8b78b6a68b208928fcbec5ffc2002ba9d90
 MISC metadata.xml 346 BLAKE2B 218632e5ffb174f52dea645949149ddd7af766a3f2906b366f95399a6268055ea3d83e89aab32e1b341e2cb7ffdf21344fddc2d2e0b083c4ed7a5df9cb634dc3 SHA512 65aa65edd1d47b4d6f87120e6685cccbc90c8daedabcac6f9ebfbab562682cc226d7a6f83886f61e38bb3fbfcd6b32ca17725291d6f95939cc1d40dc8bb0173a
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 8eba4a1a85d2..9367b583533b 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.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="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=""
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index b82312e201c0..2dd5bebbf4cc 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -3,6 +3,6 @@ AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 BLAKE2B
 AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d9271f9ee7ceac9826282d2eb3461a656f21c96720cdbc8b9c91661ac23327a8e5053ed7675afd47d7d8a037525a6d992d SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1
 DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277f3b562c9d8365ea5a6b5bfa4327bad66cf1f62cb626f8b6ec3ae693cab713683b81142dd71920f3b6300951f6d2 SHA512 cec176cf5863b15acc058cbd99639f5f456346136d0551ce5875cb66c28dd0f6e7f5077b0c06751a3a68984b5c4386c232d3db8b76aa4f4b326b0b692835fdeb
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
-EBUILD pax-utils-1.1.7.ebuild 1484 BLAKE2B dbad63c811298b53512fa3e104e25068906855df00a43b0d75dc3f6c7092d3077742a08a5ab69a30209a7e17deaec55f2c453e54a16345be67aff722dd792376 SHA512 b4974eb1d8e2c1a7958cdbd8ebc33c5120fe84b6050094400bb86ec7ba8c883a2b06171c8aa8a7cc7f66bd5a18057cabfa6a3afc1662cb5b4c6bca95da39592b
-EBUILD pax-utils-1.2.2-r2.ebuild 1648 BLAKE2B 4532b7cacf3ec1bba302db18025a9b1e160b29e7f404ca6a53e2791b44f843dafdea1606671242e83d33a6a276d68a5ee97c57530b0f477bf1a07b542da13d09 SHA512 9da01fc5f44e983de46d7ec2003d05ba295e762a573a2db9c4fc722fe4e7dac5ff4fd4e9d86a00ce604e19fa01e63e8735735c02caa7d7a64622fd39a561adc9
+EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
+EBUILD pax-utils-1.2.2-r2.ebuild 1636 BLAKE2B 7b05c360540f6fd8fd5a68b68ef7ba36b56f197843207e04e3fdfa1072a5be0e07c2d785b3b4369c3dd70530953a73307df501d1fd3ef8c133d2eab64f4e1ac7 SHA512 337ae7b58544298da664ae3fd85f0bff9512d9199db314443b6f70c887644bdd7669332b00c7788558a780249028e1cf8e7e121dc757482de5155898fea1d251
 MISC metadata.xml 489 BLAKE2B 2fcc27d5145a496d5bec7bf953b4007760a85471f66027b6a842ac5907e063522189ca5c107e8080e8b43aa9acceebc228f796d96d9b3b35c7424148f60dbcb7 SHA512 ada40ae17d53809394f87a89876b52df9c1c88ac231282cb9cf9f27e9314d3facc65f95c20ea03b3e994e19dbaae8fa5dcd20684b52812aaece02da76f089bc6
diff --git a/app-misc/pax-utils/pax-utils-1.1.7.ebuild b/app-misc/pax-utils/pax-utils-1.1.7.ebuild
index 7c362e60f15f..85e5741ae654 100644
--- a/app-misc/pax-utils/pax-utils-1.1.7.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.1.7.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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index 26ac45008744..996e0595efa6 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pysmssend/Manifest b/app-misc/pysmssend/Manifest
index 7f8124c97f2f..0d9f1a9b258e 100644
--- a/app-misc/pysmssend/Manifest
+++ b/app-misc/pysmssend/Manifest
@@ -1,4 +1,4 @@
 DIST pysmssend-1.48.tar.gz 58172 BLAKE2B a1a33178505f3b9571c81ec90b2fc8c786ad988210c2d87f739d4b1c5c7df20bc1cc84e546a97c7a4b4063bbac363db93358c603994f99d216d1b6800c8d1c29 SHA512 d1d08e11bb4a5f450a98e9bf6292ce65edb61e0610e085dd79dcb80fd8ce1d15f7350797a0150eb6ddcc0116c17e3290f2790632eb7f54ab66efdcf662022088
-EBUILD pysmssend-1.48-r1.ebuild 1052 BLAKE2B 6703323ccf63a6c34f24f9a196103ee4db2091900f117a451c5126f23aa7950870b4d2c0235589c1e7b71e7e4afb7a42e9223dc56eb21508263606bdbb8398ce SHA512 4a687d8bffe9e7443c151cd609c4c81cc8c4696a7d13c25702396fa8a9054bde1015b4205a2984ce063fbcdd890aad72d1a207d8ba5700634c01238246a807f5
+EBUILD pysmssend-1.48-r2.ebuild 737 BLAKE2B b093e9c364bf6f1771fd6da49f4a680828f8761e81f9db623ebb831b1e14a5b4ad2a82518e35cb6a116b57ae92d5b61b1feffd8a701e9a06572745f97a87941e SHA512 2a3709f00f7804c6b7c0609f1fdaabfd6c15da79d942542743927b355fa21b909fe3071611a2550720840d81e8a43f6ce0c4432ed5b84adcc7472a763018bf51
 EBUILD pysmssend-9999.ebuild 1389 BLAKE2B 783b10a14a94120a37dc00d1b66200450dc414070cb753a39ea5a9bcb8dc6a41a7d67a3edf323d8e557bdc5a925d4f0ffd5301629281420cbdb20b7200856df6 SHA512 49d806d6b7b07d7189a7a350288caf6617be0b4cd17088955fff77fd4c007e665d32aba3061a17984e04fe914229b55393c04289e7e9d64c371a709341adf3bb
 MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/app-misc/pysmssend/pysmssend-1.48-r1.ebuild b/app-misc/pysmssend/pysmssend-1.48-r1.ebuild
deleted file mode 100644
index aa7d392f3824..000000000000
--- a/app-misc/pysmssend/pysmssend-1.48-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python Application for sending sms over multiple ISPs"
-HOMEPAGE="http://pysmssend.silverarrow.org/"
-SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4"
-
-DEPEND=">dev-python/mechanize-0.1.7b[${PYTHON_USEDEP}]
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_doscript pysmssendcmd
-	if use qt4; then
-		python_doscript pysmssend
-	else
-		ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	if use qt4; then
-		insinto /usr/share/${PN}/Icons
-		doins   Icons/*
-		doicon  Icons/pysmssend.png
-		make_desktop_entry pysmssend pySMSsend pysmssend \
-			"Applications;Network"
-	else
-		dosym   pysmssendcmd /usr/bin/pysmssend
-	fi
-	dodoc README AUTHORS TODO
-}
diff --git a/app-misc/pysmssend/pysmssend-1.48-r2.ebuild b/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
new file mode 100644
index 000000000000..9a6c08568a69
--- /dev/null
+++ b/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Application for sending sms over multiple ISPs"
+HOMEPAGE="http://pysmssend.silverarrow.org/"
+SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">dev-python/mechanize-0.1.7b[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript pysmssendcmd
+	ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	dosym   pysmssendcmd /usr/bin/pysmssend
+	einstalldocs
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 90cd61f94829..d095aade0ef5 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,3 +1,6 @@
+AUX recoll-python3.patch 473 BLAKE2B 78b15249de8b20a46e3331d90c52cc8987278d4c508480ceab35ee878c9467f796b209dca5eb0ed5637019718a5e0dc7a2888283b149041ffcedfc175419509c SHA512 50cd8bea004e2ee3a7b861b3b9bc981d5dc0656421894dc8f47777516f290aaaba4300eff52d01d496c873d0f135bfb39f2606a41e95a3dc4edd0a1195614774
 DIST recoll-1.23.3.tar.gz 2590148 BLAKE2B ec058bac500aa61b4e395720bffcc2bfbcaded954c986e8e1fe69720456267c33b5e34eb3e28de47f57d9af207c60b138c521792882b093120b988b682600b2a SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06
+DIST recoll-1.23.6.tar.gz 2601494 BLAKE2B e64ed422a1ac1a816091f9ee00ee23b551690f5038cf3378a00ebf39c9e4f4e22436105ed01a1aa2bc21b633c85a73ba2847a265e4d199109a8b0c03ec53421e SHA512 ae6f6dfe5e63faf2310b32bd0ffd90f08b12de7452ded9e5bd58a45690797caa9f5c66ea94ef94ed7a4ee3e55083cc191fbecfc112dbce42415d0af1300fe8fd
 EBUILD recoll-1.23.3.ebuild 3530 BLAKE2B 2ab1153d20e6868ce8cf8f641a475957e51ca98ed322fe00edbafc9e8766639b5a91054bef716e628ea1e15300a73a629f7fef8251c30e666e5910bc56a1e462 SHA512 a37a458472a8c8b07f3c2d9b61bfed65e22d7f94622b941a0dc1cf1175bf57ffe5e49a063972490670b122adddc6471b01ed046560b237a9de0a2a7e2eef4724
+EBUILD recoll-1.23.6.ebuild 3543 BLAKE2B 7759c44f9c0325e2daa478f5c63e5c14c362031f4633ad0209c974ae81a3f362da655266df079de66b8c95871087753dcd8a921cafc52ce0456c085b53aa46a7 SHA512 0770d7316dd8d9385d8210e8bd10f2a4b4ef298880c1423226be366e79fc974abd7fc9bc5ec4ad8bb00126fd2f24ef58f5f6faa5f50c27ca1219efacff410085
 MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/files/recoll-python3.patch b/app-misc/recoll/files/recoll-python3.patch
new file mode 100644
index 000000000000..6d6fbdf39618
--- /dev/null
+++ b/app-misc/recoll/files/recoll-python3.patch
@@ -0,0 +1,17 @@
+--- a/filters/recoll-we-move-files.py
++++ b/filters/recoll-we-move-files.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python2
+ # Copyright (C) 2017 J.F.Dockes
+ #   This program is free software; you can redistribute it and/or modify
+ #   it under the terms of the GNU General Public License as published by
+@@ -42,6 +42,8 @@ try:
+ except:
+     import rclconfig
+ 
++from __future__ import print_function
++
+ verbosity = 0
+ def logdeb(s):
+     if verbosity >= 4:
diff --git a/app-misc/recoll/recoll-1.23.6.ebuild b/app-misc/recoll/recoll-1.23.6.ebuild
new file mode 100644
index 000000000000..685945ed2d2e
--- /dev/null
+++ b/app-misc/recoll/recoll-1.23.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info python-single-r1 qmake-utils
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase doc +inotify qt5 session +spell"
+REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+	)
+	session? (
+		inotify? (
+			  x11-libs/libSM
+			  x11-libs/libICE
+			  x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${CDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${CDEPEND}
+	app-arch/unzip
+"
+
+PATCHES=( "${FILESDIR}/recoll-python3.patch" )
+
+pkg_setup() {
+	if has_version "<app-misc/recoll-1.20"; then
+		einfo "Installing ${PV} over an 1.19 index is possible,"
+		einfo "but there have been small changes in the way"
+		einfo "compound words are indexed. So it is best to reset"
+		einfo "the index. The best method to reset the index is to"
+		einfo "quit all recoll programs and delete the index directory"
+		einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	econf \
+		$(use_enable camelcase) \
+		$(use_enable session x11mon) \
+		$(use_enable qt5 qtgui) \
+		$(use_enable qt5 webkit) \
+		$(use_with inotify) \
+		$(use_with spell aspell) \
+		--without-fam \
+		--enable-recollq
+}
+
+src_install() {
+	emake STRIP="$(type -P true)" DESTDIR="${D}" install
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	einfo "In order to extract the full functionality of "
+	einfo "recoll, the following packages should be installed "
+	einfo "to get the corresponding document support."
+
+	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support"              app-text/poppler
+	optfeature "PDF files with OCR support"     app-text/tesseract
+	optfeature "MS Word files support"          app-text/antiword
+	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
+	optfeature "Lyx files support"              app-office/lyx
+	optfeature "CHM files support"              dev-python/pychm
+	optfeature "GNU Info files support"         sys-apps/texinfo
+	optfeature "RAR archives support"           dev-python/rarfile
+	optfeature "7zip archives support"          dev-python/pylzma
+	optfeature "iCalendar files support"        dev-python/icalendar
+	optfeature "Postscript files support"       app-text/pstotext
+	optfeature "RTF files support"              app-text/unrtf
+	optfeature "TeX files support"              dev-text/detex
+	optfeature "DVI files support"              virtual/tex-base
+	optfeature "DJVU files support"             app-text/djvu
+	optfeature "tags in audio files support"    media-libs/mutagen
+	optfeature "tags in image files support"    media-libs/exiftool
+	optfeature "Midi karaoke files support"     dev-python/chardet
+}
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index 097e46c9fcf7..a4abf23f1eba 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
-EBUILD rl-0.2.7-r1.ebuild 665 BLAKE2B ec4385bc00da5e9900ca8a5c9986dd665691496759ac5e54f3fdeaeb10f1c85b52e797ede5c0ae8a2443a763b1513bcfe0090fc664004e2229e914bd551df77a SHA512 f0bf14af17d504740d9f8e3b4c1c63c0a11d3abe321fb85fc5b636f073a2858b18d6ea14b6c6d70bb5a020cb5744bbd1630cf891c8655af57e4ac36d1d3fe027
+EBUILD rl-0.2.7-r1.ebuild 666 BLAKE2B cfe8238579d0a0c46cd1f6c72874a6f82e8e2df4a76d747a1d2353f8effa0e01bfbcd99d35523658b394c24bf0fac7827053a9627adeba7ea4a7c3f825f7ffb0 SHA512 7e817cf83f7d270d4d4be46c7a5affe080069b97daba97cf98b2de92ea12865dd24e7326719be9c41789ac75b4e098de4003081f741a71f7f1a1d20c7f31b3a9
 MISC metadata.xml 516 BLAKE2B 2d786d68943ad204e06e46ebae794fbbc3b145adba11bdad08a57fa18b63c6aef331b190ab5645ec690671fa977d50fdb4865cc71206b0e6422bfbb16d49553f SHA512 7f7e565aa5a90fabf857fc8e5c78bb98000677c2a8e2cf1a0b4bcc5af5b3bb80f4849b1f6d6f7a2e7d15ea84930e79017865c6b2fa8230e032654b0fff4ca2e4
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
index bada8adbd661..767c390d1e14 100644
--- a/app-misc/rl/rl-0.2.7-r1.ebuild
+++ b/app-misc/rl/rl-0.2.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 mips ppc s390 sparc x86"
+KEYWORDS="amd64 ia64 ~mips ppc s390 sparc x86"
 IUSE="debug"
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 1932b5369bac..9c7cfc6455ec 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -8,10 +8,10 @@ DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f22
 DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
-EBUILD screen-4.4.0.ebuild 3992 BLAKE2B 9da66bdf4a45c12a3edb864ce7d818a8c04f9b14667017ffd4b12d078f5dfb6522ef0e99132adb6582721857a7736e47977eaf74fc426c88eaf5c24731dd089d SHA512 e729eb11f867eca28ba9fdbf00be2f6a545994ce880e03e8efb79b1c789f431b5c195020365e9f3d7d0db24178dc38b465a30e55190512d2df46b6634cbb8513
-EBUILD screen-4.5.1.ebuild 4139 BLAKE2B 78aa003685d14551cf61b8359193680b480c7513296735ddbeeaa23ccf54f551043b98a7f0891b44868b9d634b31af1ed3e8a8884ef7d6f36f061cc76ec97778 SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e
-EBUILD screen-4.6.0.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
-EBUILD screen-4.6.1.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
-EBUILD screen-4.6.2.ebuild 4123 BLAKE2B bae379a637baf0f7007fc2e87178727a8d94695a0a00c27197420d6713a1ab2ecbe81537faf9d70ccbd0a7ab8bdad4fd4704ef4e56c5bd9ef847d365a63d7027 SHA512 47db3610117484aad073d69eb1cdd3f084fc2c07b720e7a3454d7441f4794fc1b1675e7ea54042e0a7b483731e0d147f20e41311cf2cfe38e130d220ed85f7ab
+EBUILD screen-4.4.0.ebuild 3980 BLAKE2B 3077899f647e40c745c435215768819a8bb11a21d3f91ac86c45bc107e96f8d8cbb9d86328f5b7bd8295f1d80afa73fa67405bf37c1b8319466ce57aaa33af42 SHA512 95379c53082d4bd334550dce454c087fc9591cf96a625018e1856eb7073ce267f5885a382b54fd46e73a319b64304ecb92f779b1aeb80898262b8daff763bc13
+EBUILD screen-4.5.1.ebuild 4127 BLAKE2B d224ced4b2a18f213fb6d2d8c31fb466d6a4fb19c4fe1a8f24823b40a58abee084d4f6f7e8870bba4c016b198182e88f61beb7b86a9ec8bcacabbc4dda5bf9f2 SHA512 6db1227a0d8f4580a1603b85bc0ff8cdfe868ba58c735848e0dd37b6b989406bfbc9c3a8803c11f185f5f78802633bbaf90284356c66d364ea566768be2a07fe
+EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
+EBUILD screen-4.6.1.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
+EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
 EBUILD screen-9999.ebuild 3680 BLAKE2B 2a30c6e1703a49390dd01132f03865a3fb355014f18e9f2bdf488ff58610d0d2e38bc397afb83804b6d69dc2bf32715c0b9c31e694c791def50096f91d051cd8 SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5
 MISC metadata.xml 1886 BLAKE2B 7e3e98299946589016013172efe577871d7dd1f364fde617842650bf262d5e3c49623fab5cd6640560a50f65ed0be875802dbdcd9cbe3450da01e8177da0678a SHA512 2fe77ff502ba653cf53a4a03159f085339881e23ce48b30f1bfc8638c3d0e33a4230dc82819464fd9566e42e8546e5a4011811902adfb2ed5e96938a8cfe5785
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index 0dfbfbc066c0..af3dde775a65 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
index 5dc17e7b33df..3ed9e6bf384c 100644
--- a/app-misc/screen/screen-4.5.1.ebuild
+++ b/app-misc/screen/screen-4.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 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
index 01169b42901c..11e428ca57cc 100644
--- a/app-misc/screen/screen-4.6.0.ebuild
+++ b/app-misc/screen/screen-4.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index 01169b42901c..11e428ca57cc 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.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 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
index 7b571355fa99..344c79d869d4 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index c03986e96f59..9f0d74af94d3 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,7 +1,9 @@
 DIST yq-2.1.2.tar.gz 4704 BLAKE2B 980f0025ed397d620cf4883b3603411e7d969d641a50b6ad7f8be2ed9cb326772b0d79b36b0fe1c1f168e9b859bab63be3c0a6e267fef9ae15e8aa66574dbd67 SHA512 88f32e58aacd82deb06deee6910f5a145e54d20829f438cd47248d560119dd8112e0813ea8d55708664ac29ef011bbc3fd6b882e1c538ef44aaa9aa119584e99
 DIST yq-2.3.0.tar.gz 5165 BLAKE2B 5d317d78e4e9e0fbe3064c004b33cb267fe0947d011ea3f12b873a2a31b16695c57bd932b2f2e5145afa22f9cccb43bed0a34847c4975f83bf63651e6b3b5372 SHA512 f256d1766b697f6bcb88bb8129e587bb99929154e13167f179bff1669b08b5444af90d7a17382b4f434092110ddb9e578c1f374b56aba03b4a4406fc25b76d6a
 DIST yq-2.3.3.tar.gz 5486 BLAKE2B fa02b7466d54dbb5ddd4090329e1dd1d3826aa12d647563296236122fa34a85e7ee3e7f06edc227264db8fc18a215f39a5b171c18e498132bf701ef25def7936 SHA512 58461c74f907be241047197967ec316ea6ffe2accd99c8b97a158369d06f32c758c56edaeea30d3e4988e295a58fabeb47d960097b136c6b0bf16c2792b7f75d
+DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
 EBUILD yq-2.1.2.ebuild 649 BLAKE2B bf14c5872c47badc6fc84bfd7b92ed8652715c6605a45b112332225eee6518fcf04bb2cb4d56b7e71faa5db56e16130fb97d68228e57e1db47553648e22493af SHA512 5a6ec7457d977556b8eec0be0be3aff8160fc656c5de35c0b4a9323a98a020e1a98edc3c9918542e9f4169c4e9f8cc11c44a6882866e43b4eb19fe3126f5ed8e
 EBUILD yq-2.3.0.ebuild 640 BLAKE2B 3a61bb44cfd3eee185eb2a0a15032173835f3b9dd853af079ef23a74b231d44514b99db2255bfa7eaea7a7ecc89f1b0c4701d03f4a09fca7720af68889be8142 SHA512 bbaa17264984766a01dd3c5548f2853f27626f1cc31ca2e324add90467cc0d8c30a1c018ca64b2a011a4ea4cbb67c40099cbdf3f8b185535c376ba3290e40ef6
 EBUILD yq-2.3.3.ebuild 640 BLAKE2B 3a61bb44cfd3eee185eb2a0a15032173835f3b9dd853af079ef23a74b231d44514b99db2255bfa7eaea7a7ecc89f1b0c4701d03f4a09fca7720af68889be8142 SHA512 bbaa17264984766a01dd3c5548f2853f27626f1cc31ca2e324add90467cc0d8c30a1c018ca64b2a011a4ea4cbb67c40099cbdf3f8b185535c376ba3290e40ef6
+EBUILD yq-2.3.4.ebuild 640 BLAKE2B e9b0689dbff64ee1ea2712d8d6bb6dd106fdd5057ea0e9bc7203a98590ec5ee78509e6530769b3994f384bfab1f2bc32ce81e6cac70e5d244aac8ac1dd1d0201 SHA512 4efe79efc5839ee9065d7101aa3829d71af31fe41df80c84f9984a064351d8d723a0b617e2b433756bd8dbed1bfa0cc87fdc7cdafa513eebc5a0133e0023aa5d
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
new file mode 100644
index 000000000000..f6430d90a552
--- /dev/null
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -0,0 +1,24 @@
+# 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 distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	./test/test.py || die
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 86768cd65630..7297fd576205 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index f9c307590144..46cafc8473d9 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -6,5 +6,5 @@ AUX obexftp-0.24-norpath.patch 641 BLAKE2B ba8de051365bc6417a6421cde50399a92754a
 AUX obexftp-0.24-pkgconfig_requires.patch 399 BLAKE2B 56e8debd7f0a4231acb27423284c18a365df9a6c0f04efbc7c3da05210021770da8de5b4676455bd962031726874bad60a1b3bbc14769aeda095080720adb82d SHA512 ade75cf148d50223d30bd0a075303c8ca686dbf7f1e099c317e7a5d9d2b929743f5fd613b29a4c6af46b48e8a3dd74cd0db8d08df9823699dce6da9e84222749
 AUX obexftp-0.24-python_sitedir.patch 544 BLAKE2B d86883dca5cc9795a07a0a306692cfe63774054d7f6358a3c2a581e2a77f85fef2c3e9fbaff8d8d21d860ced636159532d2fede546ff28146c452e0a2ea33910 SHA512 519e77d8a3ff4b7a9779e350191b8389c27f7bf42abd44704508341d9fdabb0bf9b456fc4cccd93779fc4b54ddcf3cabb38e55f2ea3389b90a85e27de18e0b6a
 DIST obexftp-0.24-Source.tar.gz 88154 BLAKE2B 6124a59e8e8af555256fb910b1efd3ae630e97e71559fa3d5e488e911251d98f3f4ba543cb88723f0bc561b4753afc9b613410da51d7d8695182cdfb9cbaf7ab SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9
-EBUILD obexftp-0.24-r1.ebuild 1807 BLAKE2B 638984ec267a12a926ebb07e4f42ba6d34b097a65e711061602acdf028ce8381da2a28286cc91b314e5243ecee9813ff3bc4579a9fa8bad53951d603914069d7 SHA512 6705c41199da103ade14f53e9266ef5a1b02fdfa433a99a967ef505db99471fec40cd1aa5a530c44abeace53bb5a5ac9ee5dc4c158b22deab2c0b59ba1a185f7
+EBUILD obexftp-0.24-r1.ebuild 1807 BLAKE2B e321e47aae97d47fcd8cc04f3ebf10e55b53422e2faf87b801de805fb0e181cdf4c60f1898221d434386a69bbfa4d8e2e2f5eef1aba6f2cf32dfcc6a46953d5f SHA512 6823c08702627da889216c0f93b400533d0772d5e6f3ce6f587db940c970e7c7ce83fa7aca2dca0bcca3b36ec27c6a29a54cd89a93ca34a7ce8f2ce23f6c79d2
 MISC metadata.xml 245 BLAKE2B e86e15e6196c5caa30c4dbbcc46d970e3d1fc51b5986c9c5855da2914e104cdc3abe7d23eae94b143047e21603bbd49c23684cca7eed166d90579ccc9dcc742e SHA512 f2f864248cda1ce42c75a7d993ea9d80592f4b5bf957ba7d10e3a26d55429720530c96974403e9d732e2ca67724645f7dfb8b880617a3cc6a3b9d36dd201f433
diff --git a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
index 75435dde82e0..d5746a637f68 100644
--- a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 inherit cmake-utils python-single-r1 python-utils-r1 ruby-single eutils multilib
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 06dd0d5feb72..03b389c5fb5a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 5a0a621f8270..d1179ed58374 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,5 +5,5 @@ DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960
 EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54
 EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb
 EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
-EBUILD gnucash-2.7.3.ebuild 3507 BLAKE2B b686ba37ab8566cfde98d7f0606b0b6fd5738a59ac2d08c3149fbfc00ccef117cef80ee6c0f3494480f3f81fb524a8dacb547fbf260a82ffb78dde6672a6b347 SHA512 507aa648e1dbc301b4f80b5433c0d5d925793909f31304f5b744f6ef4553a36f541adc69f08f0d6bfc2a5c1969b405c777c82c6b68d9ce034d8dd99471359d73
+EBUILD gnucash-2.7.3.ebuild 3662 BLAKE2B 235d7c3733e37de0db3dc37a15033de21211261945b045bc198519e55e6930b40bcc537525a8c3ef3e34f8585832d1043f671d9c7756ecfcacd080900f61883b SHA512 8cbac0e334419ab2eaa3142438f33b0ecd4b79b991889eef6065b84283f3f70169248fe4fe3a4d146768988ad758d6cbf11b4b6aae553c7fef5b8d028d57f0d7
 MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild
index 9bf87b6b7157..1dacaa9f6593 100644
--- a/app-office/gnucash/gnucash-2.7.3.ebuild
+++ b/app-office/gnucash/gnucash-2.7.3.ebuild
@@ -131,7 +131,9 @@ src_test() {
 }
 
 src_install() {
-	gnome2_src_install
+	# Parallel installation fails from time to time, bug #359123
+	# Usually reproducible after removing any gnucash installed copy
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
 
 	rm "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,projects.html} || die
 	rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt || die
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 68264a80cb27..b994c3696a20 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -9,5 +9,5 @@ AUX kmymoney-4.8.0-tests.patch 7303 BLAKE2B 9af6e4438ddd5f0a992744f9b063a3b5e4d1
 DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
 EBUILD kmymoney-4.8.0-r3.ebuild 2080 BLAKE2B 47916c64c9bc3f9fcc906d11c2e1a02df5224f40297454ab228b99f8a5d8ca4df5dd068052fccc0a218efe3bcf9e8b16f53bad2b0d691acf0a0357d12dda9362 SHA512 f74c37356f2059c14c224aa600af5fc0b6cb6217be1ce431bf57223d93299ca515ecdd1801487c06502703b61bb81faa42be6358e3cda17c4099335d6c19dfaf
-EBUILD kmymoney-4.8.1.1.ebuild 1637 BLAKE2B 5d4356523d4258df4691253bc15186a26e9a2c5620442c409a59f86515d61599e8c2818fd86eba336e70aa4d7524e2394ae0e3355c7439239e8aa1a8ad502966 SHA512 b3383ff299aa42d89d274c4c4244d9d058634f558f46e13fbb39f7a215a9448fc1a1494500b696eaee701c977df6fd4e404e62eb0d7420028be09abe7934bc78
+EBUILD kmymoney-4.8.1.1-r1.ebuild 3311 BLAKE2B 7ea9f95e3b07439bb0745d7fdc8e783f82343747c5c601c19ccdd7723fed22b23aff47a3f245d69496fe107287853360f319f4eee5e898234e801a2e6318e325 SHA512 bc5b019ba2ab8c5871e86cf30cf7090b687052ca66ba3ed5dda8645f7c1290f875b5a3ad2d39c9e2bb3f236fda243ad4f8087ef719dde904ce79fafd8d43fa23
 MISC metadata.xml 607 BLAKE2B 3c2d771c20d49a41fef17d5b82bb7530f7db7611f19fa708045a81c55392cb06c0a82df7c0e9c80f8f2fb089e9233ea5a570700c37d3f0ca8782505ddf5216df SHA512 53ff98b9a6a419763e03670c0f6b5da707ff0b17f9f6ac8c03df46502599225d8780c099627fe8bc1c35f13452b80deb88d6fd0da450634f42a9aed827d256e1
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
new file mode 100644
index 000000000000..612279679a18
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic virtualx
+
+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
+}
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
deleted file mode 100644
index 24a7abd20135..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="calendar debug doc hbci ofx quotes weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-}
-
-src_configure() {
-	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
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3fb05e7286ea..f64f4211471d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,6 @@ DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84b
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
 EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
-EBUILD libreoffice-6.0.9999.ebuild 16469 BLAKE2B dc113589f06ccf9d5521d2663a07d756a759bb0c339c30318912b29fd2b7cbb091dabbcf6fd9b50ae15f72bd40fd4dd54a4147a637b6694999d8ebb1caa6cb88 SHA512 f1848d7709e544fd6f082e3cd912049b046ef979c713aa1f165b4c6893595448f6033f688872b413e46bedc7d99ac764a7a34f395c7445380f299aabee23d780
-EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
-MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
+EBUILD libreoffice-6.0.9999.ebuild 16476 BLAKE2B 1fd7de3ce7a351fb0f65831e28cd8e3768144f9f861fe5a69d4821f65ec4d419989259fbd48500c31a460c18629fb516adc147375bae73453dffab8441caf3fa SHA512 bd2eff8e04a3569d88d83a11af8389576fee8a364db5c54ed24da533846c14536bcf5f3877c35742ef4f2608f2f34d97593de020be5fe9e1051b77012f5019ad
+EBUILD libreoffice-9999.ebuild 16574 BLAKE2B 409d86e1d165ec3e40e72e5cc8e1c150ab1903fe68f46565cb2ada5428f2124e95b6bcafe87cc5017550f952ae5852bb0162e9740aef6fc4e91109e203eb9b73 SHA512 6c26fccf3293d87f8a4be53ecc0261cd36f8db8a1844121397af7afd8787ae1ca7fdb01a70f64f4b18095ff130afc8f8140e2b24ee39c182f206c7c01a93751c
+MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5b58caa856a0..90f72941a9bd 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		media-libs/gst-plugins-base:1.0
 	)
 	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -426,8 +426,8 @@ src_configure() {
 		$(use_enable eds evolution2)
 		$(use_enable firebird firebird-sdbc)
 		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
 		$(use_enable mysql ext-mariadb-connector)
 		$(use_enable odk)
 		$(use_enable pdfimport)
@@ -442,7 +442,7 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
-	if use eds || use gtk3; then
+	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else
 		myeconfargs+=( --disable-dconf --disable-gio )
@@ -519,7 +519,7 @@ src_install() {
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# bug 593514
-	if use gtk3; then
+	if use gtk; then
 		dosym libreoffice/program/liblibreofficekitgtk.so \
 			/usr/$(get_libdir)/liblibreofficekitgtk.so
 	fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8ea..1142e018d213 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	=dev-cpp/libcmis-0.5*
 	dev-db/unixODBC
 	dev-lang/perl
-	dev-libs/boost:=
+	>=dev-libs/boost-1.65.0:=
 	dev-libs/expat
 	dev-libs/hyphen
 	dev-libs/icu:=
@@ -148,30 +148,31 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		media-libs/gst-plugins-base:1.0
 	)
 	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde-frameworks/kdelibs
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
 	)
-	qt5? (
+	kde? (
 		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
 		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
 		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
 	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -234,12 +235,11 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	kde? ( || ( qt4 qt5 ) )
+	kde? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	qt4? ( kde )
 "
 
 PATCHES=(
@@ -252,9 +252,6 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	use qt5 && \
-		ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
-
 	use java || \
 		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
 
@@ -367,13 +364,8 @@ src_configure() {
 	export PYTHON_CFLAGS=$(python_get_CFLAGS)
 	export PYTHON_LIBS=$(python_get_LIBS)
 
-	if use qt4; then
-		# bug 544108, bug 599076
-		export QMAKE4="$(qt4_get_bindir)/qmake"
-		export MOCQT4="$(qt4_get_bindir)/moc"
-	fi
-
-	if use qt5; then
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
 		export QT5DIR="$(qt5_get_bindir)/../"
 		export MOC5="$(qt5_get_bindir)/moc"
 	fi
@@ -438,14 +430,15 @@ src_configure() {
 		$(use_enable eds evolution2)
 		$(use_enable firebird firebird-sdbc)
 		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde qt5)
+		$(use_enable kde kde5)
+		$(use_enable kde gtk3-kde5)
 		$(use_enable mysql ext-mariadb-connector)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
-		$(use_enable qt4 kde4)
-		$(use_enable qt5)
 		$(use_enable vlc)
 		$(use_with coinmp system-coinmp)
 		$(use_with googledrive gdrive-client-id ${google_default_client_id})
@@ -455,7 +448,7 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
-	if use eds || use gtk3; then
+	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else
 		myeconfargs+=( --disable-dconf --disable-gio )
@@ -532,7 +525,7 @@ src_install() {
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# bug 593514
-	if use gtk3; then
+	if use gtk; then
 		dosym libreoffice/program/liblibreofficekitgtk.so \
 			/usr/$(get_libdir)/liblibreofficekitgtk.so
 	fi
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 1d3010d41306..f72d5cc7d181 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -15,7 +15,8 @@ version</longdescription>
     <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
     <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
-    <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
+    <flag name="gtk2">Enable legacy gtk2 frontend</flag>
+    <flag name="gtk3">Enable experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index b6bae89ee8ba..3cc1845256ec 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -11,5 +11,6 @@ DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9
 EBUILD texmacs-1.99.2-r1.ebuild 1859 BLAKE2B 5169eff496b09fb03b8756fa2e75f0b2904e333c6dafa93dd348915ccc633ef23c06973b39e4fbd6067ad39a7b982f2e8fe1f9dd52813e12e219a5ef933b08ad SHA512 0d530b0ab47462b964650ad0bd8a28c2c05cb2cd09b2c8054123c5e794fe8093b47645b3713edc1ecc772f846dae37bb821e3925048764480182aa4ac0b63a6a
 EBUILD texmacs-1.99.5.ebuild 1840 BLAKE2B ea7932a639605afeaad05ba624caf118a353f20880174923d4b2fc55b835efca2c661721e21fcf037a2a7c8805791c1f91cb5cf201f3f28d47e1ad8c7a7d3863 SHA512 cf5241fa735e93f87f5c630a13172c4ef7682ce1303f6a001bab79c2d573bc71322e359dc5a13f3430333fe75ec875ab6c1af921d05ccd4d5ff1dfacf719edef
 EBUILD texmacs-1.99.6-r1.ebuild 1619 BLAKE2B ddeaf9804ca92f537d24d759e3cf1683c02b3b849f688c08a501481ad1e838f2613ac6911f57df259b5fa58a52d30823690d3dda781d8c5a4e6588079a4457b2 SHA512 fd3858ad690822ddc9d6806fb98a8567230948d50fc65a5309bf2a1f7f060f100b813c5b4fa0d72c819b854964767fe8c52c2c2305c984fc0ef00521068940d5
+EBUILD texmacs-1.99.6-r2.ebuild 1684 BLAKE2B 16de10fae7384d3ccf642a62c7e3ed1df2e5acc09658bbbe2e3ff6f4f2bf283edb8470f16d9264892b56207457b8fa815d65abdee021dbca8a16674606141609 SHA512 532c5654a3009f70d491b1f830ca7901863c76d967d311989bae18abe1493ecc1ace3d0c9068f12e21d90a22686b0a60cd3230fccaf885dde06f8fdde111c756
 EBUILD texmacs-1.99.6.ebuild 1725 BLAKE2B f7687d9048bdd782c3ffa31e3f0f423d0609e334c090b66c89a09afa47ee53687054589d955fd4de61d82ca8bd86ba579d3a6bb314f0fc56dc00dc667dba3a89 SHA512 b3d58e9de7f1368bf6099bf2d5d98437f0ac9a81e734a9b0a9bba47eba315721dd356edc1d5c947ce5b697196453c7e896a63de44e9c251ab7ba2d5608018e00
 MISC metadata.xml 532 BLAKE2B 8f4a56ce00b94350aa8597db3fa2f65d676675ee212040b1bd5518563cf7c13e9499d2cb800b4e03e5159280ef17c6ca389b151833e587efe710835cc49ac1f4 SHA512 f7a15d31b19285e863c32dbe1a6e77b10d4a9295dc2f9444a69173eb13e5334acedb0b547253dbe0734a33402e11cd9859c07d8d5db1be3370e547cd96266601
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
new file mode 100644
index 000000000000..a5c61a4633ff
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils qmake-utils
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="jpeg netpbm sqlite svg spell"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	<dev-scheme/guile-1.9[deprecated]
+	media-libs/freetype
+	x11-apps/xmodmap
+	x11-libs/libXext
+	virtual/latex-base
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-qt/qtprintsupport-5.9.1:5
+	sqlite? ( dev-db/sqlite )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# respect LDFLAGS, bug #338459
+	"${FILESDIR}"/${PN}-plugins-1.patch
+
+	# dont update mime and desktop databases and icon cache
+	"${FILESDIR}"/${PN}-updates.patch
+
+	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
+
+	# remove new/delete declarations, bug 590002
+	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
+
+	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SQLITE=$(usex sqlite sqlite3)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cbff7fb03b8c..b4ed8ec8e74a 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
index d0501a875e53..c797ab46e2cb 100644
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@@ -3,8 +3,8 @@ AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a
 DIST eclass-manpages-20170905.tar.xz 453248 BLAKE2B dee13d3db8d685903bcaa4e54eb2b1167cac5f4b16fa639b4ddf37e4e33037cb12035b752f2bf12ccd886df38342a32d4e6e64a9ec2e1eea1c38db95b1e13bc8 SHA512 a6e8732f7a06e3a7bfd009a25d91f7f3c6721283c0265361029ee25cdaa20198a7b273e5825d7ac3f66c7ccfa7eea20c2c3ff23dc08bab22a32c2325a413e6b5
 DIST eclass-manpages-20180101.tar.xz 459156 BLAKE2B 1bddc6e20da2b037968eed722e6121ae8adeb90a80d5bbcd6c04528eefbeaa6e08b6a9dda08d2e677dfa140d0b978db51c450121a017360ce05b97709e4f8863 SHA512 7f9d843bd3b41e8a0993981a92aca69cfc423121db132d081d28487f83351a8b5b273eb9576c9610ec96e81b8e9a664d2089f30a0e94720baf07a28313627644
 DIST eclass-manpages-20180119.tar.xz 459484 BLAKE2B 99464007c42b3d9ccc98e991b9872f32450927e6fbf46aa85023c86689e0db5bc5e87788bc69a7306846f55341045acf81ff409768dcce9af2695699d93873df SHA512 dd5c05eb195fe1d895b397b4a165169abf68c6f3abadb40720ac3a8134e55efb2f623e2b5892e88a128c456ca36321863571a1929b76204b432c5dc710094c0e
-EBUILD eclass-manpages-20170905.ebuild 1112 BLAKE2B df88ad03c1d6a8a3f407178324a682ffea016cc238ecc43f7354388a00a75574a1b0f3c884547a1c27eaad0dc263344c0b01335034e5a955d2770292f8265627 SHA512 c91678e3f434802810c0611aeb5186218ddef027c7f0896cb27429b697005f5c1dd724e4b3946dc030c8cf8cc0e28f8a1e5e2f09db06aba0e13950ca64cb9231
-EBUILD eclass-manpages-20180101.ebuild 1108 BLAKE2B c4a96c80199a52e43b036035034d52b887a63af49f5a402ecb009c679e128d8b4525fb920e817487f245bf206cd09893cf51d938b657f4f6b549847ffdf4341b SHA512 7bb673880fd559cdebe572499730b97f19e79d388989395f6ae5c8ebe0d72a6fea9922ed96df59fb2add84a29896373261afaba03de3d1e539fa2e450d06811b
-EBUILD eclass-manpages-20180119.ebuild 1106 BLAKE2B 3a5f00aa6a3a46aff8ad9b88dec56a4154babef9e5a6720ea2ea56c1ebec5e0bc0a09f2626cc73207d777d43dec4c9a26eb4d126d544f5eab8cd86da7d2c9286 SHA512 35ba3b56f0fa150f0e355dd567081bf7d07918aee652b7b7de8c8bd7167e89552451fa0de2e2399a1d8d6f2af1da4c68c381765e7dbe9d221222f1efd9c8330c
+EBUILD eclass-manpages-20170905.ebuild 1100 BLAKE2B 629097136985fa56e320592ab1d06ab1ed8f8a5b47219ae1bf963c2a17aad02143e692ad1cca9428ee7074a2c55993739e3f10642e7d4328045336cb71281a85 SHA512 5a31e2d42aeb848d12539113e9dd03029d81fd00f690f0e2427fbea4daae2797dcc68b7bbd814a3ff9f7c2b2565ebaeedff0d6a77464b96cf3302ed52de2e339
+EBUILD eclass-manpages-20180101.ebuild 1096 BLAKE2B aced973b447c6cf79006dc72032c8c846fa1badad98cfbd3b68c958510c4d2709bd0df924fe9e193a36e7f68820e297107b177e9cfcb0f5c3e2da1234eb679cf SHA512 f42ebc82e00be6c405bdb1209ba5f0721977babd47bf6c9145f382ffbde4aea779acfdd464f91a123624f31a85f4629d3504f1cab2ed852553044d0686909328
+EBUILD eclass-manpages-20180119.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
 EBUILD eclass-manpages-99999999.ebuild 916 BLAKE2B 45211f3e2b6102ea314ad4d29b41b4f2dd0022cdec40a5c4d998efcf6dd3222d0b15f805b3d0ed964e97eb23b4e210f77efc036c3ff20ed1d10a5d03ba07808e SHA512 f282ff310f77b69c8dd48a211e1e79feb1ca6a0e269694ab8d11919a44fc1417b7de5a804b4a6c32cc9ab83a4ef25144b37d0d7e16ae67a3fa8424a62b6cc0e0
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild
index 4326190bb528..70669b936749 100644
--- a/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-20170905.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 @@ SRC_URI="https://dev.gentoo.org/~titanofold/dist/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
index 42a54f0e3d5a..3f229122b6e8 100644
--- a/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180119.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180119.ebuild
index 8c46e176e6c5..ba2852161332 100644
--- a/app-portage/eclass-manpages/eclass-manpages-20180119.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-20180119.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
 DEPEND="app-arch/xz-utils"
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 73d8db8d1e60..413b7b043f7b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,5 @@
 DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
 DIST eix-0.33.0.tar.xz 610600 BLAKE2B 484d70c3efcceebf54f2a2e0af69b701716d6c6c45aa867a8cc372b135db29bb1bf23cf0efa6d3d2a19224255113229fa30cdd40ab4d64f226eafa73991daa96 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2
-EBUILD eix-0.32.9.ebuild 2909 BLAKE2B d3deb89a93295497208deb1cb3b5448817a7ed90bde76afe83fb6e65cddf9b0d0b7c8f3c32146552df19ef364e2866d17129d31c9f06631726099f21f4fd5f60 SHA512 395fb40a7239e46267748559f0f3c40040dc3de6235a881660694e2d5802398563c24bec05dc58778353314625a91c989821984099cb5b67374116ae86811d64
-EBUILD eix-0.33.0-r1.ebuild 2815 BLAKE2B c216ebbb5cb4e9924091de42ce83169a9975ab50bb3b778a89f0ac4d11683520fef7e2c65e3dd598b6dc3bbfae20a4419d9e20c06a97d190fb99f023aecc192a SHA512 e5457520926eec4ae945566d438fb2df8766833d07c1a1cabffacce807d7e482d73e3431cf8023f454b3a36b051b220fd57edfdf86d145f33cbfcd6b834f72b8
+EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
+EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
 MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
index b51898888890..e8dd7466f598 100644
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ b/app-portage/eix/eix-0.32.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/eix/eix-0.33.0-r1.ebuild b/app-portage/eix/eix-0.33.0-r1.ebuild
index 48e3bb7a9fcd..3f61ef866261 100644
--- a/app-portage/eix/eix-0.33.0-r1.ebuild
+++ b/app-portage/eix/eix-0.33.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 68dd9bc4226e..2e250e709723 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -5,5 +5,5 @@ DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef1
 EBUILD elt-patches-20170317.ebuild 702 BLAKE2B ca4ead87686d025391adf43d12006e9fdeef59d6089b4bd2599d28dc14ecad5c3f288482dd34ab1ba0336466bec381dade42028fa5d64128d73e5dc66c8c2b3e SHA512 71ff8eb6a19d1e8e785b753587e426e64baf56ca215e2011b66fe8455fc40e6f6c8df1e3d0b037da1552ca94724fb2f29b14ea674a4e6c9d647ea3b8f16bc9eb
 EBUILD elt-patches-20170422.ebuild 825 BLAKE2B d652e8bea87970f26c4db1e26d525c4cd9700f6069e5e48f89ef2478b005cb0e3a3142a4ce0799b19a202ab4e18b5453b7d61d731095ca89f04f971b16801db7 SHA512 8c1f168c3fc9088d6d3e24be3584c44068562d59ac7e9240ba0dcabc616355efcaa22bde1bc5ba689a12ef22b669731a78236c02b4bb4adc660d31979ba6e06d
 EBUILD elt-patches-20170815.ebuild 830 BLAKE2B 027ce059f45e465dbf134ec1b17babd990166da46126bc363e6bba16527a9d9267960cbff38d38e0b6f09492f83f01d9f91396996c958ce2754c35bb39a0b52e SHA512 34e122c6c76fe755b253703a860b97168bcda892bbe1137faba5e1e06eb7aa80b821d6eee9e2f1c56945ca57031f0acba070c57c0591945cf1205def258ca87f
-EBUILD elt-patches-20170826.1.ebuild 876 BLAKE2B 30fc3d0498a1120967caa195674a9944175519b982e4180f24c63767a4802de1520eb0c53b1b01fde2ace3398e4e7173f9af185316ee69ce66b07d2808f11917 SHA512 ac77f0ef49d51df10d1d4afd3942c6a455a3a3a44a2e78eacde674b2e5337c152fc95fe800b56ff095a9fddd8f5aff7e394ee28189aa70ab461c0c9c49a74d35
+EBUILD elt-patches-20170826.1.ebuild 864 BLAKE2B 28c926ca9e9687616e8ba94527c5c86a33d96b1cf574a006fb6df5cf2c06b41c63a396431753b5fb3d1005a0762087307e3c949480a6d6e2d4049c958a8f3be7 SHA512 b7771ecff9120bd83a032f79ec9378971d97e9dfbc8c226d505a84dae14c823b60630a86f37b5011002f42cf9fa9da8fae9f959551f59020299ad7b0429c52dc
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 84ee7fc57803..8cf0f84e0634 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 31f965926493..7482bade1de9 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,6 @@
-DIST gemato-9.2.tar.gz 60217 BLAKE2B f46cb35b5ae71fe1743c7a43bfeff42a9d77517ef48dca1dd05c5c8cd569d5dcd9bdb0c0957d81d2db6b8d873099463fd6132121be04e0fd6f55bb130df48c2e SHA512 bb40abb910b528e455bdc01ed528071ca6f1390a8a5ae670692c93e6c3fc8fd7fc7e95d7321c81ad5144fc8a042676a8dac634c7b3f68e7f725edc98edd30c94
+DIST gemato-10.3.tar.gz 63279 BLAKE2B 317c98c3989399e3a87cd5452edc509da86b17ecb41d295feca4071141d3ff1ba95a86544d64c786726f2148a899c1597020dde3513a913b1bc1811e2117337e SHA512 dd2b47238ac0707984358bd763ce0dfb23d8b09561939d22aae2e60386de388af9c5e67faa89a6ab9da4f0b334ee8486eeda66e5eb83bd2a26241b8a2b88128d
 DIST gemato-9.3.tar.gz 60601 BLAKE2B d85bf5910736da2ca887567799dee1823e9be6af9b17a8f9deb84ee24bb725c3550aafffa51b15484acb7d37ddbd5996aa4175a8f307b6e3a593f8b5497822be SHA512 7f81409b3b9bd65d295cd760af5cabfc7daf257740f00015f07cd7a0cffd02a40f219b59378179b58bf53b321fb543b308457d3a8b7adcb02981562282f1f46f
-EBUILD gemato-9.2-r1.ebuild 1576 BLAKE2B 53a4d0f449757f13b456e4ecd364fd8b4ab054f14bda9fd00f9ff4774fae47c902e874ba72d76c0808bf3a5dcf392d1f2f4339c0d31fce727d3d452a9e369b23 SHA512 510cc1699b35cb234d86e41ab43f84b4b2798ccf29f0e1209e8806c5598864b7317c559f0e7ff3763ba28b6067edf1c7088d979314709bbb6233d6408536dd1b
+EBUILD gemato-10.3.ebuild 1134 BLAKE2B 6c43213eeea7d1ce522f5967a6e38281c352dad3f48b538261c710db2631d6dc6b82709d975baacfdc249f1edc045449d589441b2e9590bf195da42261800b32 SHA512 1e942c78153ba11ca054915ecbb7002420fb797ebf3bde1436c40cb1ad150733460d5a718de60d12cc4cee79d734a3aeb22bee5c6a922b0b0f7889f97ee6108a
 EBUILD gemato-9.3.ebuild 1370 BLAKE2B 0fc7416830c23b65f8fbe9e2d766fd2e52f551654cd6dd583fec60dea70f7045f2d5e859cb9fb021b62deda75d9af6a4485abf862c1ac04e06617736d759b3de SHA512 efc1627f4874ecb324c047cf31cebf04db7e14c09652a0ece6c89311fa9416693c1fa52c2f23053b31b76ba927591d0e4f3f6f1d67ac69dd1616230091fb10d1
-EBUILD gemato-9999.ebuild 1373 BLAKE2B 7e8bc4fe97e744414e52bf382707c997ffc06b6f996e622c90c6d4dc1816889b947ea775efa64f2589c4801a039c18c7fa44796b75fa063c2a250923a575817c SHA512 b7f6a5f21aa92c933dc6ab0b66b35a76949ea8daca49a2e37a87505483b820c3e54fe03db9ccbc3d32e0b722a893681193fb5f5738e0d4e6b3f2d1be700e0f62
+EBUILD gemato-9999.ebuild 1137 BLAKE2B 4652a23b73a32348fc1469f6033c5e7ddf292a98ac40c1c2ca65d4dc24a86ad878094154cbc2145bf621e2eed3abbacfe0e09ff990bf5273b7f4bdc25f230fb7 SHA512 448a7f2f9dbff6712cc72992dbc3334beec525ca6a6566ee891f9eafad8ffa786c426577be456cbdc56ef4899e5f6b6379e74eb38260373b1130e0fae4d6b227
 MISC metadata.xml 785 BLAKE2B ad8381a17cee4fee5099ca5e4312b703eae026436ec8082f272954ec0850547844923e108c02d9041beb6bfcd33bf18c846344d797f56a61170fd6b4445557c2 SHA512 86ffb0a9b39e261b35430d1055deebe8c66eb2c285211274feb793bf003296389a3bbb38ccd33d350a8bf56fcd241edcf9576305fc3aaf68cab68401ad983b83
diff --git a/app-portage/gemato/gemato-10.3.ebuild b/app-portage/gemato/gemato-10.3.ebuild
new file mode 100644
index 000000000000..80473b478f61
--- /dev/null
+++ b/app-portage/gemato/gemato-10.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy*
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gemato/gemato-9.2-r1.ebuild b/app-portage/gemato/gemato-9.2-r1.ebuild
deleted file mode 100644
index fd32f6fdd3f4..000000000000
--- a/app-portage/gemato/gemato-9.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# backports.lzma is broken with pypy
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
-
-# pyliblzma installs an incompatible 'lzma' module (fixed properly in -9999)
-# https://bugs.gentoo.org/643254
-MODULE_RDEPEND="
-	$(python_gen_cond_dep '!!dev-python/pyliblzma' python2_7)
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	portage-postsync? ( app-crypt/gentoo-keys )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use portage-postsync; then
-		exeinto /etc/portage/repo.postsync.d
-		doexe utils/repo.postsync.d/00gemato
-	fi
-}
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index ddcbd59df71b..573302e781eb 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
@@ -26,20 +26,10 @@ MODULE_RDEPEND="
 	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
 
 RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	portage-postsync? ( app-crypt/gentoo-keys )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${MODULE_RDEPEND} )"
 
 python_test() {
 	esetup.py test
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use portage-postsync; then
-		exeinto /etc/portage/repo.postsync.d
-		doexe utils/repo.postsync.d/00gemato
-	fi
-}
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
index 47270eb8635f..7b1324d90531 100644
--- a/app-portage/gentoolkit-dev/Manifest
+++ b/app-portage/gentoolkit-dev/Manifest
@@ -2,7 +2,7 @@ AUX gentoolkit-dev-0.2.8.3-tests.patch 897 BLAKE2B 6d04857c29e4e5b53a3a4189b33ff
 DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 BLAKE2B 65136a748a971688371245a5bc46d9d45689c14fdb0a772c0d2a94264cec4464c90345b9d089b855acae91db92b08b604400ada09ffb2c08f77bb3662ea952b3 SHA512 f55362e46928633598cb07640505202521e3f4bdaade1faecb4ac14ba1bee0489207cb7ab03531e06d7922446a57083365f51c63ceb8cf1e0badba9ac503c16e
 DIST gentoolkit-dev-0.3.0.tar.gz 58655 BLAKE2B 5784ed2b2c6f92f2b6bf4a0d3d4a61d2f9defe20c438d273c5a89ed7b980afec08dd70fabc787066acd2aeea4ee5fdd6127d42cc500aacd8dcbd690ff7124d63 SHA512 d15f6546cf88af0832c14eb003c72b5906bb9b9f078c903e1e444b12c2e432fd1a2fa077eda5496e222cb50cfd5a705e86044b9a1c0164ac6b4b38268461ced5
 DIST gentoolkit-dev-0.3.1.tar.gz 58472 BLAKE2B 33ad722d23abfa94fcc73dd505794cde935119aafa8ae6f2828b59e6f1e95c00dcbb751732f69327d2278751350fb2aa25e3f7c2a33cf35367b10edad5744193 SHA512 e47fa698710132914c2de6d25f7450b90383b9d6283e927221bec30be3a56de93c09e81c35e025dee2f01bd5c2f10cf231fc392c415849029529712cd81aea19
-EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1554 BLAKE2B ee8080173b53cf3d1472f7477f44236887eb8b8e01ef082b212cc717fcab15d9367a9bf792dd1abcd31c8b85bda17b2f56c000ae4b8bd5382dac2c82ee7fd26b SHA512 7d86c2ec99dcf6b1b263f4f2b4c72900e68c6ba8d3babfd910d748ef91100c55c94facd712361eb50030aedf78759ddca8f73b13518b6a1c519189ab4ae7f93f
-EBUILD gentoolkit-dev-0.3.0.ebuild 2339 BLAKE2B 5aac0fbebc551930231347c294d507f44f431714cbbfd9fc9c4eaee8f7e6eb4169f648fbf1dde2d44d17c6c8e29e29e2c483abc78b3aaed98588fcc165a8e0c9 SHA512 70d80ebb6ea489e2530ebdbda66e6696dcbfc28e7e4083de72249cbdee0992b511857b621b625fb7729b21a43b472871f51180f12c3ec8a93371b829c33538e8
-EBUILD gentoolkit-dev-0.3.1.ebuild 2414 BLAKE2B 3dbddbfd98fe5c397a009254b2ff138dd038991086488d23ed711768b1f3d825c3f8b508f9a6c822969bb6c7cea9b03254d63d8d99f035418c2197d20d658044 SHA512 9e4d4dceb99fba907f610238669e4cfbea036bb2045cf1d4a3460773d21d1b1f0a260c56fd409f5eaaa4a9a9abb80aad0e911e428a4a4ac317680d8b2b8a9ece
+EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1542 BLAKE2B 66681886ff1dede7c1c0a90718c090ab08e039c5ddad48c20b82b31d318a4acfad34a89858bb414d6e4f5c8b8e165c75878d772baf1869cb1977ebb552e6078e SHA512 1657173f37fd6da8b9c32a0a726d4290162553fcfaf1e00315070195b12900744a1e45bf70d9fd0127ff769f20f108fee12fa83e0a5a075ddf8391ab3e4f80f7
+EBUILD gentoolkit-dev-0.3.0.ebuild 2327 BLAKE2B ca3b77ac4dc3d2fc8a2504fa0d04bad98cefbdece7c7b3ede55588b6968b119dfd39fc3416a6fde1943ed4474eda7b69fd6b3e81da7e23a528e30b1b8821b311 SHA512 205b765071102ca19233c391f0a869ad1fd8ce8efd658f9240081f64d89eb7013e4bd2ae189c722bdb815a870bb3c8726dd4f541030cd7352585c007fba549f7
+EBUILD gentoolkit-dev-0.3.1.ebuild 2402 BLAKE2B 0cf6b9bed7c0479e4fb8db446a03536affc95b8f1558130d52f42eb260379f7834294d05a57b6f43de11d4d2744f28b1dd920a9f43a78b9a1ee354eabd04ee30 SHA512 20c498a38090e3598b943774752d77030b669503311e8a327d0def7706381495b004abc6fb8701383a6abfc88c04c3a6ada98ae775968e2b0b830cfc4983a4c6
 MISC metadata.xml 386 BLAKE2B 5b0d8e65ae078df17212c8ab4d23f9448609d4c5caf9a9020cf94ee332c8caf8494e66ef72c1f25c93d21f379b984ff174a846160d2657f87d36835e83207363 SHA512 6ee5dcd5f54623999f208a01cedd3e9fce88efa45e82a0d18d77f4dffa4f0ad4dc105d52221ec3c31924c895298705a5c0ec974cd59d4bbc6fabac72e60b85f0
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
index b113ef5deeb4..c03ed4457a45 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
index dd303b08c326..5c750d88b85f 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.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"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="gentoolkit-dev"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
index 3ddd92e2178b..3b4bf8aff4f1 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.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="5"
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 43d3cb532c67..eb7e6ac0c421 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,8 +1,10 @@
 DIST hackport-0.5.1.tar.gz 1390428 BLAKE2B a0791b39fe665934499fa930bda99cc3a9fe1c146ec4075985d139cac3fc49bac3fe68e37e9d26a7989e288a8e6c4c6f87dab29a4d088edb44018509f26f1fa8 SHA512 006e4457a9ebba9acff35787a73a321b903db2f6ff54423cd66e91a93390183d0ca2690e2d0c8b5c1256116c9f81cabeac45c6dcb21e537849afbb1109bd80af
 DIST hackport-0.5.2.tar.gz 1390418 BLAKE2B d9d90e86d16532a04fb387ba4d0aa3e53594ddb9c0780c1e7f05d3c1c75b60331656efbb50bd72c28b5b5736509210ab0087d7e1d441d4c8a9a8fd754538eae8 SHA512 c191421608667cde034eb8b4e3c1ae95a8ae41cc35df8f3cfad640870f871dd78711173666bee671af4efc762c069e7f20cd3693d96f64f60848d83ce185575c
 DIST hackport-0.5.3.tar.gz 1390724 BLAKE2B 666a1bbb4f5eb4abf6a5546867bbfdaf2280bcd2967773b3b57c2933f44e7a367127cd4b56c6d0cf300c3ae30bd6a066e02dd976dc962ecaa39316d70cbe937b SHA512 785a1fb9762bdd10e86f47255d687a905eb122eb46e9470b7ea562cbe98d1be882b28923d5852f41ba2481c27321de9b2322fc83b5fa77037ba9251ea5f08dcc
+DIST hackport-0.5.4.tar.gz 1390924 BLAKE2B 2fcc4ece84b813e130d860048328b7c4b704f1a37cffe15f26f24f8a9db8e7a267f083b1f8469f1d3e9753c07ad17dbbc209a2a8095770a7610fe73baf9965c1 SHA512 49593066608bf8d57678d1725c51da4f1f6213a06b1c5645d97e4a711704adc9a40c66ad4fd6a624572fc7491943874b5b48381bc02545a0e9b6d7a5619be073
 EBUILD hackport-0.5.1.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd96d354349fed3d9da342858f0ad823df8ad66e7096d6f1d05cb25e48ad67c360ccba65627eed17c70958d70f08 SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae
 EBUILD hackport-0.5.2.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd96d354349fed3d9da342858f0ad823df8ad66e7096d6f1d05cb25e48ad67c360ccba65627eed17c70958d70f08 SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae
 EBUILD hackport-0.5.3.ebuild 1251 BLAKE2B 1fd04b8a2a0978b641307a912b68c06f3b68551340262cc7a06c7bf4cdb03839cd7ea85162d688cd50074e62756fd48c24a3c8dbf6152c1e5b58b14c43f0256f SHA512 27170b43c9cf49d89ba294bed4bdb973f4a52261d79160e8795708bc406debab65b6d1911ab8bea4d8a0dd61d7343b7a71452103c8843b3973780465895d610c
+EBUILD hackport-0.5.4.ebuild 1251 BLAKE2B a6caf0eb3c04f85c621b4f994057a4f3e5c477078aad16de3d555a2a4d6a57470e7d30a57124efdb36c164c4c1c8d00d15bd0da0f505d2e4e8860a48d4146222 SHA512 7b6b4d7028f12bf55da10c0192998488a80c9af19dd8c227cba17b49958aac7d702f4e0af82052cfed9fe6c53d8601d2540c383ea1d5dbf183284e09f72d28d2
 EBUILD hackport-9999.ebuild 1364 BLAKE2B 1e83624e23cf82608e2996db2bd6022dff5bbba215702422b6a795bedae3e0cd1d471d0b427eee70d41f19061e73783a0a2e123de6eb810ae81a2f5c99c3e6d3 SHA512 e94224507ca7bbc52d2d3fbea71a760f799651c5da9d7b964427a96b6e7d911fc33d7ea6c2aee0da6b7eab177e6aeaced60cd377f8d39c1fed9fd2bde173f20e
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.4.ebuild b/app-portage/hackport/hackport-0.5.4.ebuild
new file mode 100644
index 000000000000..48ed10d066f3
--- /dev/null
+++ b/app-portage/hackport/hackport-0.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 5166ee03ccbd..273ae71ac0d7 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,9 +6,9 @@ DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bcc
 DIST portage-utils-0.63.tar.xz 529012 BLAKE2B 25ecf32a6a64484af5d3c73c2a9482b379ba420260de159b59a17ebd864b0ff49fcaa248db1e7d9a9c9582655ed6d4cb7a3e413212247890167b37c4275d201a SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb
 DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
 DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e2ac56d84b7271dac127e6be64b13bc0168a7ed256b782b0e844720e536076fe7a7df3ec04a862c85b2501110de2d11 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056
-EBUILD portage-utils-0.62.ebuild 2255 BLAKE2B a3be98929fe9296589a83d2f792f75e49dfde531812dc0a9014f70639f491ea7413c0a431277550eff93a6e39182a48e167c17df931b6a601d99bae9ee3c26ca SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e
-EBUILD portage-utils-0.63.ebuild 1202 BLAKE2B c28e97f00000b2e8a3ebdf6dec67e3d4108f1248d28bb35fd4eaaa328d7907d30af0bc0f213453f8edc5e492e3496772991d346086297034b0ec48e375bec8a6 SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad
-EBUILD portage-utils-0.64-r1.ebuild 1168 BLAKE2B 376b7cdcc741c07c97f8ce15dcdf51726797adda17ec1303fbdcc14026d2a86f8f04c97ba635651023576ebbd9e916642a134bdc6eeda818ca1ee8edfa30427d SHA512 e133f55951a45a8fb077c75806ee362cf46be8ee92dc6eac443d3438451bd3f4d11049d265d47410168625f3d78e87980e72a3cefdbfaa61f0f02c6e498e7bfd
-EBUILD portage-utils-0.64.ebuild 1090 BLAKE2B 044843c25a21c9a722b13e0bfff84839fe489801490d94190169fea2c8fafdcabe7c5eefe1b924b0d313d00a33f929a72e8ddb8dfd44a36ffd8cbb7d2f06dbb2 SHA512 022ed59527c945db427a97e9eb5c301730c501c8170dd3a786b8f762b474068fd456a80b70d6842044e1a1e01c9ec3032ac0e8df5d781d36355901cc0246eebf
-EBUILD portage-utils-0.65.ebuild 1104 BLAKE2B 49c1e5dc1e6bf1d5673215efd7638753b8a8be88f3f1dbe6438380a20b59d15d76dbb07f398945fba9493ed2d4cf0f2bb3b4338f782ff5b64a27a49c9dd907a6 SHA512 5086493fbb6b79e46ff6cec5c397533bea4f8763a2dc5ff95a9a2396bdcdf757cba4d3e8a581ee60d101d598ed519c2bade7d8ead0da3433caeff2a31878fa77
+EBUILD portage-utils-0.62.ebuild 2243 BLAKE2B 383eb4fa9791b2f9f99b6a71004a410342b1751b5e987f698f8a70df90fa1186ed6f91050788cfb68f983df5fece3be98da5b65cd7aa62678f1b534554e09736 SHA512 b6f941532e77f9670b7ccfcfb2fa8ef039335e88ccaeb6d32370aab032674435e1acfbc633a22ce98f736626351df77d8e2ee9bf6e5bdb37f0c6427c4fdc317b
+EBUILD portage-utils-0.63.ebuild 1190 BLAKE2B bc78f2a5ec957e2bb6a60f9377028579ca6fffffd4b46803d977dc463ea3e4dace74de224e5d88262a92e46b81882c6ded1bdb38595a5cbdf62ba4754bae5e3c SHA512 dcc3384a68e6f44066eb9eaa35909cca3076724939d38800d8a3290354dcf11809c19274605acf5f88423418ec76b9a0e8b7e1dcce2b19ef8f1e61f1dbab3a0f
+EBUILD portage-utils-0.64-r1.ebuild 1156 BLAKE2B f48b8b7f8022efc4139a3fef3e4972bc60bae01d1fe1406ed9fe28ed2ec57c0a3474be929f98d70fc0e063f5a9cd9bea5ae4b5427e54ba75fa1ed4e8fdbfb33d SHA512 f844f217e2e3c516813c53b1193af4f81c91c574a4bd29dacc66eb39eca52a4f63c94c607b191ff8285ef659f5fa353115271f01744106ee7030909533645f56
+EBUILD portage-utils-0.64.ebuild 1078 BLAKE2B 85f7cc3f046e2e35099b7bdb839fc6411ead2b6c6fea20a53a6416bc25b04ba679fff1a5b207a10783fad3cfb43953882a6257f29212514d740c7aa11de7c34e SHA512 1ddb384e1567a2173d8702ddef1c3469aac0ad1a4f6298a2c38b1d8716117b317249691ca0015489ea337e75271f560d53477b32583ee163b477474ffbbce54d
+EBUILD portage-utils-0.65.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
index ede0015835af..41f25c46ca28 100644
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.62.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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.63.ebuild b/app-portage/portage-utils/portage-utils-0.63.ebuild
index 7cb197753ca9..02488936420e 100644
--- a/app-portage/portage-utils/portage-utils-0.63.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.63.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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
index 43a1f4df9846..d85fe56221cf 100644
--- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64-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="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index a8fc399937e4..3f0acfc8e9f1 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.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/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.65.ebuild b/app-portage/portage-utils/portage-utils-0.65.ebuild
index 1de1a41fe743..300ced4574a3 100644
--- a/app-portage/portage-utils/portage-utils-0.65.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.65.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://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index ab60982c44d3..a38f2f03e59c 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -4,9 +4,9 @@ DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e
 DIST repoman-2.3.3.tar.bz2 78045 BLAKE2B 5c2e770af3ba0c93ce24c710fb32e8b9d937ad8dcb75cdd6461721163d012937c14745f248543bd2dafe154b649100aba1cb626c0de3bb47294d053bb19bd3a8 SHA512 17212c19b14817a8a004619dd56ad557457d45919da45edfb27538304e68187fe1104f0b6ccc2b29fa1709645a7a82c75676b118b20d79dc790b0eb2ebf5a2ce
 DIST repoman-2.3.4.tar.bz2 78764 BLAKE2B 0fb6bd75463fe10dd41ab1fcdfd0857341dbe973e796f2f97e636df2c29dd633d7199eb22b4605b34d6e56624ac5a75f4783ff7119c421e2303aacf7adae4877 SHA512 1a434eea6361cc06ba3c27ccd31aa02875af1a577860490f8de666b0160370f09d1c46cea95d577163845e12c5672486b176c0009c32e735e16752d67bf4d96c
 DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
-EBUILD repoman-2.3.0-r1.ebuild 2524 BLAKE2B 1f7bc0e22ba4b91ef78d5bdc9025b50ab52753818d6139fa1778dcd6bbd0ec66bafb14f3dc1daf04df35e2a7acf8e28b22f570bd37a7b8bfaf06684406e7fe5d SHA512 4fd4259a8160ea50677dbf7dd790fcd158dd48986e5ba60e6fd45db17d69e70f0a296e5b04f7a4199f1641364a558395723686763787117a0460c4837b89c0d7
-EBUILD repoman-2.3.3.ebuild 2320 BLAKE2B 17edf0e2cc03b93badba0c3d1b6f95892a1455a320df55da0e1c43d6cabf27f7649e49017c54f6b541f5b351cb7875ed17f470b18f9cc63987e4b43ed84cdbcf SHA512 30b61a3a5c12b53fa0edd7d8bf64a4ba082611e04cee2966661b2cabd4d52ae81430801fa18833ed9fb85183cf015c3d20ff416ce0a8ada0243f5c2e2838bccc
-EBUILD repoman-2.3.4.ebuild 1911 BLAKE2B 29114df2e203c4de818eecbf3788b61b38d7aa079d881df8a078af18963e720e0289d3e13d1254a38b80665e4eaa7c67ac8477bee47dff24efda9826f5019f19 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5
-EBUILD repoman-2.3.6.ebuild 1859 BLAKE2B 2beafce84b529689c427e424dffec21e9039649bbc26869b64d0ce28a2f8da4d82d497bf0fb19c6e858b56e8593a33ebcdc71cf5f08469e968295bfd74004099 SHA512 03c897dda8080fe6cafba1ca4795de6e9149a9025d6451dd574efc5f33dc5d1b46d062765dd0d783128b0eaa5b3f1a81e51d1f3b013eb2b88817161bc86961c3
-EBUILD repoman-9999.ebuild 1911 BLAKE2B 29114df2e203c4de818eecbf3788b61b38d7aa079d881df8a078af18963e720e0289d3e13d1254a38b80665e4eaa7c67ac8477bee47dff24efda9826f5019f19 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5
+EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0
+EBUILD repoman-2.3.3.ebuild 2308 BLAKE2B 3137f513fa55c654bc92dd7aedb363ce6e40f1c873923df80a836113fb60ffc387c73605fd5367246634c01e14fe63a52f88949c1949164c3e91fcd8434f449a SHA512 e69402b9ab7776b06b872f3ddfa9a8c62411119ed656bebc572494c964a973ce3906b738e307e3d200e053e7f8b8c7e21ff928457b24623031b4e8b3e156b9c4
+EBUILD repoman-2.3.4.ebuild 1899 BLAKE2B 1dd1adc861a1c22dc4adb3e9fdb4020bbc6f7fb5f6d4d3d325290033bb355afd3bbb4658d6211dd947bb54fdcef3e72677fa35075f8b2338d9042723de289183 SHA512 7ee0da85857483d03cc4ae36539e04d812a40ea771624ac64102217aef868ef4a73ed704ddfe7066a029b03f6cb9c577d3fb458fecc2c5b89cd2fafab0b9bce3
+EBUILD repoman-2.3.6.ebuild 1855 BLAKE2B 2eceec77e8be46b8ca80e504d65e50fd82e0877b0cd9e5c499c92472cd3604c9d8e0cd292662ccaad78194e25a2c8d71594bb2166378b127d8a5211cd7bc3ca3 SHA512 8282e8bdb464ed55c0fa40ace859e02392fcb671a63f6605ff44acd63a61cea94dc90df491120d68d75d79f6a41887200a19208bdd8f1c6d7cb2c8096a697a59
+EBUILD repoman-9999.ebuild 1899 BLAKE2B 1dd1adc861a1c22dc4adb3e9fdb4020bbc6f7fb5f6d4d3d325290033bb355afd3bbb4658d6211dd947bb54fdcef3e72677fa35075f8b2338d9042723de289183 SHA512 7ee0da85857483d03cc4ae36539e04d812a40ea771624ac64102217aef868ef4a73ed704ddfe7066a029b03f6cb9c577d3fb458fecc2c5b89cd2fafab0b9bce3
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
index 754b1c0e3461..b2fb3350b5f8 100644
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ b/app-portage/repoman/repoman-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=5
@@ -16,7 +16,7 @@ DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
index fe87e427fefa..48a87eaab631 100644
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ b/app-portage/repoman/repoman-2.3.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.4.ebuild b/app-portage/repoman/repoman-2.3.4.ebuild
index a5a60b0ee04b..fe4db4aac408 100644
--- a/app-portage/repoman/repoman-2.3.4.ebuild
+++ b/app-portage/repoman/repoman-2.3.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
index af99f99a4bcc..71546b4cc345 100644
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ b/app-portage/repoman/repoman-2.3.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index a5a60b0ee04b..fe4db4aac408 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 6960cec15d44..3c0fe436b660 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.4.tar.gz 23397 BLAKE2B dc6efaf866b059567d11c2a91929b025e74f73ae5ad81a98a632c3b2393025e2e35320ed223ae84b28a8770c713536afe73289d66f7c1396118a975867a56161 SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 EBUILD tatt-0.4.ebuild 837 BLAKE2B ed3e6b5953fe0f5276336d2ce7d1e809220b56bd1a5bd9005041145879702b96c7540114790962e7d3bc5361a919ef2da5d6990ad0808cbcc0b63e8d11f5e1b8 SHA512 61bb3f55c1c2dc18ac9549decd4257d14a2d7c500868843974c3fe6e5f05fce4550f4e2b364efb355f31f78c53b3fad830051c444b179ac3fb9c79cfdfe2a7d3
-EBUILD tatt-0.5.ebuild 838 BLAKE2B 3c1a9b2d0e4e87dcd7c97629007483a14cb6d2c4d4f9c3625a0da81de22315b92d233035f2c97a3bd9992026f1fbfdf32c1346e9d9a92e208c36d6b65a9865a7 SHA512 a6942c6076c9d0a25fc0dd006f7b17f97f5070269b68d0f7a2a70f49e7ccb6d9310e9e78371eb251f2a4dea82208b590d8b18c1aaab6280562ec259d827f2cda
+EBUILD tatt-0.5.ebuild 836 BLAKE2B 8a25cb4385c06a1f1f380d7c6c30bbea7a1680aa7a61c10026645fef71f4178be4b42b95028e9912701c6ddbaa08dd9958cef72a96c325b81b8fe9d81ad74c75 SHA512 fe8103af64462291cbcda3e6b18d7e271febece1bf110f0e35837fdc592f86a5488a2596caa873e854cc1e3d6493cb3b4468034aa67e044242190a31f70479bc
 EBUILD tatt-9999.ebuild 750 BLAKE2B b7f6bfb81ebd1aa9fcf824b772f9e7a8dbbe540b4c2d838f4a24d4633502d18009ff3eb7f0141004e3908334df91fbd63b4e333a8a31910408597e0fe198360d SHA512 f2ba4af09dc1f83010883ac4d58790b38ad48fda09ee8b58b16b2eef8b428e5308ecf6c317c15b0a8934bd2deff3fe9834133d78932aa6ade4dd64deb13fd746
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 2043abb30acd..0971d8130bdb 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.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/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 5f5a8fdd4ff0..2aae82ecfec5 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,6 +1,6 @@
 DIST ufed-0.91.tar.bz2 61466 BLAKE2B 63671c875f7dae13a6e76995204a278703691ed3c081a95853a6cbd9a57d1f88cf1c7625f1d524bfc1a816f1344282577126865160e0433cf6692d8067596f59 SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35
 DIST ufed-0.92.tar.bz2 61606 BLAKE2B b01c409d5852d59a3237748bff49348a2eab386d06c55389d5eee54ad1002575d67ab5138334e99ed2da434a8af05862d769fdf7e692bee2e77bd9c41b793762 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408
-EBUILD ufed-0.91.ebuild 1010 BLAKE2B 1bee3652ff02bee567dc809992566736641fc10b9e3c49a8b8c73305b85f3ccffcbef1609888d85e826aed8c8cdb6cac2da55cd760fedb8dfb8ef5660ab0b90b SHA512 58d77734677556264fb712254ff9b481100e6e387dbee79bc0da012a0e00e491a11083814ee6312547a125d5ca7b18d12e523668533a1391ac389a80c16d820c
-EBUILD ufed-0.92.ebuild 1013 BLAKE2B 7bd32f69b88ea6e36a175111dea7adc00e79203d5a60d4c052282816a9f60b430e0a5768ba44b61f78bcaa551d426d9297fb2ae8b89dffac085f9814e591cd24 SHA512 4a2b6ef3a0c912401058e3a063726b661a27c28cc5e4b908be49f21d66b984748c1f303ba5007950fa4e37d09b4b4cdca066952283d066939d63d552fbf00b34
-EBUILD ufed-9999.ebuild 704 BLAKE2B 90a98673258b3ef91754ab282b4883b613f6ffb768771dfeb0f171806bf4e74d8a98314269a3d277dcf5006f3cc49b34d4b4abb1eebaedf39229b769291c0ee1 SHA512 5734703cd8c31e58caf7a6a8cbe2b7f294e3fcfa6d9409bf3b2d68f5e2256af471f4c6548693b6637537124a9817e62fd868c010ea8219a6f693376de5b80773
+EBUILD ufed-0.91.ebuild 1020 BLAKE2B 5d4b06638b51bcdf2f08821fda1aaf2be8cd63e7193089860235be67e3a2d987369b055465fa6e7db0429cb58d850026de553a9dffb68dbcb80930195d553380 SHA512 a009ee56787d3c800bceb2f292ab2971f560ea60ece2d08da8a285589ddb4b3782a1790241d8c99b839d4fbfd303458753d6989580e40f5d465df7820f459d11
+EBUILD ufed-0.92.ebuild 1023 BLAKE2B 76a992c76f7b596bef0daa187a04a90aed8d9d2545453a55ed52b4ac933ecad5cc62af38507dc9f16e3706b68a7eb3f753687077b51c7ab83c04df4eb9ed4729 SHA512 d5404f6348a9baeab928961743c4ef32795c95235044432ba1bacd9eb0f37598eac0568e6b87d43911f775b12fc05a5ab0a5199ec623359d78f15818dd0dfd78
+EBUILD ufed-9999.ebuild 714 BLAKE2B 8f61d1cbf96e6cc33808eba3517f92a28f64cfa5369a6392ebbbb70fb157b483915a07a03631203a5222d8c7f942a4be0124e5e378d95885b6f297c844103694 SHA512 ff9611854a518be33df2b340235d33ae3ecc7675e08c97debeb87ac8d699e2346aa1c6911d1400343f17dfe297f29993c6001401f5ea3fe61016abfedc720c60
 MISC metadata.xml 554 BLAKE2B ebc37249c1f497fdcd7d2e56fd664c8bfcccfa88253e1e5d850e19ef120cd7eedb8c980bc3b33025d145eff4980d05b5f55955f502f311326fbdb6fe5808522d SHA512 11e52225e9e30a00bd9c2ed14b5fa28cec85d20fea90384822ba46794b831e1b189f867546f19a5ca4c6a1a2ca8b1d73e20b4b2a3878b455c6511332323b689d
diff --git a/app-portage/ufed/ufed-0.91.ebuild b/app-portage/ufed/ufed-0.91.ebuild
index 7cf7b8704dbf..918b9d05bfc2 100644
--- a/app-portage/ufed/ufed-0.91.ebuild
+++ b/app-portage/ufed/ufed-0.91.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit base eutils multilib autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
 
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 5d0997e86d74..439c65b2bb97 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils multilib autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
 
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index 5946596356fe..6ab99b399c04 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils multilib git-r3 autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
 SRC_URI=""
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3b5fcce3522e..081594cd7124 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 2ddaac9fc893..3c9fdd254d82 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162
 DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82a6a575b05118099b609da12bf2e369637be907cba1d46e1e33fface482ebd7c63d70d56c948e45ef71725780ffb2171 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627
 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 3173 BLAKE2B d12832478452f9bd1a003f649c707906141bfec5a0c24b9c50c924b5c79fb7fa3eb369d1962cb693fe3e703bf6779e4fd67ddd9180aa14a2806e5577dac5c4fa SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce
-EBUILD bash-completion-2.7-r2.ebuild 3931 BLAKE2B fad5fb755b1e04d57bd2294c51ebff09b2b0dd1635a45cf57ad09df1280a08c5b03d4ad108a8ca6123a4443d585cb3fea2ca5738c334da1a610093cb0346ad98 SHA512 9c82cca0699f4f79b460218dc9afd350760d842b375c2178d592effd84992e2332d7c33c37ba54bd0299ffc0df398449a80a6213cbc41c0b1f8366aa1d730cf2
+EBUILD bash-completion-2.4-r1.ebuild 3161 BLAKE2B 0c3b185bb625c951f47fb9571695ac67900d67868a0bab27d1a80cb15a31e997422fa8e43677f4d68c6644e10f502c25fad166e1ad1257696c9795bcdc2967c0 SHA512 2d6366a7609d3fab9a423fac06e2c78957f079c37a9c69d9694dac6f70ed50d4234b14f4fb54dda303ef916ec6f92402179b6bb2830208d83e6c5e98bacfb693
+EBUILD bash-completion-2.7-r2.ebuild 3919 BLAKE2B 31c2303a5677e4b4170271383d9ae2f4eed90e7ad686e5f36372ec46f14365167e863dcf9d2465832b0d092b89d43d61909ba08426666d0aa9c9a77b9aa882ef SHA512 99a4b6f6c0ec34c2db9a31fa97e6afbea4ec45d45b4521b0d8b583154767828f38df7b1ba8885ae23e7f33b6f3f9e7d3e325a961410be3de529fe3057fe9bd51
 EBUILD bash-completion-9999.ebuild 3910 BLAKE2B 460f3a1a5bf4cfd9263bda21ea0a3e1ababb3880907b2e6e4c5a19e7f00823a33b6455d1f808f0ec1f3d9a94efbfe30065dcc1dbaede2a57ce13db19c26b2ebc SHA512 618c22f57fce51fc1218002d79ac5159e2820f68ab015a6345708e62546463f5866d4b2f0f8d30cc612499461dc3cc766b2827f359f70f5976add9ee91f8419c
 MISC metadata.xml 1285 BLAKE2B 67ec44c85388b85802294201046537898af798f98bb3ffac39fcf9720a5aacad33aaa5bbbcd56e6f9ea1826c97f70c990810b4e04fbaeedb95f296f8c0838a1d SHA512 1bdcc390d3e58fbd70506738f281a165a9bad69d14be9774b7ae75deac54c5a1bdf6170a16d8ac817ecd15dd4ac820b3e861e208b1d80a9b5739b0d41a9e1e03
diff --git a/app-shells/bash-completion/bash-completion-2.4-r1.ebuild b/app-shells/bash-completion/bash-completion-2.4-r1.ebuild
index cf649cac408a..5b1db28a22c1 100644
--- a/app-shells/bash-completion/bash-completion-2.4-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.4-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
@@ -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 ~sparc-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=""
 
 RDEPEND=">=app-shells/bash-4.3_p30-r1
diff --git a/app-shells/bash-completion/bash-completion-2.7-r2.ebuild b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild
index 9509c019a0bb..7dc8c87f2ac9 100644
--- a/app-shells/bash-completion/bash-completion-2.7-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r2.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 ~sparc-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/bash/Manifest b/app-shells/bash/Manifest
index 73851e2b1d62..dbea481dd3b1 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -350,15 +350,15 @@ DIST bash44-009 3117 BLAKE2B 1921a30e1f7c6d37cac048772f89322e2cfe6e77f3ec48d4a6b
 DIST bash44-010 1670 BLAKE2B 6e0cab685ae2393a9ae7eeb91767f8ce3086e3921f2d69614e729e9bc26603b363a69083c57a43aa53669491deba663bd8c9de91571833312cc23efb05c43222 SHA512 54ff556b62fd88381e7a495db50957b016474973b3a566661c65b649a40960f2d3355221b3a71fb292128aad92a45d73d9816d63833bc416b4d15acdef391b98
 DIST bash44-011 1603 BLAKE2B 6bd978408140620c2d63277757c15bfe55d6b0ff5706b7b884b234308efb6cfa771888306840ce5cfd4ece5912924dbb6a321d823fa106c99ba573f47dbbb9ae SHA512 6b5b068b74978fc691749ccff5e094c768047f702430e97114f5bf342f078696f7d7616d0642d4061b062e9112dfe00a1c2309c65de4147e0e98fb52c593d844
 DIST bash44-012 5768 BLAKE2B 63c6f5ff2cf52a35e1bd7f0028d7cce5c2c87e65ca600d8d85bf9b197ac8dee16bed5dc1dba6b354ef560309022cfd427a08180b76effe4107b9dda2ed99b20e SHA512 4661c4c132f2ea7c9a70368301041c482d5820d8389334a7e3ae44c36fc16c171b20db2f194b7663c84d6c3dcef81aa90f050a48e205218fc7bd3395d09c6a51
-EBUILD bash-2.05b_p13.ebuild 4625 BLAKE2B 3c473c1d3e178b11a71a9df388c5722000a1b09265af4649b1532bfd800a609a36b6603a7d8b55ff80973d9ce667452db8c536f4de39f663f30023fa893dc98a SHA512 ad8ad8bf9dde3a8a4ee4947a6a30873eeb4a59ef8c98de5b0e43c4b9d12196b10e07ceda854b3173cc025bfeddafa78e0edb594f4ba8f14003451a566cdd88f6
-EBUILD bash-3.0_p22.ebuild 4758 BLAKE2B 15b5a44fae3128b60688f3f272b9c66503a0047fd28386c8e46d082072f60e4155bd6098f5e86c53c9618451e35581d9418ded1721ad65a72dd49a0f57af17bd SHA512 54201c4f0cb83962cdd89e0dd53ff768e6838e4ea3c1eb70d402c316a24ee5b87a5f89a7c9b92cffc9508f838b8f466b3865922fa5859628a53d86aa1e3a33d6
-EBUILD bash-3.1_p23.ebuild 4439 BLAKE2B bd6cc799e65bb2d3317f6c4fb0c9c5ff805a9ad97f03e73a8c1b4430122b7da411037e85e3a6f2d50f6807e9a1c8d9578d3e8bd716ae4504608598c50aaf1b6e SHA512 69f5c71acb1e03a0096ae6fc6c9ced6cf4f63b51bc1f4f3af966213987fe0f6da6f97fc78a0b310e216db2a503456e84024123c35fc6d02abf042b86a179135a
-EBUILD bash-3.2_p57.ebuild 4546 BLAKE2B df9f3addd157104a766bbf1cc3814c480d4b7bf6617c7017a72a3cf5bdd103987a5a20469d05a8b24e093c36379239e92ddbb241ce664b410abf104a103e4936 SHA512 4af8e67a6b1407924ea2ab69e095656ddb0551ace845832b15632930b4485b9809e8f3f238a66bf4830b93a10935fb02aca06f708aacc6e4f89d9729f0b0b815
-EBUILD bash-4.0_p44.ebuild 4420 BLAKE2B c9dbfa833d18b947ae215e866df93c380bf2ab95e8e3002be0bdd60a546f543fdda3637b842bdb41767713bd44b23e465293e0345aa7f9f55fd2795012c38b33 SHA512 54091d257ec24723c187f2d8cfd3d7c23f4f22308067445eb6753bee018c1a2d0dedf5529778a451dad28f47e0ed12b456a22e91c773f4ad212d7a700d6c13ba
-EBUILD bash-4.1_p17.ebuild 4154 BLAKE2B a8ff6552229406e76b6a9b49f3675630a3910b9a1ff42a090354417db1dcc0ad6b893586ab8696d4dfb809a887effa5b13581967cc36bbbcdf4c911a9acfd23c SHA512 2b9d6359831b8a053c13f949473025f3702705f1e409d42ced0304ee73f5a9fdbd218760820a10a45281c00f289f48b7f750f9a96ccefca726363bd853d0baaa
-EBUILD bash-4.2_p53.ebuild 4356 BLAKE2B 1043056eed9633f3eca86a89e4ebc595ad7f59f057638088a7e56929d22a4aeb48a410660ecda72ffd5ec43921c067b783bbd8dd2dac4b80b99f03604292e729 SHA512 1bf922d25ededa1ba9f809f1281c0276a220e4f5f1265caddc6a2f095ec9f62f6026b8a9df93002891eeec6252c8943437940fcd08c61543261dbccb523609d2
+EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
+EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
+EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
+EBUILD bash-3.2_p57.ebuild 4534 BLAKE2B e1a52abe31b056271064462cbfd95b00d469292a9cf19d20c582196122ad27c11b35b45d9037f2ffb6259af6059fd4eb18b4b1ae96df0f544c320dabbbc9e90c SHA512 6b36f66125d94e8de15d8cb0408652d2cedae02bb0a3af1f8f1c007bd088532daa19d2aaf6359df38b677cd8a13c5e0b439c787f1fe63bf6572eaae121151472
+EBUILD bash-4.0_p44.ebuild 4408 BLAKE2B 13955f4505ba051f1880ce023f2f12e9531433473463c717099f66b1cfb103381d9ffdd6f6948a2e05875445f4e2a43b09f0053066829e71d53bdaf55f37fa89 SHA512 c50783ef42181a245900a7df3578a75b47af48b0e48d5478d6739be48c2487b6d8de866b0e7f26cae18e67aac6f4e8aa6b54da77c22f61ce43a8e79cca296257
+EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e3217346511b3b70e6fc55b6e697c4991e3f505420eb295da5d973b4faceb7edbfca03b91c278bf01b7464602 SHA512 e5f5e135c543aa5dfac81936b1b25e9894aa62918c01214f48abc6a4d1d1251fda8be3566164d324b8644822745f634dd7e4265805d276be822fc190fe2e8146
+EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p39_pre0.ebuild 3581 BLAKE2B 51c88610e9a35420efa938d7bcedc09005a7c86cf5fe45a671607a89e517442f8316667f7883ef87bc5671ed1898097bbc4fd3d5e2d4baa515601cddf8abc8b3 SHA512 f41cf7c82dc1316f61e132a2b29a2e4ac5b7a20f3856b69d51d39a18723c7e4713fec3654331d8bf4425f84d8d43408834d4e63934f7369232d87ce12156d2a2
-EBUILD bash-4.3_p48-r1.ebuild 7260 BLAKE2B 82316e5db3a371f6856b0a22020b34842bf6d5313a0391d21e009c98381464c901638f7247a9eb38d72452c29f996629b3c8b4b53f894cba54b0d375b5f77aed SHA512 7b15ebc166dd814164deddd0821650b4d66e77ce35ee0d3d57682c1b404be4f7ed9437af1fd6bf58696849bd5e9d23d6d92701f44bed2d09362dc3aa3a2b715a
-EBUILD bash-4.4_p12-r1.ebuild 7234 BLAKE2B a51bf6dd560d28f9a728581649b6e1e67455b70de6b35adcee1b54f8bb9323ae9e62d072b0947f9d28e375fd2e0b80ee346e37a7e2c7a137bb7150fe585c4d72 SHA512 0b1b27ab481b77bff2ae1a652b27474dba0599d8208b7c75bb0191bba8dc347fa6c082024014ed965628ff9b0bfc46b0fbb4ee3f7f9f25e8037b6a44b6243455
-EBUILD bash-4.4_p12.ebuild 7178 BLAKE2B 0ac21583041940a5b2f4bab801b9a497d9830092c8f3cbd850bc6518e7fe2e4281a374a101cf6f2eabf003bca78c851735b780dde79ac5bc2db0001985440afe SHA512 ccbfa406cffa505d90ab3abb16c5106b32e80bca45f58e62c323046bbaa7d3ee6fe3dd0bb55e3161a3e33279a0d5bbfb3afcb9cdd1279bb24ed9c09fd531509d
+EBUILD bash-4.3_p48-r1.ebuild 7248 BLAKE2B 3a8e835dd559ddb5495ce716ee869e279276502f8f0128732e59ab14e89f3860cf65dd68e5d1125ecdbbcaf3fc6d128f24a78a0fcf7e98b1bdfbd73757c420f6 SHA512 b60301a8e2d14f4f7ecc85d12e17d62f0b5ee8b1b8753a4dd17dc2b818eb424521f34cd48bd5335b6108392ac56aa62cd12e8d65070ae8bb5ca6b090000ad13a
+EBUILD bash-4.4_p12-r1.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
+EBUILD bash-4.4_p12.ebuild 7166 BLAKE2B ced88ff95f990cd927250eb679a2fa1ef133013c21e4672fea96aa367f394eb7bdc7cfe73cea94fdefdc181138ee5705b0373e92bafb220dbff3fc65637840b7 SHA512 4723c35bd701194fc09f3deceac0406b145b5ba77c7ba565d3ec5553fc82cf7829ee742b5808144e10c838894496163f1c9499307d890359fa34e172e3be7f2b
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index 0b439580aba4..f71b3095d371 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index ce4e366ddc5f..f151644345e3 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 5603d7906e32..0c59e126c8cb 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 3ac94d42b261..45b87b1ccdcd 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 85a6795b76ae..81a46b777c87 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index bff7e9f4c93a..3f7e9351c247 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index c31082b16347..5f2b94134fba 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.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="4"
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.3_p48-r1.ebuild b/app-shells/bash/bash-4.3_p48-r1.ebuild
index 662883784b26..8de4b6e1701f 100644
--- a/app-shells/bash/bash-4.3_p48-r1.ebuild
+++ b/app-shells/bash/bash-4.3_p48-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="5"
@@ -37,7 +37,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0=
diff --git a/app-shells/bash/bash-4.4_p12-r1.ebuild b/app-shells/bash/bash-4.4_p12-r1.ebuild
index 5e54bf0070ba..c11c5b32237a 100644
--- a/app-shells/bash/bash-4.4_p12-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p12-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-4.4_p12.ebuild b/app-shells/bash/bash-4.4_p12.ebuild
index cbd335026695..4cb9686217a8 100644
--- a/app-shells/bash/bash-4.4_p12.ebuild
+++ b/app-shells/bash/bash-4.4_p12.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0=
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 1ea15774b7b5..2c3a90c86920 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 2154 BLAKE2B 9ebafcfcf385a65f5625d146cf9ac5a0f4eff22c72ac8f5d89b18212421b304155bb5698fc986405d018fa876a9254acb16274779e49a4874833bd7139803c57 SHA512 ed434be9798716d1ff0ddcd3a03e67d8c85c29d2cce0b1d1b8f99d33f71404104fac68def38ef1ae94a0d516110daab2eb379eae47c7f514d468ad62556f3600
+EBUILD fish-2.7.1.ebuild 2159 BLAKE2B ded9a6da71c070afbc573024e45b1cfdbade653eebd9d1e6432958856ac58d5ffe413371e00e7c6858fb5742ef1ec1af13ee4d6bc5eb2d9668bae93ba80c37dc SHA512 aa9ac9b7d2cd622a21eb70f68b2ce9d78a6f659696eedf1a84b26b8804c25978c19183e5acad3b7b636aa514cc186e6e61c3bb2743dd7f50375bd94d37470735
 MISC metadata.xml 509 BLAKE2B e9b5650b9025866fd55d32c5f8e61eef8c7297c72599168cfdccbb7944106489e8be39b26bd711e2ebab7858ab848b19693b72becd3710551654c9d3202f2e8f SHA512 b4ba8bf04d8814847af718f64bfc59e79f6146f2841da5b8e9d1854caa9d72526cca85d2235483970656f5d78a9bcaba2d636b91ef6406f6f6a32a9fee3c312f
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index c2a3ea0e6f17..a26d81c57d99 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.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/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_* ]] || \
-KEYWORDS="~amd64 ~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 ~x86-macos ~x86-solaris"
 IUSE="nls test"
 
 RDEPEND="
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 529a32264813..5c00bdd198be 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -2,7 +2,7 @@ AUX gentoo-bashcomp-20101217-make_globals.patch 312 BLAKE2B f925ccb9d618200d4922
 DIST gentoo-bashcomp-20101217.tar.bz2 23095 BLAKE2B a98757ad29d1356976f4196153f0b4a7763c96a9c4f8aae63fc563b52a9944d86c5098efa5ea1a7c4954cf331ae11fb7b1d8e74ad82998a49652eeb195d1af65 SHA512 29c4802b8f71585b7146e454f44700954de8655aa46dda7046338ed46e1e9835f4ea4141cfd5a813a5f75b6586b030e0e0cbde4c8030ec303f98110fa7a5e316
 DIST gentoo-bashcomp-20121024.tar.bz2 28025 BLAKE2B 470f844707d31e2eb6af8ad34695960406e494eb81018675460e15def43c26979d73e3fa300283da1c40fee96039bcdac59ca3ce1f826db8362fca7929cb986e SHA512 ca755de801b8ecba6267395930024cbd6eb7f3f78c08de5caff6621bcf99554b68f8d3bb93f517f6a7fe27b08c42c8896910b0b93f8917db6e0172bfd614bacd
 DIST gentoo-bashcomp-20140911.tar.bz2 30258 BLAKE2B c41814a51b74b169dc0e92e4af0630a152145f9d8fd81afb29c5c6e28d9c80caf3a57450a02a7f653762a0c91c8e1639f101e7749761b68e75482dad8e303467 SHA512 cacd1c3353bce7e67d00758a714829860111932ab7addd0a84a06cae9218ff18aff4ea562e0682ca4db859408ca15817edd81548d54144223ed5016667549f7f
-EBUILD gentoo-bashcomp-20101217-r1.ebuild 1411 BLAKE2B dbf163e43088b935f530cfef78038929eb8c0e75e76e35bb10a735f82bd276f3ea788fab8e9ab914f981061ee861ebfd1b1fda7ee15a104ace1580157d4b016d SHA512 799fd62b1fba1f8a20ce92b3b754bc13ab709a50a6e28ab19a5469248f6a5ec9543421c2871b2c31a63758a0e3dc07a214dfaa0e0cc6b36517396435497130b7
-EBUILD gentoo-bashcomp-20121024.ebuild 1312 BLAKE2B 66978968a8432900dbcec13d0ee44243138a723651cb52b186d3383aa0780980feae7c93e7c4fc4883f65d4daec6151efd91cc3264ffc627a131527b95ad7bab SHA512 231c9d39eb88721cc79286c9c8f15a64e5ece68adadad634967f3e1d2acdd465253e675a7a875b00167984b5fff883b7ad893537f9a546009b7cffad0bfefd3e
-EBUILD gentoo-bashcomp-20140911.ebuild 752 BLAKE2B b652969491e3942a482f20052ac2aebf3e4f99f8cc892f704cbe6be695068835230f56f59f1b7d87a06bd9e417ef7e72f84e67773a4cb360940a8f0456d93dd7 SHA512 f0aa4db120aa031d9c98136e22d95fb635dd21cf5343588924c0ed75417f879c635c79fe48873d4edba4899c39b707b5a0b227b035e04ddc7d62ee06a06df5ff
+EBUILD gentoo-bashcomp-20101217-r1.ebuild 1399 BLAKE2B 064615d291b26ca3f4f518fe2487094dfaacd4513a34034409e26f15797a9bcaa40c0e7ae4abf90f9ea11171273373ccd617bf607dee09ea5f2c82cd3f6056b0 SHA512 709761ab0e2692487215fa4305fd2884e1c36a2d4c7e158e3d73c2cd0ca9ac4570050decb086bb839ea8d862efb8f4edb3e6a422aec2c00ddbd984961d7b3d02
+EBUILD gentoo-bashcomp-20121024.ebuild 1300 BLAKE2B 617ea1b48f83d546d95214a8ce981c6ed804a4e6d1f416392dc1adf0bba70662a1f146b7f328387bc45e6ee176b3446d8add78b96c4c70eeddff3c01ce586f3e SHA512 cfcda78650f8292ac0bcf68a3ec27c957ad5c70b2a62a4b9b5f0fe18ab1dad5c4035e84e1785abff8fa2fe82a48437a1ffc7adb45068e65d57d5e85270551916
+EBUILD gentoo-bashcomp-20140911.ebuild 740 BLAKE2B d08ffed7d83ccb43ff04a21b9e7c72eb04fdebd946d065c9d4b46117c2e7d7110fdc56163f1f18826ab8d35946c8fe075a1b8684b36f05d9da488967e212dded SHA512 7e48b33205887c87bccd740a8d61c03feaa7185148dd659d28bdb543e01f190a0e95c80064fef323209cd9b2f0b2b097e315a155bebac0cf09d264fd69f366eb
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild
index 9b9190536b91..9a95d6e20e83 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash-completion"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild
index 6feed7d34c84..5b408725bb85 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+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=""
 
 RDEPEND="app-shells/bash-completion"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
index de1290e2a58b..9fa1d8ef71a7 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+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=""
 
 src_install() {
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index 516c3be63da7..f57536b65baa 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-zsh-completions-20141115.tar.xz 19672 BLAKE2B 13a121686b051355d80f6c36ef6e9fbd3c691b92df439690f0556260ca9ea7529ce1b3a9254811b1d1c4e632e3cfef0da021bf8a34a559dd076f1ed2fc189a8d SHA512 23debde6227574285ba123ad312db535d40813de686ef4c89f1e4cd9acb3c1ab63f5094194a50e6d272ad9ce3fa1ec6ef0bf4cf93424e2ec7adcb4c74572e420
 DIST gentoo-zsh-completions-20150103.tar.gz 23759 BLAKE2B 9e48cad8b98df4de9479f06ab394e689f2169c6b52e062806b2051f18b86a6f80b660f472fe48b94bb0aff10095d7fcb9e097aa38710d6f3969cb03cfa4aff5c SHA512 4d87edda071d98672df79e3dbb9565757c0738bc50751d31e5dfefab4f17523387fb2342906ecc0600ce86d888ab4a785756bbb1daf37ca56a3ce1af9e5ae173
-EBUILD gentoo-zsh-completions-20141115.ebuild 844 BLAKE2B 851a800a2c250becbe6ddb073cb1a9fa3f9ac6f55714f0f24b2b5e7899d74e8a23da74001c9ff496d856b3104d03b98283c2cfc6803dd0121790433f175685b0 SHA512 053c74453f62292fb121765de5ba2772cae9645730dd6230afcf01f4173b93a507fc0c44302896f005e569ecde718366fa8eb849948f21c8ea570f21506f5d08
-EBUILD gentoo-zsh-completions-20150103.ebuild 783 BLAKE2B bb861f39b5ba8a27d8a5b44a51cf8f856e091447cf351c1897c65caf634d56f66919c2d5907118776272551ec98f51de06af6c9f5b2ca0fb46c8807e5db08b52 SHA512 0c37b1717cc91c04603c205fd223089ba33e5b3ab9821c2b6326e3c20aca7c00c3f69e8856d5e15d0cd56ea6b2cdfc07195b6e570158932f4deec573598cef31
-EBUILD gentoo-zsh-completions-99999999.ebuild 783 BLAKE2B bb861f39b5ba8a27d8a5b44a51cf8f856e091447cf351c1897c65caf634d56f66919c2d5907118776272551ec98f51de06af6c9f5b2ca0fb46c8807e5db08b52 SHA512 0c37b1717cc91c04603c205fd223089ba33e5b3ab9821c2b6326e3c20aca7c00c3f69e8856d5e15d0cd56ea6b2cdfc07195b6e570158932f4deec573598cef31
+EBUILD gentoo-zsh-completions-20141115.ebuild 832 BLAKE2B 54df648cd3c15acadbe05303b5cda16a8b689f3cc6abfba842e726d9801b8c4c660acd05822700df9123cfce765ed3408f9c66d4871ffa7f97b99a7be9358c02 SHA512 ce9723096846e12f835e9688cbd44f9cabe4672956844a561ec805f32093e8cbbe3b8739d3ad49e208fbdbaad9c4f0ca0cdfb2fd3de62fcb0111c553a8571ddd
+EBUILD gentoo-zsh-completions-20150103.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
+EBUILD gentoo-zsh-completions-99999999.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
 MISC metadata.xml 350 BLAKE2B c8d3cbed9f1d2cc6511612f05448d7826ca031448c936a2ec18ad2bc8af628c3531a248c63cc2f46f0037c2b9305051df2b3d05808d5d7721c39560c0621bfd9 SHA512 06072032aaba8a33b43231772067bbadedc05abe289933b54108d30e6acd81fab23e621db91dd1269df46a171bb11c3903e8e942a7ce964c1229e44912702d59
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild
index a7aa565f0652..687f950f702e 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 
 RDEPEND=">=app-shells/zsh-4.3.5"
 
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
index 5a4fa4c7fa0e..cf137815c472 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index 5a4fa4c7fa0e..cf137815c472 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 8b495a5680a9..08d93f1fad22 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,3 +1,3 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
-EBUILD push-2.0-r1.ebuild 695 BLAKE2B 54c53e98f0d164deb7988e1399d67bd20417da4ff911bf5df7cbcc93a8b7cfcf92cf1fdaa3b56e751ca2c3877dcb6950e1deed5632e05fb537b3fa75ec31270e SHA512 ff9fcff067758d21b560399cd9434d33a2d49d523b5de3699e00c24d14dc0d049e2e3395f1683aa6f36350fd727d0344eee3d5ac691ce61e67e480ca2fb72cec
+EBUILD push-2.0-r1.ebuild 683 BLAKE2B 8962d6fa6c0d4a4e3a5883e8ab2e97b0feefb744a741975495c90cd81b9ee128b937dcae98354729814511b773f144398b1fde8832344191a217288a45372705 SHA512 d6f4028c797f964ae9ae9cddca47278c5f9301fb15bbda2ffc32a434b16c020623f500479b29ff796ef98282f368befe76eeab3706b7459c1c93a479237a5871
 MISC metadata.xml 694 BLAKE2B d2b14b7d662ec3a49f74130054af3b3914ad497af6a222b26a1b4aec0510fe3521b29cc00c4ff059b44f3ab325a90166f7f9b369198fbecfc54753fb2b227f22 SHA512 af064b9c47b99ebb159da58edf5b950b5bdead3cbafbef2dcd7ac622009d9164308ca18e9898d42ba51b9aa4056631edf4280eff3cfa546837c5df5dfbe93216
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 01b66bf50039..323cf66c77b9 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.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 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index c9723407144f..0514b1598572 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
-EBUILD quoter-3.0_p2-r1.ebuild 763 BLAKE2B 678c9dd846eee927297b1c4c7c83c7ab678120f26a25590f8eba8a647473891d1645b9c45daf761dba98268995ac05a803a312f8c6b0d96d39be7e64fa5539af SHA512 86229152dba6ac93ee22a80564c907d90bd927400108707594b390ae927699d597db3283092e3f980cfb6e9b3ff07992e476ff6d7aa0de062af3ff85f451cb3c
+EBUILD quoter-3.0_p2-r1.ebuild 751 BLAKE2B e15d8af18b3c03c611c8d647bfd4887fd5d3bf921dd7d9106a73c10aecfa3b2ebddfab8af55f565deacba069b75cea9893f255b2ff73f555f2955c31e0bd7b4c SHA512 320b85f9480eff8f54024b76289d7072e6b3a4ef7329156c325404dfbae4a575a84bfc4d99563d9972f448706bfdfa738fb7e748f381b400b6ec2791fb328bbc
 MISC metadata.xml 696 BLAKE2B dd6a68084f8a93ba5cd9d358c260bbf93bc8515c6610ae8d73004b53b7173e47103d9189123515e607826f1b8226fe909a17442ae3c89832a21f2686ed13c8c0 SHA512 30cfae6f7af84bdde697740d3d03d27ddaaed81cd631a9fb8e2b12f11e8acb0de2680437b5679def2c8e3bb09bd69c26651e89d4f67e46b2e72e6e8274cee358
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 1eccf5005a7a..b97237c2356e 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-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/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 0a036e1ef2b5..76dd81f49c06 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -11,8 +11,8 @@ DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee047
 DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
-EBUILD zsh-5.2.ebuild 5904 BLAKE2B ff2f87b4eef53df352533abb8055dba59f164ef2e228dced3a2a6f5a790ca21468438cf8be9dacb3b3aa08f36f93cd6cbe29d48c98e9f2748622c6cf82eef9f8 SHA512 4e1194cebc50f0dcf2c3b7c1398b3e19842876bd3a2e9ae74c8734aa4fc260e9f3e4cfa396372c6dc21e4330102934e9d0cb5f3544c174175b400714b36dfcaa
-EBUILD zsh-5.3.1.ebuild 5993 BLAKE2B 5b27a02b20427761294a85f4163ec29d42703e7e2a29f839b0db3c31623808d8bc2441a3a81819eb786c2f5eb9dc450be2e9b94c9b4cdbd9a0a1abb178051217 SHA512 816c85c535046f44defbf2a79a46b8f92ec39b287d4bc7a3caa614e5c13f99f4d191c4e7f5b88333c4b23d3556561d8e9eb65e57ffe240b2ddb158e7842b31c9
-EBUILD zsh-5.4.2-r1.ebuild 5831 BLAKE2B 0152c2e02b368e88b616099df8a26b5132491ff0d18bd2c6c5dc390a909351d3f8025577d723d5dcdc234502a73e0b5bf0e79698d682af70bfd7d551c39eb00d SHA512 caf124ecd8eec33070546272dce04702b68b1c693e6b32c8f6abfe8d005a02c5159936fcfb83a3ee8fa272fc9de15cd8cc74fcdf7bff89f0a796a2aef7f84ee5
-EBUILD zsh-9999.ebuild 6010 BLAKE2B 6740b811aee76184fb1e1c4e8f0f8f8497fb27314cd2651a8a03734bbcbf34363084e0326ac7cefedf857129eead29f0c4c84a45e1edbab1dd23cd6b72682cda SHA512 8ce2a9c12b57f2c34b99f09d220aab57204a3c737dd132073f7220be55b3a848519444463e0205e470a4de332c085265556d425e77ec07ad5902042861e820e6
+EBUILD zsh-5.2.ebuild 5892 BLAKE2B 9cfe389e3ecca130ac0787f1c826b4ac6b1ea4a3779822d1dc07dc5781ab2478094c5b74f945085cde4b12a011dcee9497f5c548c8fa922124ec6f779d26d89a SHA512 e204af3f7db27c6340b29240a5c99af9d955fee68045344152898ffa5925a44e9dbc72fa18e3d1002033fcddb79b3c274383f75cbcb71f4545f2a2f7e31241df
+EBUILD zsh-5.3.1.ebuild 5981 BLAKE2B 7bb0e3b81104e115c0ffc9ac593440b9ab61cf89cc33842a3df467ace612573c1f069a9032a8cc1d58f92f47b64900ce042b23a4273a435ab96cf0cc3ad46c1d SHA512 b1173c76320d9c615793c65fa214320f6ef02cac834233e69d242e01834012ab1b32a886666955bc49720874557cdaf14ac5734bd29c04578bc74e87526e2afa
+EBUILD zsh-5.4.2-r1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
+EBUILD zsh-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild
index 82c157bbed40..4f604601c84c 100644
--- a/app-shells/zsh/zsh-5.2.ebuild
+++ b/app-shells/zsh/zsh-5.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index 434a0b32d8cd..d84680e85338 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-shells/zsh/zsh-5.4.2-r1.ebuild b/app-shells/zsh/zsh-5.4.2-r1.ebuild
index 2c7d5c236676..4c17da09db4a 100644
--- a/app-shells/zsh/zsh-5.4.2-r1.ebuild
+++ b/app-shells/zsh/zsh-5.4.2-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index b6cbb849b5fe..f53a6be7a4d6 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b52c6d41ad4e..3e1c00631a7f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index b60ac66dd9bd..443fdf5d116d 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
-DIST ansifilter-2.8.1.tar.bz2 436461 BLAKE2B f4b059ed7c8cb2823c9793cffd49193160295b1be0a25981464979add2759116d62b7a938c599eb3a45ea7f647f2293f9bd67883e4b2010ff395d24d6bea9da5 SHA512 f736b1e9d975a17431a19c2a889ede1feab6b8967d6981fa08d4d1a541cdc1478258dbf6173b7d00f9aa476cf79cfd1c7321c9d017a8aa6ad7ac9133b33a0830
 DIST ansifilter-2.9.tar.bz2 455885 BLAKE2B 0865e17f45d16657e78444e65bcde07f74ee9d8605e100ef34354fc874210fa6cc4d01162e234bfca9c486fac3c41be0d1e0caa014d9702d4a90798b1fa85636 SHA512 9fd086d9b5fecb7c1d42f96baa728b2b6c155505bfb42f92c1a79ce59571abff541c7d55e14b159ad0e7890434fdbc1b383bc76ab4c22a16d835e270b6095005
-EBUILD ansifilter-2.8.1.ebuild 1000 BLAKE2B 35f62af10daf5bfb2e625b40a70bb66df10a049485d852cbc25960358ea6aa67dc63abfa265d28632b98eaab971182d58c84df2700deb30c3bff2c0ca2832eb2 SHA512 a409b86071066d8fab61c5b69b0c576e8210522b07741972898dde788a262138d44f4d28b4018ec1ef8a23adffcdb34ab6263045881cf4014c3bf366106f6ed5
-EBUILD ansifilter-2.9.ebuild 1002 BLAKE2B b0333d5acdcef7516fd0b45d4a1ff0942d7c4330ea5bc44858072e3fb42249a600a44bccfca38ca1bcd13b9475a68955008f1f9759ed099971a02c655e090ec4 SHA512 182a3053e91180f2599debf271e29d3a6db0f1e923334742329156e1ad10dc4d3a169ea602baaf71eeece45fe223f67e2e8cc8c655c83617c720b093f64158f1
+EBUILD ansifilter-2.9.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.8.1.ebuild b/app-text/ansifilter/ansifilter-2.8.1.ebuild
deleted file mode 100644
index 47881d0b8810..000000000000
--- a/app-text/ansifilter/ansifilter-2.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.9.ebuild b/app-text/ansifilter/ansifilter-2.9.ebuild
index a4c7a3b32c73..05823fc22ef7 100644
--- a/app-text/ansifilter/ansifilter-2.9.ebuild
+++ b/app-text/ansifilter/ansifilter-2.9.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="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index d98590703f09..f416855f07d0 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -5,7 +5,7 @@ AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.6.1.tar.gz 1878163 BLAKE2B c5427be61945fce106df1e76f745f5dd9d754ac71b8ecb4c8dff89ef2de44f2a0042ffde31e1db9ea6a255f3c6bd4148702181c2e718bd8ebdffdc09d2ef8333 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-EBUILD aspell-0.60.6.1-r3.ebuild 2626 BLAKE2B 084b4bb3b4159b5000eec5bdc4f7a3240ba6d8834818a1be8c91a1924f15e1655e4a80720497493fc05fd9aec30a3e1db5d672dd598204e05911ac6adc75ace3 SHA512 96aca8816dd94886e619a784806429d42c3bb1d44e4aa1a42d88ab9b3214873887acbe10f306941f20423da87bccc19df14cd79d7b0a92d764ce1336c08df9cc
-EBUILD aspell-0.60.6.1-r4.ebuild 2389 BLAKE2B 2f8661d67d0ee4a64c15414f27e9247942f3ebc093badcc953c8c3671380f65cbf9b5f16cd35a39f1e32715f2fe0bb72128618b081446edb3c9320008b710c04 SHA512 52c8f4b00786f8a68e2ab2190ab3c078c2bfcddb4e9cd1d586c78e6ad806e6180dc8cd02a4f4b71a95dc86526dfc668456bb329edbdde0246f1915c386419294
-EBUILD aspell-0.60.7_rc1.ebuild 2707 BLAKE2B f5e3aec6a530d10ea8587710c2c05be8f11750a92ea1ff0e539a7d5cfdc9faa92529ae53b46565f70368ee4b2bfa9e14d86b25352ee93e7b9927cd332b001ee7 SHA512 1bf070057a0ce36e86169fa6bd5d1d318dae9ef9fab2160122c1d3464e4038eee2fddbfd8bcab5476ba66192908b1d69bbe3219596a08f4845d1b7fd1810a6f1
+EBUILD aspell-0.60.6.1-r3.ebuild 2614 BLAKE2B cebe635bbd83d6a998a28fb0bd26c133fef2cd540bfc44df951341844a72412d793ef9fc0a3ac69faf174e296ef07e54dc6b26f9de84f5958a1012a34389b687 SHA512 347fbb12f74106fc19a69ed8f78fc22699c2fd8e7f261546d94eb2b5cb3e1d0e182753fb11f67ac13a184768a45d3fc8d7def60d7cc0dbb7b481b8feab63830f
+EBUILD aspell-0.60.6.1-r4.ebuild 2377 BLAKE2B a22e75ba79633d962821c7092d3acbf78883695ee5da97bace730cd520dfe55e2b41a1da6f61317a9cc8d24a25e32e1da1fb51fc23bcb1fde0fe82662710fb58 SHA512 caf35196222d9a3a3b64610df20149d97a003f8e45f47dc3c086047decbca8571101d4d8ba684b6cbd0a8f0b54c5f1ec45706b9b8880d5b89ae8fcd73b7fb213
+EBUILD aspell-0.60.7_rc1.ebuild 2694 BLAKE2B 4bdfc74a98c2f104d92474b90fa6a54a06c0c10cf274dcf581e99b779e48bb94454eac790ee25766fc930268abe1f63528d58b42a9aebe2e90af36625b00a6d1 SHA512 c2bc4cda546e15105ace9ae2162c50a8ede7a7e15676bdb7e5dbc26e68583904c077dd8428a58813e6345bd2a220e7e8634ee64c64ad8f5fed889d8ea4c50452
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild
index 6ff3332b5a15..bd7082628c1b 100644
--- a/app-text/aspell/aspell-0.60.6.1-r3.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm 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 ~x86-solaris"
 IUSE="nls"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
index 33b4d10f3ece..47423f0e0b00 100644
--- a/app-text/aspell/aspell-0.60.6.1-r4.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~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 ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index ffbf2fe55a21..d323a32ca7ff 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index c3bb8daf402e..c779b4e3df42 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,7 +1,7 @@
 DIST build-docbook-catalog-1.19.1.tar.xz 4552 BLAKE2B ac15bf349be35d1a5c7f4b58e5c295d3b4e7adffa000ce845060990f7c2603549f0ae696143bd4924e81f210131be3e82fb4c80190ac366303da15941f320fb3 SHA512 9c4b1a30d8b2f820046cf987296035a1418fa55f47c2adc6702cdaa3a01efc8584bdc6804889cf13a85bb1f30b129af5c62ecf8a7376d56d0738f717619ddcc3
 DIST build-docbook-catalog-1.20.tar.xz 4620 BLAKE2B d927e451e5cdc3635ec85f3d283bcd3bf1ec3a65f53b7eb21e22cc3d27bbb04a34e5ab43ba7786e76f7ca08c6a63b41ac5b1f2b6da0c9bbdb10855a8e66ac53a SHA512 65656c78709a8da01cfedc786a31da2de125eeb65bdaa3d2e49ed3a0a7ff4429280d5d384f23dca0ab540b74f7c9b2ed4b80e970905a7d2838a841c81925b3f6
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.19.1.ebuild 773 BLAKE2B 138d94477786c0d56186b2c8e8e7c047b2d037addd3719d776b8269db9343cdbb2c91048749bbe6323715e630c92247af6ea1e164e4fc1bcfcf3376a062d218e SHA512 c70bc6fef6cd6b333594dbc1ba5b61a74feb3c2be312c383c1c2f25b48b3cf5aabad9cbdf516f320e4de9e983069a8a4f2d965b340f64ca426a99257030d10a7
-EBUILD build-docbook-catalog-1.20.ebuild 1152 BLAKE2B 5bdafb8c7cca2821de4ee001080260251c0c70323f1bf00f3fb1ef1d053eb88133e87dcbfcc78d9de87226764b646c233bd5a2b8854dd130f0ff6edaa0ef7381 SHA512 32f38925bbdb050b4898e39328e78223e00307981d723ccab9cd86323da3d66bdf6d35240cae7075450997d8cacc7799c3b7d2aaa7edd78012bd7efaab935749
-EBUILD build-docbook-catalog-1.21.ebuild 1114 BLAKE2B a8225f8c75c92c488c41aff3efc5d08cf2577a595a40ba4b0d6ea850e2f65a166e12bcef4988cabeecf4f789b8d0f3d464b71a2a51af53d54f2d48e124310a27 SHA512 9a9338d2bf96598d176ad7b36e8a2e3877dd576feb427b040e059720bd7d08e65a9458f041ed109315cdd797f5ec9c49225e931ff68af602355c5e93f79b4a52
+EBUILD build-docbook-catalog-1.19.1.ebuild 761 BLAKE2B 56ddbfc1f8cdd9d6531452671b1bc92b3a81eb9ab4af31980af6a82207b23c260c09ea26f4f2f9d535e78159f7868838b10d69b96207ff067e55582d0ab659b5 SHA512 32814eae6c8dd46b00d1567922631e38d000930bbd4b7aecd7c97c9d404439938e70f27dfbfbfbf0d138d119026b9eb239ce0877f24f37fbc179beca71cd718b
+EBUILD build-docbook-catalog-1.20.ebuild 1140 BLAKE2B b7c3f81d3a899d34ff27dad7e726f288fdbe781e8d359918abf726eafdcfc67f9565df9a7f0ef92c7a226036c42069f5c6c1cf56de6a571770759968f7c97626 SHA512 0330a064028c41aa8d2386118e7eb27a7a0c5e24f76cb3f619bd704244a058315692a7452694f8f3d4dc942f1be86bc65e3901654b7a7073d4b9116d081cd5a0
+EBUILD build-docbook-catalog-1.21.ebuild 1102 BLAKE2B 48e3005f2dfab0e7d143ff10dd0668211931e24031d3ed894086b317e35636c5a543615892c11304347b26ff96bf9d5c6c48fcc5fe687649801309da0571c89f SHA512 31abfbfc3fdaee7cca3ddfd78e17c296037e58815767ecbd8e3dfc1f172747a8c092df1e2542739c8ebb3c2127492b696763ca77ed7f4555600e3807b0f150d9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
index 90ceac95f47d..2708edbc650b 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.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="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="userland_BSD"
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
index 685216e9ea2e..8b81fcfc967a 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 6c36ab8153f4..fc30c02ca19e 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.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 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 084872759e14..a5ac46a02235 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,13 +1,4 @@
 AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881
-DIST djview-4.10.3.tar.gz 1119618 BLAKE2B 31cd334c18ce9b891fe34945715317de6b093cfa7e0cad6e32c47bc533c78f8a44856c763475782c926932566d8604d3e93bcb4705c8586d966f140c040f69d4 SHA512 6e3da481cec699558cbdca17b19b971d693341e6f5ffc07010f8ba717c6434e6d96969bfc322e4edcaaa5fd364e583c7c0908c814725caad4dcc3dad968a74c5
-DIST djview-4.10.5.tar.gz 1111729 BLAKE2B 6e6607dcfd3b20c5a514ad851d404c616f2be58c4813d4ba5ae91cdb7b808a77284419a4080063a36371085aa72c0bfa5dd804e269f5e08a75991ae3ef3da3b0 SHA512 d7fa4e643e006cb1d71fe6d808fd1b200b965928bf2cdd872c9c1c1833bed71ac3c70a2967a06f31bbd83f347cb5e330f4869e42e7d9c6cd13a0db54e4354614
 DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
-DIST djview-4.10.tar.gz 1077198 BLAKE2B 57c9d3a8bab485929880e11aad5602a3d415fe2690abc0759b0ac4b553e8c3e8624a505cee291150df7842f02f9f1a15848daaaa843e0ed9543a42400336bd05 SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0
-DIST djview-4.9.tar.gz 930676 BLAKE2B 384cf46d4258bb6b5fcf8e4c0b64787bdf7edd281fafdd170e6a1fe1208ea3fc207c39938e5ebd525c8857e59f0090de0d2916d2bfe9fb86f85a7bac1f081918 SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94
-EBUILD djview-4.10.3.ebuild 1967 BLAKE2B 28e074829e45abeb9e7cb184c827e8fb324b6cf7a1e12820ed88959c4c3911d11a8a40c25d1d00ef3a03387d505dca4a92dd88cdb65beadf320fea4a5b1ae058 SHA512 1aa0fa04b6f82e3462f8e208cd04b1125efc407ef00ed63e55c3c27a30ff13577689043df5b23796d150b68f8a4d4e77cb28b65528f55bb88da1849f270f432f
-EBUILD djview-4.10.5.ebuild 1967 BLAKE2B 28e074829e45abeb9e7cb184c827e8fb324b6cf7a1e12820ed88959c4c3911d11a8a40c25d1d00ef3a03387d505dca4a92dd88cdb65beadf320fea4a5b1ae058 SHA512 1aa0fa04b6f82e3462f8e208cd04b1125efc407ef00ed63e55c3c27a30ff13577689043df5b23796d150b68f8a4d4e77cb28b65528f55bb88da1849f270f432f
-EBUILD djview-4.10.6-r1.ebuild 2032 BLAKE2B c4056146f4883c585273320aa8c16c87f18f1a63dbcbfcb04d834afe29de7a76383622c31c94f2378d8218bacefdef03f1e4e0f0c7b301e99e5fbb8a6804aa0d SHA512 458f7ba69a1cdc86cf1b39792bc200f656003caa78aa2d238641969c03ef10d255f04f9602eea6cbe572e80a78506b1af640bec3a9a40bba7bc6971da7547de0
-EBUILD djview-4.10.6.ebuild 1963 BLAKE2B 8577e48da86a9adad751d5685482b7af6348d84976a0fb7d73b494ed34b6d62c472e7c4e5f264234e82db6e57de15331c75b75c3ff432357fcbc16be544b73a7 SHA512 87550ffeedbd259d27ee273fc00f5bad414deeb6317db1548f30b015e1016e51a29552dada185bed7ff338455cb7940bd644ef83b2292ca64d9f1ace0edbb833
-EBUILD djview-4.10.ebuild 2017 BLAKE2B 914acd9c2c4fa67a41ebad20c890f5c4a54a93ff5f58e1d29139d79f4f76f65618c27fa62a92851be94a06a4b36327b3ef2f53166e3c1ee1c666e2ce47cb5b0a SHA512 65063e5d42283786094e795e6d0935045335612a563d9994b6b0dcf566354b9a647c7f2bce8eae98092529df7ce1c063ed03ff90a23d6c2c0c9f5852e90d418d
-EBUILD djview-4.9.ebuild 1936 BLAKE2B d9fe3341de87d0edf34568239f73d721830eb58b49d21ec473c751ae54dde2ac8ef28a15f4fa00175dc28366a32ab541739506556986391828e05fbed3a5470b SHA512 b17d6698188c8e9680e829d032e1884352097a914d70292654174bf4e055473ed9f71c2b5a6561628f74ab782a056f309ee627e81bafa1e4e3cf8d06829e05f8
+EBUILD djview-4.10.6-r1.ebuild 2030 BLAKE2B 79d80ba1e21ce05edcd2462e56f1d61e6279fbce72f24c21142c4b0b3bf74326343d505d06f06d7e595ca7a688dbbc4fe3c3b58f63fb091bb5f85ff4a592a6da SHA512 6cbf7319de31e604e9e09915b98fe206403fbda2fb524889fefac97cfafca3aa9db36a328f8f4deeb62bf6303bc08c5f15a369c13ed46f91636b02f9f65cfc88
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.3.ebuild b/app-text/djview/djview-4.10.3.ebuild
deleted file mode 100644
index 80950832b3a1..000000000000
--- a/app-text/djview/djview-4.10.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/djview/djview-4.10.5.ebuild b/app-text/djview/djview-4.10.5.ebuild
deleted file mode 100644
index 80950832b3a1..000000000000
--- a/app-text/djview/djview-4.10.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
index a4e14722f74e..fa5fe0ff6bd9 100644
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ b/app-text/djview/djview-4.10.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
deleted file mode 100644
index 64fde7ca4ee9..000000000000
--- a/app-text/djview/djview-4.10.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/djview/djview-4.10.ebuild b/app-text/djview/djview-4.10.ebuild
deleted file mode 100644
index 07ba16e577ac..000000000000
--- a/app-text/djview/djview-4.10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/djview/djview-4.9.ebuild b/app-text/djview/djview-4.9.ebuild
deleted file mode 100644
index ea9ddc4ccb9f..000000000000
--- a/app-text/djview/djview-4.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools gnome2-utils xdg-utils flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}4-${PV}
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index d0e6656558ad..d23491b652fc 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1637 BLAKE2B 48157798af90161d3f714241732db8fd7f09b004767e98855188bebc59bb4c24ff977b5abb0c8d2c6f3018c6a43dc2a27061fdbd5727e09c5bd277cf7241d911 SHA512 90270270b31d9051952672b6323529ab4f64e07ab906019ef36aa16cf8922b65a31c9a28556a6eb9f96322b7f3d1cad50139e94ef8f0fd254965ecdcd00d2f9a
+EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1625 BLAKE2B 0e539d234cd026600160bfe3c1d255a13068e8a9b1b614911f4b6375b8f6b517cf7061ef09af59b912a8c1659910a2d6e7ee67c6e88e0a05888e585da15ef2ee SHA512 b8540d444bc2ccecd2306743fc85920558707a47741d485938e4af9d6de47cc618ce05ee8f3d88ac234964db56417f7ab5c7bc107c3812a539c9fca7d88650e9
 MISC metadata.xml 244 BLAKE2B bb7b24c64c26a7f15cd94824d3dcced7f4680be7b408e344b8255ab4d2811a85e0b6941172dc28e10077d58c07d16788e8e42725526e51968fcb07f340af90f0 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
index b1bae17e8c83..2eb8696b0f5b 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-text/sgml-common"
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 388c47010f73..14a9ae9d18a0 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,10 +14,10 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1050 BLAKE2B 786cb275f234aa3a86893cb0ffc3405c3e0628252fd019553b2024bd49e5800cd3a9bdc99692685f0f38dcc8271ea4fc1c660159cd7816c4e97917199497c286 SHA512 12549c4f579feeaa7bce4951700cc49d118bd0ab687a3238be3fcea5580142e60bfd60e45ea9479ec73b45e99f4169342f32c7463088d10512bf0e52cf515052
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1050 BLAKE2B 7515cb48135d11eb2975ee5513edb665d3144ad41f61c693fd8b8e6c95ce679c7886420f7ffd462624996663855d86589ca131588b3393c6ea9bd2fe52c609ff SHA512 b594abc7d4a1ed5f1dfd6e660a58054ac4b514890f06ba3db019b499fca036d5ec13628ae209a64813f3d8dce26574e5d49c2debe73b67ac1730e9a4ac8897bc
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1050 BLAKE2B b4cd9fefa065b35f71b63ae0180e42463e532d854c107cce163cf5ba77e70b1230e067b39504cf6f429a9959c3383bbf1ed4021f8e33a3350ab7e13ab173d654 SHA512 2ab6e56b962996278efa98eb215e1a6d175a35b9c40ab47847bb88014127de87c7effe7eddae91cfd414a3371e853731949885b9acc52b06a03ff513ee0bda7c
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1050 BLAKE2B 7af7cbf8957ca1436d0bb185d54763a2e4ce61e62aa36d7003ce5d2f6ce58565b7fac80d5ab33e88d77c300688e0f43f1c219a152acbeacbd4a78358935f7619 SHA512 78465733387455939f68dfe7ffa06b31ce5b67977b3b2892960e9ffcd31d8955dd272d48a8488dbdc8f7d5fb779667a6f422486267296f36ea834cfdc37de7ff
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1038 BLAKE2B bea382cc74d450842b340b2f4131f8454fe3cb023b0e57b709038d730a0853fb68f8cedf809a0ef52efa31467c3cf3363019a465d04fd90ccc29ab8cfa9b6f9a SHA512 f6f9c1183fe68817185786c665a0e3d0acdd82c56a1f2bb11e0eb411cf070a7583f66faf25bdf0c88f3822d5777e710430084fa5aa9d8db503066c0b89d1040a
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1038 BLAKE2B 587dd834b106b4c66a1981d236e3e9a4d07102f1d995ca8e521c433decb3d0ec3467d53ac50853706162b090d472f0957251fca9483ff6a429676f52d8898957 SHA512 193d0561043034ec1328133724a6a9e233e35623364aef45a58807f383593bed33e9feb3289a4631b2a4d8e69fc508ebcf9f95b64ca6f5a073eae415b468c1bc
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1038 BLAKE2B e570f274d56bb1f6011695e8f17e240dea09385f656e642d6f4fbfa883cd081f044a7a2602099b391a2b41c3b9d4a0c3d5fd39c38a5f7f02b3445efe8dd01422 SHA512 e4feaeda3d910d156e03e58d844dedaa8edfbe40f24c74660e0a00d4ca76e9509144e705a1c90315fab3c77d40728b00d17a3d1ae021c67faecf40e04bb1fd2b
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1038 BLAKE2B 7ef743a367ad084d2ba480fdac699237a53fb63b62d6467acf21fe8dc7fe8747bf04c1b3380ec7d0ce89e2fc821f1a009c9885a4f44fd3c8396d4407ff676e55 SHA512 98781f21a593c19d8a3f6bd15b345a3cd84ebf9e07b56c0e36b0411bc865414935a64440c96d6ba6f2c7aa02e11f9c5158ebd283589651e2c6acb4c55624104c
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1041 BLAKE2B be2c4b3d9e82e33d91b66e77924ee9f514dcd88b0acd98bd088bad5019379a0db343f39fe68a7deedcab3dd1b14b13a6863f05c875ccd505138c9b7ec5ceae29 SHA512 45e1f259b57a2ce35ec275d18fcbb0f80095b31038f620a61fdb57324d8321997082dd5596f3d3aa2adee4e169391b33a4c0ff725a4bad28d809c62ff75338a2
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 1022 BLAKE2B b1bf268799699a9c362a8ade86dba82f530b8db7eed63a66df821bd98c6a2af641884b25620797c298a3ec215ab3d96a1a9b04f2133194400701855a16fc7d50 SHA512 67c2e1db9058cb07dfa151219a8dd2f2fc15ddbc62d81507a6a50e22547074c1ffdbef13e33d3199f267e48b59b5cdc8f5681f713e096c66c9b214b27316bb69
 EBUILD docbook-sgml-dtd-4.4.ebuild 1032 BLAKE2B d8a1ef0b9299cf17849ff1aa7c0cf35c6df52a7210ef5df257fab2cfe75f111ddf4376e9c80e74f5e8a48f82b8ade97ca2d88575b873c1b767530afcfbb91eb5 SHA512 a5d231f68ba38ef1001f7402a8b870af10c5b22b7f5dd583c91e76209c479baf67d7d95b47afd35ef5426716df1e13f3636866897aa3f560dd3cc1c547aa96cc
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index 63f4c000d671..7bc31b24ab58 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-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 sgml-catalog eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index e51932f0d1e8..d2bee0c42c72 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-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 sgml-catalog eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 978d581ad8ba..6fd11edf5a05 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-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 sgml-catalog eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 9bd906ee79d9..49cab1b00620 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-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 sgml-catalog eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 19e11e24b8f4..643172f239e3 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,6 +2,6 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1864 BLAKE2B e18984946d4bee7c476eb9cec0317fd4f590fb50522eb54200b20b9d6d3eb1225aadb5b1f1e248776e2e85e325ef12364cdc18c58b7f59d39c5653b581ba35ca SHA512 38efc7b3e888b8bd82b9bd2c03fbf5052a675ed7c0fed5c006578ff381213d05cb165e62979aad00c82146a1a9f217528607adc3b38c7e63bb8cad0f053c53bd
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1870 BLAKE2B 92848fe171dc051b5130f69d5230878470b1b7d917da0c6cfa5393fd4afca907c2e267f2309032d1b92b2ebd49f6ce20312866c2dd1bbcd133579b8ea86c3dcc SHA512 28f54f735741e025ec0cb797fd91be857c74332a93d0105c63aa06a1acddfba4dc2b00e2131c33185b40de44473e27e5743e23dadfdaa049283e2dc614614370
+EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1852 BLAKE2B 73578b17213d709948be2b0a519a76bc263fb1e78e1fc012fb50d302e4caf16e20eafbc4bb5d022c92f8dd465f3a968af4dcaf1388ec025594459cb3a07f6137 SHA512 1318b4293582d34a4c91c4e9bd067c40270179448b50f74997bffc86cb08074be24358179c15a5956d525299f2d092a94f348cf219a94e9da8c6ede384b150e0
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1858 BLAKE2B d83720dc59cfef605f3cb2e3224e96f6c40edbabed8a7593d85eaad3d800fc8d378f39c8ec2f306fecc3f03f42e67bea55b1c3ef66d78915d9d0c6c9ca7c64fa SHA512 948623d88731cfefec58bc6608942512ac9a8db9af8661ac85821915b11214bb0315d42df3d9fb4d4bb72e050ede38d4af32290c3a1c60bf7ca3e726feb32adc
 MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
index dafe1f1da55a..857265ee97dc 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-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=3
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
index 0cf85933258e..99bca5152f30 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index c9e1aea1b3e7..59f8eb4c73e9 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1364 BLAKE2B 386a95593a4f06d867ed3415b36bfcba113fdd850b3851347ffedd49a5c757e4ba5f31f0837b2c6cb4dd7e21cc563bc2e70e780e0af9dce3da8129a12e498bc2 SHA512 bb7530cbd7aa1ec196394a148333b547b413cc780cd67a4b8160cdabb43e1e1ab03963db1d65ff7360dbee9ae82654acbd0cd83d901bceb5754222a1a7fd489c
-EBUILD docbook-xml-dtd-4.2-r2.ebuild 1343 BLAKE2B 625c4bf8314dfcb2519d278d65324ec62f9f1c11deb2311321f5ece089a66d71e598e8b2c5c0e0219155a06d5f4b989fe448bb59cc5b0cbbafad3789c32c760c SHA512 3fef4ea9d934cd2a8e01a40d6b050defa29af29d638e5b541a37ad10d2b9872220c90ecc134f11339cea50a7cce423ed332f075394220bf88c4427c9cbccf8a8
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1352 BLAKE2B 55bb140d96f6733a0a18eb5655437ca5cd615948f1a8f2db59551e8a4e1d61597d9b4f0b97c6529ae03e427452f9a7b3cf397c6e5ddebde7e1c3c4c44b14f9ff SHA512 34fe548d647a3ce8e0a8c53883780d635680347a23aea1f2c749a76f8e31522ee24bfbda5b9cbcc895e138eddab0c96cb97a7613a5f348e0336cad60e9a0cc7b
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1331 BLAKE2B 80997f0e6ae4c4bffd752f06d332a9a6df7ce88c61342d7985fad159745a989e365e711357c184bc722d6eb6baa2e1cf85db73a75128c8093feac001a685529d SHA512 78c12134f66224f148220262217910c2c2c8fd023d2d26d332d5e748e27d5b3e4ae8d4d2cef5b52ac4513346b4b28f72e3856f6f3f5603ec0b7b9fac5deab599
 EBUILD docbook-xml-dtd-4.3-r1.ebuild 1348 BLAKE2B b55d413deef8333fc55efd7a71e45f34695476bb609219f74d14f08b950c14df3db551abb3a34d6982b468bca965f441072d848607d61a1399765142452e3766 SHA512 54d002099036ee06f76eb71a112326e27725ca93cbedb6357a2936b42428f8800f98223e4d6ae32c11b90dde3f6233660421ad8b598b28b4e684dd0f67a35012
-EBUILD docbook-xml-dtd-4.4-r2.ebuild 1542 BLAKE2B e1b07ad1bb7cefdf4be0559b422561c99268255331b5690e5d5f7058cdab31ee7e80761ed68b60f95593975d6ff40fb48413b6c66e8e3e145d84d6f279319100 SHA512 fffc729362c8dc59af788857b3db32204068e0fa711672a4df7de81a41862dafa89ccadb1ccab3f16d9856289bbaf822771c0c6a4a3b0dc70067b7b86204c8f6
-EBUILD docbook-xml-dtd-4.5-r1.ebuild 1577 BLAKE2B 2c256a81f2ec72df1826114de20b5107c00fc169270945b86fc13fd037258d79298551cf6d95ed2312ed9606aeb71ce86a32449326a7956c09c4f68032d04990 SHA512 40e80ba6732919d0097baf554a0598f0c950a35f7f635bcd4483e3c635a20f2c39b75bf4c0f35c640d623f2b75db5f33b63ae33443d15e0850b9416e84897dc8
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1530 BLAKE2B c5ee198bd2e8f172b64428cc06e9af0824a4c72e9ec97c6d823de80f07fd68453b3570e6866bf9dc2f30b01288997e9efb0989740eba09a1d3f1e25d2f8ba5d9 SHA512 1d3d92e8f181365706479cb4bbe25d045d6c0105ee03a99ff2cc1f71aec2c6a38c1ff5c6fbca5a2155da1ea6d3435bccf7e4a6b74cffc65be9e22c61a1eaa672
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1565 BLAKE2B 971b36945436f8d0097930bcab1e558163c8893b5c82d02c28093512e50522e98882a073ba206c1fb42c45d417b2d4b2b7dccb08a081014fd938812641beae2e SHA512 54a03f58268b6b938f397cf58826246a5ca53bd82bdbdbb283308655b3dd092567d84c5f8cbe1a277fb79ea29544aaa14df45b0e8e58562fcf8b22905f6ec5ea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index eaa26af1097f..2f55893e6de7 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.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 sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index b3a604912be8..68ff7a54ef67 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.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
 
 inherit sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
index b4614bd146a9..250af642da56 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-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
 
 inherit sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
index c7157e7a6962..86959a15217d 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-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
 
 inherit sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index f3640d717e62..757c2443da11 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,9 +4,9 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 863 BLAKE2B d2c314f1218a7aa230d98b583f31d85b14e8fff0577e853d9cdaa5632a72e2ab8cbf2f61c01afa6cf5f6a7d07c9ab65b4c11d7630975bdc78d5a3bb3e297488b SHA512 8c9c40a7d760924c667dcc97ec2f6fcb879e1d29d6ccb862874a43d5bc8daa9cd8145472911a06c4c436a85934865c33b980ec18c8aed05306ff4454901361d2
-EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1033 BLAKE2B 23bdbdf569619efe604f99fe6ca1fa9f69a65ae59e24297b6efecdb9f1db85e4eb09273bcfc00ab84e1cb6f07f4ecb21514b0b86b64348a8cb489d3bdc02f652 SHA512 750c5196f57f116d912caefc2de2283bcb8e0da0095a6059f86c58c84b1b3597cb0da47d909fd63487d7dd5c5ff1942509a8f7fb9bb5fe80aac7347fa3088634
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 886 BLAKE2B bab10ae0c3b1ca27b29c1ab6cdf71f13a69bbb2fb67f5e5fd0a33d9748a113c528975328e0f822685a76c7817468a906f86d353d0263a8e8e5484ce436d97087 SHA512 03c61f93867d56ccd4abc7fa76b477455d6811c474e6addf5e969669bd5f47fc716fafdebb90534be4f1673b6ba633038d92d9baf1edf9c9ae7fb8f16aec0a4c
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1083 BLAKE2B ef73e91ae714d7f880cd1f548ff6eb89d66e66e015955045a02978a796c82062b045387fed44442c2f02884ff79f028e6599fae3fcd023dbc4573cdfb7657997 SHA512 d2bfd1030cb4a0e2497cfc4520c147b3c12b86c11d5b4f9f4d94bb8d9378bc2b231e6b20a26233f5d1ee9e98fb7725a7c99c22964c83b74c5089cd9f6dc6ba4c
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 997 BLAKE2B da13105488b21352a9859324f3a02642a171010032b56d1075830054b7fb8190a6a71d9af9ab5a904450d4b35feff5a5c6f7e8b1de4de2aba383c1023624245a SHA512 2aa40c9f70c89f1258670f57f00d7121773025cf7eea2536cafb978ca0548391c03c51f50016506c69ef937bd71d7f5164f20c3b57600761e2c9010209691391
+EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 851 BLAKE2B a33ffbfc7ee79fd9533249ee6b16633532ab663e423f5416d73f293155b2fc75d8e4eaa4c7c2a0e22154000e1bc70f88d80f4e71968ef7bc8de330009124538f SHA512 8de21dcc59f760ae0f94570dfb816e776f79ac14561451e6b68ce9ee129c71a789848c6892551f1e778541d5834ca2bd08b93cafc9557627c0905a6318b4a347
+EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1021 BLAKE2B 32bb5339b1f4cf591485e8bade5ce90d90ddecc5394a27e72dcdabd76e38fde35831f02b16afd3813a72439a8e593ce20ae08f1554c8a48ec06f306b9f196dc9 SHA512 b1fde77e04e79084a3d55bee3c43ba0149045b9cf39bfe5945b5d7cc70fd9b1aec00747a5c6ba288102861ec7fa3e014f9e868f36842a5cc75118666a1a8f7cc
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 874 BLAKE2B d99a1965c93b221e99cdd5be5a3404412804ac525ced4e896f40b8046feceb9abc2ac3c1478bd70a08f5c09899c862bbaaf9b4bf3e1d84adc0b157b7f8045e2a SHA512 117033ae04764d176809de0d274a2c96052e63e19cb33ae2cbd8709778b0fbe3cfcae456b1b9601f134c8747d5884bc4957eeaa90cccea48af3a9c0c47478b2d
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1071 BLAKE2B fd73cad9476de4d0c5487e337ba5b64bff05ed440f771f2bb936cbad4bfa50ec715a4aa1f2d801132ec4e505bd68264bee66caf73cce8f5ff5c75b962cca574c SHA512 23d2c098fc7fa8b9d82966509d5e42d2a6d1324914b3f31911cdd2553d9a8faab90a2ad15111c80d22717b1645dcc4b768791fe08f9cac78d60fe6fb05ae9871
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 985 BLAKE2B 624784a4fb73a11f43420615d33741ce9c9af1a919f8a86bdd5e7ed4ecd2567d11c7b685e276127c3e4e91445e24207fe934f6aa5d1c739249a97e1762eacf67 SHA512 6882a142ea3e4e48e759824ec2cd29dddd1a44044bf90b43f7f3e57bd9756fa16bfa13052b2559701d9450ce5fa1972366242ce16bb17b7fd681ce1b1658b39f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
index 5850f1b5a425..2f824c9822aa 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.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
 
 inherit sgml-catalog
@@ -12,7 +12,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
index 1960bdb47f14..b04f485d7249 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.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
 
 inherit sgml-catalog
@@ -12,7 +12,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
index 22180e986bc8..a4bb0d8253d3 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.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
 
 inherit sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index 6e4004063ace..132fd3a8e202 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.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
 
 inherit sgml-catalog
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
index 757e8bc439e5..9a2ba2adfdd6 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.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
 
 inherit sgml-catalog
@@ -9,7 +9,7 @@ SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
 
 LICENSE="docbook"
 SLOT="4.1.2.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index cd4e3b07f1e5..ff19dbf96ad9 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
-EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1660 BLAKE2B 7f0e164c674c1774fc37834fc9d8f715f6eec36411030f812d137b4420ce56ad77e2d4fefe117fc6139c8bde40d1642a66f9f4a9df84e4c8834832ccd2adbc71 SHA512 6bb6e191577e120a3cacb46e66f100551d6ecc6161a9309b4c3d9010002d95d13e7371625c45bc11032af7397c7307c79b4d0ab739b081ab1fa8399bd1741fa6
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1648 BLAKE2B caed04c4c7d135bb4e50c29c357bb7d5e87fb471ca050652cd0a8f58f807bc820e991835f6cc8dadcaa66a8598558e75265ee7a25e7d4105b1e8339a2d077921 SHA512 8ad0e0d62480762974c747edd80212a152c53a839309e6e6ec5fbd02487c8c9d1a823e8e3a59ddb37b74b14c745aa73a602c3bbc0820fd5e0bcc3e614bea6972
 MISC metadata.xml 385 BLAKE2B 048351fc482c44ecc4528ba7c66f61c2103594eb0ad75559aa4174cfba98c17e9f0355456aae62429b1eaf2f92b0f17067ddcf325e331023f57e642f917f3036 SHA512 779b06691df7d5e473f854558344f4c44b1af292f107e9208c5cd501108399451da4e4210feff60088f1ae8009665569b6f96794f36930938f13c5cb65005af4
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index f5cf7149f9c3..a50b149c8f9c 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 84ed08e9e0ae..6220f987410d 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2183 BLAKE2B 0701256e7474212659c52193f4f69c1b8b7263f6777b6769d94b27da682ad09df4b9cd1a7f5e788eabffd8e6bb419bc35c30b3b9aec937674d217115f541e708 SHA512 ab2ba0bd706313745b2f3b927f1fe87e8610e2f0ea7bb0c21650679dacfb75c21b6aceb33c09876316b63ddebbd0876503c4062bffaad92a1e0a30d9538180a4
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2171 BLAKE2B a3460cf133fd7c07f942025c5e49b9d4a13ee812607a1d76b7143dd229c2a624190f8e21af0a1644a466ebe36a078f9780c05d3b792c44f799d30ddcc789578d SHA512 dd51b6361d8e9b693b74f03ab11ea527899e90fdf891a83706bbbbe01c3d70ca52f5dc3102e23dd7d380f897dfef386e46773c7842b7281243cc695ff88dd10c
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 60aad0b138b9..c2db8151735e 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 4b6d1dea3714..065fabad7b60 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
-EBUILD ghostscript-gpl-9.21.ebuild 5561 BLAKE2B 9a5e2ae6f65fcdd43a415401c7bd87331ae9819444eca276e65eb9f5ea814bd7c8e23a7240418513b8d0f3be53ac86df30e403257bcb75bbb5ac79b6b53160d3 SHA512 0e6e410f15df35ee8aeca223c01d619574bcbfefd3e3c2468e1bb2b6ef9626b4c00051050889b43aa6ffefd1d4103e21f93e7c0c8898ecec5ad79746a6d38d3a
+EBUILD ghostscript-gpl-9.21.ebuild 5549 BLAKE2B 3d6776a551543c21d05d36b0120a4ea7b9c278c13906c2dbdcd2d706dc3cd4629f3e10080cd36f76dd4b6f5dd2e1b0e54b67d4ce00de0cbfa8a3645437c33b07 SHA512 b6d3b0d5a0fe6406acdf1a8aa62f00a726b57dbaf10885dca00ea698b36ac57b53a749f13ee063d880bb7a63b01763c38ae9ddb44e2e3bd1f3db731288c7019e
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index 96684b339410..920dde9672f7 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.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 @@ SRC_URI="
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 COMMON_DEPEND="
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index feffa160306d..ea9bbfb017d6 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,3 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-EBUILD lesspipe-1.83.ebuild 1159 BLAKE2B 069fb4ca82d30afb00834874c94a28f04ab6dd5ea7ee1cb4ec95875453fc49572d145e7b23e7f8220898c440ede86b93aa781b818dab7e269bffaf833c472fc2 SHA512 6b3874a3164bd7348843d65a07d642c7a8577c76ea759616e09583532831a4d234b05488e726ef0907d845f246def99b8d0d0b94af4ca0b8831c25924c8c248c
+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.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index c775c47f0880..0340429979d4 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.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 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 5eb7ff700b8c..35be909b82d8 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,5 +1,3 @@
-DIST libexttextcat-3.4.4.tar.xz 1025376 BLAKE2B da055b0a1d981dd91cfd2ca375b2ef13a0af5c8b910eaa7144ac69708296bbda5462a44f48dd2fc1f4cad84d9c31d11f430b6ee1c390c93ba7660368317b79c0 SHA512 f1f7a4292199cb6102cc56a5338b19049664ea664adc96a67a71205fe33d6a40f68b8695825fe253427575347ab6230dce5e0b703635534f32a0f70ff001eeed
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.4.ebuild 628 BLAKE2B 6864a5be488d3d1726645a965741659c841d489c86205b3231e2efb982913846c0c9d98e68bc502c4ebefe28ddab239c13a49c5431daea08d9502f7c7c8261c6 SHA512 287bf2f5262c3e18491ea67c6bdd15767c21538c3d9be14a1cfaa156573e0d2cef14d61b1dda7580d5acecf14e0849319b30324b5c75ef71a51661f7b7d585ec
 EBUILD libexttextcat-3.4.5.ebuild 627 BLAKE2B 97651b8d5cd51c3829deb4acf933b16425f11a0ddcaa55a73d884bfe7cc9ff7e0f3170dbe5b89348dcc12126e1b98bf8ab4a3080eb7e84383c7c4419132f00f9 SHA512 d5bf418b002d17121d71d54e419f867b26583c52def6ed79323b9ec0de044f4fb6fff828d83235081e24ee322d8235e3fe6d95ca54c9a0a1b0dd975122f06c3e
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
deleted file mode 100644
index ae54c4935583..000000000000
--- a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Library implementing N-gram-based text categorization"
-HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
-SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 1c02da9f9ebb..8eed16a79984 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
-EBUILD libpaper-1.1.24-r2.ebuild 1333 BLAKE2B 653b588fec5c9d357ec98f261942fe30a8663713289c56fe289cc737942d90240c9d7ea2684aae3f4cd0ee3cf5ec39357e2d5c5da515a3377dd5143d151bdc48 SHA512 3733558af4de1f877860c7a23e8b4bf9df6d7251caf4f81745b06d4ac421c38694b4ec33e28a7190579b58f7af144ce7c62110b9f78879f069cc6c2d394929b4
-EBUILD libpaper-1.1.24_p5.ebuild 1378 BLAKE2B 53e9503dcaa9caa4af05a8e15a1d48bd6b1cc85c8533b13051979e0fd04cdee9b0737f8c4ea69f2d0085de0c866300063ad2ab56ed4b66a498c140fca8d32194 SHA512 9228a03312c917c3fdb3733ce8be2329c706637a955e91b351910aacb63dcbecbea5bfdca20e095c5afdf6265844f4c6e47697ef1643de3fbcca0a3a81dad2bc
+EBUILD libpaper-1.1.24-r2.ebuild 1321 BLAKE2B ae78fe605b383e52b84d6e7cda97550edd6ac81952c58bd2db4db526cf4f44f1c58df8d1db7e8de5579f41c1bb75ec8f439b0a4f66ea3580ccfcbac6d21caaa4 SHA512 6bcc17a87aab5fb7239a02cfcc31d0084515a7ae85feac637914f7928e682ecbcbf0fac7ac8b615ada9f78cda2099d0daf1e7d8f41ab6307367b38bd86acf21b
+EBUILD libpaper-1.1.24_p5.ebuild 1366 BLAKE2B 1e828a126bb41a8503ba16c111313dedd56649bd93aa92e545e3cd16d7d9c236b6bee3eba330c3b12fa928941651a2409adc642a4fcce6228d99bb783389998a SHA512 63d1c559f4d0e0938d4a56180756150b5808bb63aa45b16fbea9d3d5554a83316051f7c8299e76e22a7a4838ce9d302558859303fcc6728bdc71d3dcc12fb95b
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
index 5426fbe2a6a5..d64915f06f74 100644
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-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=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 2d38d6de8929..002335ee70c1 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.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://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index b3f2843de933..d9bed77b9f6b 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,6 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r6.ebuild 3595 BLAKE2B 60217be1d0661a419cebb27dc103e15658c2bfaa92c07c620ba80e9f437cfcdc11486f6537deddac8330fd2538b6fcedbe8eae69671d130e7f2d9f2a3d6a6269 SHA512 d8e93fe535681291d8b6c8c7be44b2d63265f953f914a65b598684e0b0e3a635038b521dc993dd993055001e5e339b7560c0686c57dacf60ab3678f200738924
-EBUILD openjade-1.3.2-r7.ebuild 3695 BLAKE2B e4af745b0554d89d86041afaa016eb994eb20ea3da6456c6d167cc2bcef32d6dd6c2e43121f8af3606bbe4206fb1ee8d4ca1f0e2e38bd7ba1d5947437240ce8d SHA512 b5c511f83733ffe26c005e2693dd6b0f87df9cf95d266b0ecb0057d6d6571aa403e214e361f8e14fc786765afd8cd3b4d689fc94bd9e188151c7ab4421ebb999
+EBUILD openjade-1.3.2-r6.ebuild 3583 BLAKE2B bcfafd0eefea847378ec9f2d59c85baad4e61de8afbb5a60b9ab767489866c209d8540485e68dfaa3ff80c9629f5251d7500b02ad4cb8e9b9f245b4fd039cc6e SHA512 7dc1d6abc1a3874e00d52f0837a0281b94351fd10396006608abdfd0d2531d8c81f5787a9b23a590f2834d9dafb39fc53ddcb27a16745b26a1144174dafaca45
+EBUILD openjade-1.3.2-r7.ebuild 3683 BLAKE2B 1f1aad4cc2cb15286f0fa294f6895bb1313ac37fb2f63989fc031cac97cff99d09105301f4fa7be97e5eb1fb012d3465e6edc77c4fa2634152ba29febfe43329 SHA512 f1518d0c8cbfd291eb678cdf14b8966806504edf790f62337ae7301c878a1400f4121084d40127af0c19ecf1b42024af5be8abc066814adc4f23c91b3cf1ae97
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r6.ebuild b/app-text/openjade/openjade-1.3.2-r6.ebuild
index 2f11d90edf21..5e074552dca0 100644
--- a/app-text/openjade/openjade-1.3.2-r6.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r6.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index 782e039e8a64..b6534846e1ad 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.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  # sgml-catalog inherits base, banned in 6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index f2bf72cb64fc..664cf56a7297 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,6 +1,6 @@
 AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd46086aa7000947055b800ee5955390ae4aca0d86d49646ffb965f653e4286e1e7c34a1aed6511576831d41813f9 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 2009 BLAKE2B fa968acd690d18c3afcfdff5274c58cc2f9fc63aaa995680febf1311faa1db8dfc53dab4eef8b7bee6cf62ce184681f91bf54a8c236ef488620212bab0eee7d0 SHA512 043bd3d98842f6ff9b5d794a7549a0d29314f45016b3c8d2805c373b676d934a991902c5d50830a031a05daa679ca93883147eb473fbe427d75291864371a6e9
-EBUILD opensp-1.5.2-r6.ebuild 2010 BLAKE2B 07beedf2cb021d210a2fc0d8130e10be5e7956faca8601a3c7b2f46b240913978911285d949a68fa45f23153d9957d802ea283c824e7ebff13ee4d8c210e42e7 SHA512 db6092c9dfc7570285cabf1c86a581685c662bec6c4d32a13e45694ed7e794f438da195551f556070198e33b208f27f8a3f5d201dae4a9455157e3bb4be4503c
+EBUILD opensp-1.5.2-r3.ebuild 1997 BLAKE2B 66760824972c7e779e133d964c35193484c9edc7a3650bd714d05569fb6737ea30667ac4091b8382e8c488290a9a6551ea20750d53601b00c1eedd0ca88da42a SHA512 de161bdc0b3e1a0fb5ab5a62b3cd521c60f6f7fddba6ebda86eac830db3024b592a65bab474ecf307c4eb0416c08b068ec3f790b4bd7b103068fe41e36d5e38e
+EBUILD opensp-1.5.2-r6.ebuild 1998 BLAKE2B 9ecd63986b0302a05f1fc0198cfdd5b5833ca9a975a649b4a5a0ae3e395bbbe19a921b375e27edfc0d7c54cf6c4bf33e469ec51b6b039cfe06837e3508b9437e SHA512 36e85f2af53389d6fdb66491003b2fe78f123702e8159b2ec4aaf39253d4776402994c595af546a77c4c385595d464049487b2840ecd0ec12ee7ccd42a549f7f
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index f1fb3aeba51d..7321def83d97 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-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
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="doc nls static-libs test"
 
 DEPEND="net-libs/libnsl:0=
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 717283d4b91a..bb6d63be113b 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.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://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="doc nls static-libs test"
 
 RDEPEND="
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index c439121aa6c1..4b58cdb288b6 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,5 @@
 DIST poppler-data-0.4.7.tar.gz 4182339 BLAKE2B 85a731e738cce9b6adc7c236ee5183b6494b641a20e4c823900314bfec5bc3c327ae49e35511936c0f3a6f13e25be098b24bd6a91ae04815be6a02149a636563 SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2
 DIST poppler-data-0.4.8.tar.gz 4209901 BLAKE2B ed4dc809044240141db3ec483b7fb272d976eb61febf13b3f1297b27146f8597eb6d817a799da4729192f39873226f6eae6374b86bcf4dad8cde7d0bc9388b94 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54
-EBUILD poppler-data-0.4.7.ebuild 800 BLAKE2B 2a2aa175772d541e316446eccbab380982a7b6a4705ecf42f733ef27b523f8352aba8c0abe01c392a1ee1d32aa61565a1b2ba252fd5b7788d6cd7126d9c0a024 SHA512 797cd7e233c53b67e89d5cdcb730656903ec7e053801df6b45c74acb683d0a35c4cc31c5d6c499a1b2df22424e1f336776cd1fdab87e57ca268f878e03687f3c
-EBUILD poppler-data-0.4.8.ebuild 810 BLAKE2B c1f9c6ca8b7b4cd2285c4f7918514adc09fcd3d26edc3c8073ad9e5d4c53301bf65be0d40d7a92e691ade5e271d95c974db392389a16a5c655b61c67b4fff793 SHA512 5cfa787630be77dafb333e2f94ce7613df417af7d32ba1a7675529ef9ef66e9226e2d6d2deaff232033503f59919bae98f36ce46ba628877c1d8c054f300faf6
+EBUILD poppler-data-0.4.7.ebuild 788 BLAKE2B a819c5ad946e1fa0c743d62c7528cd64ab709de1572e5da7e0dce0853229f4a44ccc38e5466823153805535b786eeb6703a4d9bc1daa68cb60de6d11fb8aea9b SHA512 016372353979ff7e03d739793bc84951367bc01d67bfda27248e17fe4065e31987c87d520eb039fc4c099107746542b6f07eed57cf51a4169d4e751606d02022
+EBUILD poppler-data-0.4.8.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
index 6a70f4a18061..5da9e309d400 100644
--- a/app-text/poppler-data/poppler-data-0.4.7.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.7.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler-data/poppler-data-0.4.8.ebuild b/app-text/poppler-data/poppler-data-0.4.8.ebuild
index 05b8cc6dab63..ecc3bd95ac2f 100644
--- a/app-text/poppler-data/poppler-data-0.4.8.ebuild
+++ b/app-text/poppler-data/poppler-data-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
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 67680d12e911..a1083403e091 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -21,8 +21,8 @@ AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78
 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
 DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
-EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484
-EBUILD poppler-0.61.1.ebuild 3868 BLAKE2B ef755c13d074fcc01a826460fc1edca0574a28c980c3c7703c44a25b0300effeb221209f8b34a19854ea39786626e244d39223b8cce416dd2b4a0021ba52675d SHA512 8dbc4c7892553589e55515622cbad3abb9b8b1933c41a9c4e54cd1dc9ce2ea0bd0e1fce97e7e00ea17a4862bdb55ef0d030b23f35d8ed2af1cde7ad6be1084a1
-EBUILD poppler-0.62.0-r1.ebuild 3560 BLAKE2B c1382fbe92062c48ca4d050d6488cf11ff92a1be4ef6e657e2b1365eba60f749b576ab0408cd8eb35120f1597021500109de56dd6b24291f9f3933957d22891a SHA512 2633b0a7b4ebdd65d4d2e6803201c41b38ac22b9ddbb8e710e3feb36ace90f876f5fffa0e6a36c0c69c4202764e8aa711b367bd4459b78a4d21b996bd0969331
-EBUILD poppler-9999.ebuild 3529 BLAKE2B 6d9fc0cebe9e50d42863645b8337347d9a30b17bdc959ff85d67c667f35626457b77e615bcb89c4d64d66de4ca127f32695d0a429370efaea4d9a92cc0fb0bdf SHA512 6e78f889d20409846cccfd6ab51f4a76b122f1932326347d9b80dac1abaf58fc16401d2805366613a24809f840c764cddde06fa30ac156d765e5003fd11f2e50
+EBUILD poppler-0.57.0-r1.ebuild 4336 BLAKE2B 1278223b785dbee353822f3b91f28cf17c33b4e34016ff1d7191453131db50c34b345e8789c9a50a0a217fb00b4666db5f6bf3239e299e6bdfcb6130fb76a660 SHA512 dcfa207b810d16af609f87485706e7242d132ac056acdf3fdee603cbd98f0c8096b76d490f0a4dcd180819ce96532a18febb83e420733ae8e35b5ed9e36ea014
+EBUILD poppler-0.61.1.ebuild 3856 BLAKE2B 31e10b8db75b10189d684affa9d6cad922305305c0528dd378d3a60753638b79ea957825ad4575ff020d75638be424615b9ae3151896959b13716e58ea956045 SHA512 d2121cea0c4e754926efce3b76d4ad2964bd3e98e50904266235631765e805813336f6ceaa1dd96f1c73dafa93a60c6f10a963b6fd4aad7e0c8d22ee0de2ee4a
+EBUILD poppler-0.62.0-r1.ebuild 3548 BLAKE2B 34b0a14ff93b0282aa400121b2f33cf808edbc4c2d785977d91e80198de3b28f0ee08fb571057f75380f2eaefa233103304c49568bceb97de1ac6f983d625a0c SHA512 c8b09dfad090980bc5a3aae31d93a445398ec7e5679abb098bce7a29e768d3a550e50e546725d43f0eca4960bce2384a5590c1e1a36570a5fee95a5d1ef56443
+EBUILD poppler-9999.ebuild 3517 BLAKE2B 3ffc4a8345489eafac51dad441671279c7ada0dc0f476dcab4eef2be083ce79f026863359cf7563e447b483148f4ea78ed58528f2a68325e5273ff851d213e6a SHA512 e7fdd6efb1207d61917d63b5e8f70f6bddd792ff2835aa421215e2ad286971661397147be0d15b68d40922919461152c11c1293254dd3ba7611275937197b8fb
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild b/app-text/poppler/poppler-0.57.0-r1.ebuild
index 080f267b477f..5d861ea5fff1 100644
--- a/app-text/poppler/poppler-0.57.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.57.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
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.61.1.ebuild b/app-text/poppler/poppler-0.61.1.ebuild
index 250e315dbb98..c4516a9b703e 100644
--- a/app-text/poppler/poppler-0.61.1.ebuild
+++ b/app-text/poppler/poppler-0.61.1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 9b19e865af5f..20927d1ee762 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a2559d99b50c..ffdf7188f772 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index f52342369474..abcc3baae436 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -6,6 +6,6 @@ DIST qpdf-7.1.0.tar.gz 7097479 BLAKE2B 0d363d9d0b3ca2873b21bacfb2002f3ffa4318484
 EBUILD qpdf-5.1.1-r1.ebuild 1316 BLAKE2B 843ad7e84eebd53fc18232207cc1701d928a69393a701b2fe5ecdade82942403d38146aab292ca96c2ec7873b604c37981c17bb8fe4e6dd6d4e982ad5d2bf259 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234
 EBUILD qpdf-5.1.3-r1.ebuild 1330 BLAKE2B e331790df4c0ec8e2491e77b1d304c064e23b222aff0a01c15dd06963e8071bf8d03a260773ad27307bf1c3dc84ddf217d5ca28a280b67ab1769500a0d0dcafe SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3
 EBUILD qpdf-6.0.0-r2.ebuild 1223 BLAKE2B 683ad52c39451760bf7a916c061710161488fbc25ee4e568901ea6e01d65938c39b0802f3859c4d5b8929dcb2df2be5143ebec5c4704d4f94ec11b90b637e9b7 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819
-EBUILD qpdf-7.0.0.ebuild 1241 BLAKE2B 979dcff333ddd78eb91a7ed74c783747c3f640c7dba886b16882ba69e0d21163ecd50cd18d7c85b93649e999f14a9abd017a5b5663bf6457d0f5212555150d20 SHA512 5c8df44aa5bea9dc0786c8dea2caf5f6983430ca3a67aa9ac3331b40030115f6fd223b025ee76c693bd4e529f46a910ca799f97a877cfa2647c6c9766f8acd9d
+EBUILD qpdf-7.0.0.ebuild 1239 BLAKE2B ad5f456b05c4e3872cbf6ba9d39239fcb8fc5c9e34d27e11fdb01de9ace2b0a9f751efffaed138306d45bb12f8652864c84e0647b2b4a38baf9b40b12ad6f966 SHA512 babf083175d1277ee20fa83a35f51159b2368c97c48b8e260faecf459ea03e37203600a906fc4befa49badf8f115116c7285a5f59bbfa9932eebacf4a21a8b02
 EBUILD qpdf-7.1.0.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index 1a93659f16ff..9f7b81b27704 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index de61cbac5e7a..056700b46710 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1851 BLAKE2B 6de4004b1234a0471c0f0ce132d0d699e4477f33c3b1619a751465887fbbedbe413782e9b1d40a07bb6b5b8ef1ab7fa185f9d718a208a5d6b4b66b619fa469da SHA512 41e5bed59f5f19e871ad4fcccbbb591c22ee37c6cb574e8dc9eb7fe8e3821481bc761718e43dfe0f4a0892d24df1f52c506a4640cd64cd73a5b787d6bae74091
+EBUILD rarian-0.8.1-r3.ebuild 1839 BLAKE2B 95966c7c6cd7b08b697b3a61c9f34a527a83e4ee68721f13367895ae9769552c7c5cbd62f8948ff49b33dad13b950598657cd3b060dfcf434b4bc05feb244903 SHA512 7d13df4ade438fce53008b79a4c1ad004add95625ecb7f4b620fdadee77515d6b52c04906ab8e3b5addd5e970d9a4e18a8323be2486530cd50faa54adfc61987
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 3352e0728408..8cb0c40ce80f 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-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
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 6667b53fee2a..c470798ba651 100644
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0.ebuild 1536 BLAKE2B 17c0ecb4a90b38ec4b40917c601c33067302d76d4582a77d50196b0409e3c5cb355e33ff2297d74f51d9ebd132bda51c738c9c27db5b0cb24c5afdaca61eb061 SHA512 ba34893ad3727668de8b47a8497beabe990e8367430f6440f4f6374bcd13571cbc005bd8d8addcc5d613c74c2a0647dfb34ecf6fc2b88ec6c6f6ca0e692cbd28
+EBUILD scrollkeeper-dtd-1.0.ebuild 1524 BLAKE2B 4cc68dac41877e9383b18c6003ac55e2a79f70047db2769c29e445f5b184cacaec9008838474b4fa0a708831cecf255a8cedadadb1da22aca54b9df84319e23c SHA512 38fc1b0f643a7ab4e60470c130f139cecdab0cf3b890a20d2ad1acac73570b8519d38d8d56c0dac7bf5c7e6d4a499cb39c9cd5137b4be8afe9b4d05a086798f2
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
index f173b2dd8842..293ac2af6647 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.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="3"
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
index 1204ef66d3c7..8c0adc544174 100644
--- a/app-text/scrollkeeper/Manifest
+++ b/app-text/scrollkeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD scrollkeeper-9999-r1.ebuild 512 BLAKE2B 9b61605df1205e9dd9a434a8b50b10b5f47f63ba064afa7f9e455de4ad6490c881de4571e0a2faedfb3f7e9f4c498b4479459a87794bbdc0a142f0ae8f262132 SHA512 660e673089f96be6a2cde8d781671d912eaa45af9672a9f303787e30bd676bda07973ae345189e90f3bc322b378e8755846eb889014b7f50944d700dc86535e0
+EBUILD scrollkeeper-9999-r1.ebuild 500 BLAKE2B c0a5b8e81bcd258da79158d0108adb0cde5b2424967c33fbcfc456a268a5b234da4710b026de8cb896ebfe4a097de44f35081f1a6e8066586cd697864ca98d66 SHA512 4a334bcb0964b8e3d3dd6a5fd5d6b1ae4be5972b5b5c646b782048e6d4e3577e5d2d381c705a887dee14b813712d06ccadb7f7c9c3f7d7961acfec11b805ca7a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
index bf2f4e36fa8f..1b0c195b188e 100644
--- a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-9999-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
 
 DESCRIPTION="Dummy scrollkeeper for testing rarian"
@@ -6,7 +6,7 @@ HOMEPAGE="https://gnome.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="=app-text/scrollkeeper-dtd-1.0"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index df6acffb8dbf..ad0a432c5392 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r6.ebuild 2492 BLAKE2B c01eaea91a3c14375fb9b4a9c13baebdb789e887d88bdc2f13da45c2e45aa7bb2d5a112974ae9670e5704822f6e5f3b47843948cdcf73cdfb7e66899acebac82 SHA512 4f27888405ea7dee650c81743efe2aff75c124c8339ea09b0a3ba72b5c9710bfb8cc0435261c2f1c576787b9093a103a08e6a0c0f60ce50ba2e83b8f1ceb3072
+EBUILD sgml-common-0.6.3-r6.ebuild 2480 BLAKE2B e1a261db3012b8844b78909f728697d3eccf32da49eb470f9ae7229aa03ce27139a6485fadbcc255265c60b2977d7079a3bd4d6826ffafb0bc55ab17414d2c00 SHA512 ce7494ba0afd2103ea55abe9598fd767f5e942cf92571a04fd22b40f30cec257be720a22e183333d82af6a3ca1f049dbb82b807c6c826374d25bcadfebd1ad91
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
index 3b696030d5bf..a72c045474d8 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=""
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 4a3a4b56bfbe..08e847ad5567 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,3 +1,3 @@
-DIST webgen-1.4.0.gem 200192 BLAKE2B 3a317fd97e72a4d2f052954df439724125345e2c2c75d280cea323b91057e46bbeeca0e24136f1deeae5f2417efe1f852cdd19ddc3c3f8547fb8dd8b7cda60a7 SHA512 4f18c247b96a159925769c44379e8fce1ff55d4a901f55e81ba102cb57b4a59c5f7428c491391f23fab4450dc3884463924274e34d4c40fe9487efbe25e4fac1
-EBUILD webgen-1.4.0.ebuild 1044 BLAKE2B 243c63f6d18c6fc33b170b5ed71b8ce1a3a2fab9563db33be4535a55ea2d7d4c2d916767b7ae26c0e44c199b4008a3b49df32e7e6b6375d3d52b2d1efbd17588 SHA512 4b7effb7539cb35a3ca8374cb264fa05ebccf374af3d9a309fc1e5e41973948f59703bcbe0c3374ccc607a9bd3ee9d386aa2c5636e048a50ea30f0a10b9ced9c
+DIST webgen-1.4.1.gem 200192 BLAKE2B b52e8bf55fa93776fcd41a35ab495c03e775bb0fb9cfa0f4882ced4556d65403724de09531f80f3b3c51809295fc1abb692b9d709bd3ac65885a22066db83736 SHA512 ee21edbaa6592496101bff5b20b4b3041ac9a313e3ce5a00118f2011797330c5e274d468d2793ca29133d4f7301eda741e25a6f135dc6e2153c04780c2f5332b
+EBUILD webgen-1.4.1.ebuild 1045 BLAKE2B 118cc61a68b0fa5606e9ba1425bd97dc87b12f3eed1247b802e76e7aabd28647fb67e68dd56d3f3511b5b3e45a2b07dbdc0d4a88938fac5bcad75126a9f12fdf SHA512 dec87296386cf1dcd4e57a613c79e166105adb4cfaf315b005bc75ae4873cea5fbf3e37e857d246f34dee4bdb11dc13c505ea98c97340de02f298458ddcbf6ae
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.4.0.ebuild b/app-text/webgen/webgen-1.4.0.ebuild
deleted file mode 100644
index a3b1e075efa2..000000000000
--- a/app-text/webgen/webgen-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
-RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template-based static website generator"
-HOMEPAGE="http://webgen.gettalong.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="builder highlight markdown"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/kramdown
-		dev-ruby/minitest:5
-		dev-ruby/rdiscount
-		>=dev-ruby/sass-3.2:0 )"
-
-ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
-	>=dev-ruby/systemu-2.5
-	>=dev-ruby/kramdown-1.3
-	builder? ( >=dev-ruby/builder-2.1.0:* )
-	highlight? ( >=dev-ruby/coderay-1.0 )
-	markdown? ( dev-ruby/maruku )"
-
-all_ruby_prepare() {
-	# Avoid a test fragile for sass version differences
-	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/webgen.1
-}
diff --git a/app-text/webgen/webgen-1.4.1.ebuild b/app-text/webgen/webgen-1.4.1.ebuild
new file mode 100644
index 000000000000..3647485b4e75
--- /dev/null
+++ b/app-text/webgen/webgen-1.4.1.ebuild
@@ -0,0 +1,43 @@
+# 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_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/kramdown
+		dev-ruby/minitest:5
+		dev-ruby/rdiscount
+		>=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+	>=dev-ruby/systemu-2.5
+	>=dev-ruby/kramdown-1.3
+	builder? ( >=dev-ruby/builder-2.1.0:* )
+	highlight? ( >=dev-ruby/coderay-1.0 )
+	markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+	# Avoid a test fragile for sass version differences
+	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/webgen.1
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index a220114ae1fe..378648ec292a 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r4.ebuild 2244 BLAKE2B 2de0b7976f3c0a2784228b32f30abf9d453729646059f5bb05ee729e48ab0eaf0257d897a083ef1e7ab2f4a4fce139203526846748e6310fa9020b85263084da SHA512 31718f3105af95a71fc688b260e7149d7fee94d8d9c3541868773407b8a130a9f19c2f693dd55c5c82b3d4f6dc4358b4f0bebe0eed62c7fe1c6c612f9ea687e3
-EBUILD xhtml1-20020801-r5.ebuild 2180 BLAKE2B f257ebd086f2f59fc286d3fe578e221799bfe13b54ffa026f0a5e4f15fcd0eb016ac00f63b5b4c1b25d357b49c99b7b434985178930455f6352b50201e8ae192 SHA512 0bba7ff7f8238383368ccffb64a7a937ff171700ec58a7528e4fd6f311ea716cb3f08c9c56eca094a3dfde4055a4da5475a07d54e75df92413db58e599dada3a
+EBUILD xhtml1-20020801-r5.ebuild 2177 BLAKE2B 0d0c33716b2f816b03713365af543835934e9112afd74c00099fb98d9013cc5b8adb0581f3e6dfd64456511cd1199352cd51dcee244acee426b3eb547ce19b55 SHA512 9b7732f5606ba95344bfe1bce64f5f3ccc7a298356b9d25f3ab6e9fa667c4f9be2f98168494c535b9226cec6c3dbf2b55a92f7681d5222fbaf7e6af0efede957
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xhtml1/xhtml1-20020801-r4.ebuild b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
deleted file mode 100644
index 457f14f5572c..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
-LICENSE="W3C"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-text/sgml-common
-	dev-libs/libxml2"
-RDEPEND=""
-
-xml_catalog_setup() {
-	CATALOG="${EROOT}etc/xml/catalog"
-	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
-	DTDDIR="${EROOT}usr/share/sgml/${PN}"
-
-	[ -x "${XMLTOOL}" ] || return 1
-
-	return 0
-}
-
-src_prepare() {
-	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-		"/usr/share/sgml/${PN}/xhtml.soc"
-
-	epatch "${FILESDIR}"/${PN}-catalog.patch
-}
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent || die "doins failed"
-	insinto /etc/sgml
-	dodoc *.pdf *.ps || die "dodoc failed"
-	dohtml *.html *.png *.css || die "dohtml failed"
-}
-
-pkg_postinst() {
-	sgml-catalog_pkg_postinst
-	xml_catalog_setup || return
-
-	einfo "Installing xhtml1 in the global XML catalog"
-
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
-		${DTDDIR}/xhtml1-strict.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
-		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
-		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
-	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-}
-
-pkg_postrm() {
-	sgml-catalog_pkg_postrm
-	xml_catalog_setup || return
-
-	if [ -d "$DTDDIR" ]; then
-		einfo "The xhtml1 data directory still exists."
-		einfo "No entries will be removed from the XML catalog."
-		return
-	fi
-
-	einfo "Removing xhtml1 from the global XML catalog"
-
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
-	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
-}
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
index a1093ba390cc..b1ffbb673296 100644
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
 LICENSE="W3C"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index f73a592887b4..d73e42d20e20 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,6 +1,6 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.26-r1.ebuild 1360 BLAKE2B 5a059a3c7e963864fa4b0410e31edc7556bf4780bf560a265630bf90c3b72fe0e0a107a75b057a45def9a26f757ef622fa419ec9ec4ed2cb1dd6cc29118308af SHA512 2ef0a60cc7f8ea950070edcfef7b6582ac4b641d1a6e1e3f4206c20ad1b254f85f48c162b0a98e7633ee736157734984c7e4e03f978357b013262f8bd8e67ca0
-EBUILD xmlto-0.0.28-r1.ebuild 1372 BLAKE2B b3c2b5934542e955978a72f1dc768658a0ae877f5e8a3f79591c91a759f55b4ea68071583bedb2c9979d6d54af5ee47c2d4551bc11e10988903eae22f5c44ac8 SHA512 a520e13daa04aedf7952859e30bdfd87c96a35e39363e1c379af6158d6f47704f0f11af766c8041340a4558dfd513b376fc48e1a41f9d446a52d9365abf5dec8
+EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
+EBUILD xmlto-0.0.28-r1.ebuild 1360 BLAKE2B 9ffe7e58938a26f59b73dfc8abc060d1e98078e5dae8d7e77adaa87977a7d13cc6a9541d672b946345705b0667f7d5472ff8507e25f39ec6241af176b02bcbee SHA512 83303264380434741e5b3897d853cf92bad11acd3ab4b11c1e8e7e7abaf5b2ea0e307eb67149536b67401d02c47481615b2f05f5fb94033a7380bce93ac38d34
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
index 7131d28dfe9f..5f0b782929a1 100644
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26-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
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index dcdf3321459f..fae031611ce3 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-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
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index b0d89824eb1f..85c32c16c4b7 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index d75c680bc564..06568faac897 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506.ebuild 604 BLAKE2B e252e535effe1012c65589c49d9ef9b582f1ea5a996410c6d01236fa97f659695890ec6599e4a065811a7725121a7c81442a5115c719b38ba77e9b2a48e9a452 SHA512 6db6a31e6b4afdaa2e4a802fcbcb30e9ccec4f3c8e04426c56c2449eb1fe3c06fb44f757b830ea214c45e387e92f534cede91c80596f2b833780edbf22b7de14
+EBUILD eselect-syntax-20070506.ebuild 592 BLAKE2B edc5b3f4135ddb874bb4c04ee0c70e0cd122c892e6c995c2146516d263ce662816c370e7b0cf0aa7954b5f612f13515cde17a9fb402e2395a1a834a8211b3c8b SHA512 279dc5c87a22e15f070298489617031530cf0a7d4da321017355dd44a447ebaec37faa33fb705b68166541332446f5c852cd2ce787a06a18cf925c7c960fc7d5
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
index f3a308afbc65..f67872985ab7 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506.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 eutils vim-plugin
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 39ac9a94ed36..046389ae65da 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd
 DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5
-EBUILD gentoo-syntax-20160530.ebuild 1820 BLAKE2B eabdcb7fbc25268799eb049c11a7ac6a489de50040c57827c73003352fdcce106ae55ee57e852b83304c80123ca0b71097efb6b4d07f3f98b79626997869c6c8 SHA512 5c63d97c5ad6e25008f538354ad713addff603f143744ce1e29a97e52734613b655f0e42b91cb1b612edabbac02f85033378596a854b3d21ef61b3da2087d9f6
-EBUILD gentoo-syntax-20170225.ebuild 1836 BLAKE2B c521e9949cca70d5f703b205427eaca56634b08cb53ced075943d89ffaf2b74f2a5a8309b60cd443542c142b1f43293ede9c15b73d0be4e04bfa9356088cb7b2 SHA512 c07cf07fd077c16843a72d58bb2ca7b126da3a84aa3e6cbe680678a2a4eb95a9f4bb3daf5556d08b91f83ea0f1bb082d406a0e2fcc2c1c03b816928e438faf6f
-EBUILD gentoo-syntax-99999999.ebuild 1833 BLAKE2B 8bd9926b0f6a9e44d23ac64c8fdde9e1dc65c3345e9822c58bea5bc1366a585a495872bfdb95b9d9dfe5bf49ba7b380d2015c3e8673e3743bfbd5b5bcf618491 SHA512 f224fd65fbf85b7c6b5a6d23731fb2d492e1d5322035025d05eb536a868ae8bb03818c2cbd439ecf5f465d18cc960973bdf84511af121af8505a6b31e675a07b
+EBUILD gentoo-syntax-20160530.ebuild 1808 BLAKE2B af7306c5b7ad151ef2da28bac70168ba6a2b0dd943fec7566b9392517ec04a851b5aa0fbea0c3cb355e9d2a79dbea352fa01d31cc8291db7a7bde5ff9a206387 SHA512 24f5f1a13094fa7afbad40c681270f867c6e9459b3558ed27c26a2664ba59f71b6f3dc34e142553f028cf1735577e6bdac6aecb030661af51faea237f2316e91
+EBUILD gentoo-syntax-20170225.ebuild 1824 BLAKE2B 95d0945041f716aabc8bee32993d5f13a7993159e749c116cf569d902663eec4f15a9a28a7a093c50df9dc97fd226c3de780541e8892f31e521d670ec0da2d5b SHA512 8d7343b86ea4ee5c9ab746c54b41771653abe18a7e29fab9e562ee0087087052cd1efce91a71d1d9ea4c0a9e8e4e181f52d0ebda0ce2e2791ee0fe0b7ef63c7d
+EBUILD gentoo-syntax-99999999.ebuild 1821 BLAKE2B 053b56d56693edde23a99b4f6fe0cd557b3bea9eba17523973a03e44f688ce17de67b5b76bd02756e6c156d48581af4e030056ed9088c0924c863e5692a6d364 SHA512 e56de9ddd61e1ac75b1f0c74da57689d999b93a30394dcfaf178ae90e59040298b4d8f9b31d7937ede740fde798aadac324912613602dafd8f20e9706a471fb5
 MISC metadata.xml 446 BLAKE2B 63902fa0fb1552a989ee9d53d36b535802ac65b468be2b74c472ae655107ca9de2695c1dd51ec98ebecda9c437caf32892560792d399a26c3814f0208212e7cc SHA512 2dc59075bad043ed183529af7484ab54e718774c275ce38e3b96af6b0461b8cf8d704dbcf37cb4aa7fb9dce2db3eb62075ff984ad7ac11fedf3f0bd2a582635c
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
index 601277b128f6..8d1a5d52296a 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
index 971f4b78aac2..2013082d6b0b 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
index 1d2447708cfc..1e9dad4bb4e4 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
diff --git a/app-vim/pam-syntax/Manifest b/app-vim/pam-syntax/Manifest
index 6b35603f2198..f48142652d57 100644
--- a/app-vim/pam-syntax/Manifest
+++ b/app-vim/pam-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST pam-syntax-20060424.tar.bz2 2803 BLAKE2B bc1587cbde544a87051fa59dfff31428d415a57d153f2837f5c05070ec1b18596be1980de0a0e3d61d5da9592e474fdcbf6e43741c63e914fef01f728a731358 SHA512 750028c153111ffdc9472b333375ad8d6312262fb1c8c7ac8563207d11e36ab885bb6ef341a39d59f5e980b69110c35166fa6eeca3a6093b0328ee2c58cf09e0
-EBUILD pam-syntax-20060424.ebuild 490 BLAKE2B 8d4892f138b7fab93f3b3d686f484d0dd14eed036b5bab433e10fa8c513ceffb3f8e301a01fd238ab815c7fd05e41cd047365d0918d4d3d9baa755e0961122e1 SHA512 e7cb9aeb9f24f3884ef6ffafc93c1a15010fcdee56ea2d86d9539d59da53717fee0e66af9031d6ef2a4e9ddc73d245b1ce2c936719cab4e20387a71d4268c00c
+EBUILD pam-syntax-20060424.ebuild 478 BLAKE2B d6002f331b0dc059a9d3388c723a1c0ea503e01f4ae8308e630b496e41d6d91306f027ae72f7d842a7b91745abbc60f27ed8d170b61e67817bbe4880872007bf SHA512 a0dac7b9a7c481c6805943eec469d85a8b7a42acf286aa858f073bc159df5d0f9e5bcc88838b29c3d692643043a51dc3405b962c8768ac52b22e128769a50e22
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pam-syntax/pam-syntax-20060424.ebuild b/app-vim/pam-syntax/pam-syntax-20060424.ebuild
index cb4a2d655ad1..68665a6fb052 100644
--- a/app-vim/pam-syntax/pam-syntax-20060424.ebuild
+++ b/app-vim/pam-syntax/pam-syntax-20060424.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 vim-plugin
@@ -7,7 +7,7 @@ DESCRIPTION="vim plugin: PAM configuration syntax highlighting"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=735"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/rust-vim/Manifest b/app-vim/rust-vim/Manifest
index af5e85f7d9bd..002dd3435297 100644
--- a/app-vim/rust-vim/Manifest
+++ b/app-vim/rust-vim/Manifest
@@ -1,5 +1,3 @@
-DIST rust-vim-1_pre20160829.tar.gz 23801 BLAKE2B 537375d70662af47b765e126d94829e12514177554dc5c2921d5def795e8dda120a9d327ce1b86760151c6954a42cf9a4548bb1ab211487d965971fba63e253e SHA512 bfd9290f03f3fb0ffccbc1d78f9e37c5d3ca57379f0b505e84b445105bd5a011f623f402d35407a634eaef4db9ad3fea68517057aa4d84e99206bc99067daa3d
-DIST rust-vim-1_pre20161204.tar.gz 23759 BLAKE2B e7910026f53f514479a4b562292dbb5a8d4f4ac286f9979ca61588c7fadd1d598096379d56c3a0693ec04c1fbb742ad3b200339683a2d8f9e7f9d54d23c1d4a7 SHA512 2b0ef5ae8df7ab244bfb97e04116a6f25c210d3736c7f78324c41fa44ec92562615d466bfb45de7a9239a2675c2212dfb88e951d3054e68633803a162512cba3
-EBUILD rust-vim-1_pre20160829.ebuild 436 BLAKE2B a691d93e1c810020113c43ff00c114042159e121137d26c2386d016cfe7c9e616050a329a82beadb42a8f5092204715ec387732488f337a9f325a9fcd9c48e54 SHA512 84fd5b6812889e6da86c1258781b1a384babbc41f781bc681e32c93ae1bcbb441bb577c3954ef0cd42075831d6003ad0abfef0b70c568d76289a9455f9ba3834
-EBUILD rust-vim-1_pre20161204.ebuild 436 BLAKE2B 05cad363a9e53aa2140a7ccb0d72792732a7e85e0fa9e449e1c5a65cce86fe9bcd9bc6b62c221c1e49e7d276574e7751f08cf17ecf290b5c1b4efe1c1b2fafa3 SHA512 85b8f8fff03a921b3a08c26a0ae820d6a08638030567bd37b7fbe4126d0bf2cabe4110b1317e41372aaee2bd55ca20e5f7bf8ff1c94e624c5f9d84210265e6d8
+DIST rust-vim-1_pre20180125.tar.gz 24497 BLAKE2B b6c45074aba1c52b2f3e96a15f05abb64bde864af3c5b2b61ddf237183426c67d5b3b4dacd78ee4f394d9f0411362186889df9a24e50edd350aaa1178f93bd59 SHA512 845899ad5ba753e2efd3deddcb077749f094163b9923574e34a8edb5d5d0772929315f4f2452f8238f832c2fd4cfa669ab1351df17c74ed2e6cacc783b071ffd
+EBUILD rust-vim-1_pre20180125.ebuild 436 BLAKE2B 822b6e4ac8b06cea2a12b3dce1b15453d295d92fddb425f17b5f7039ce61531e1ef2577978bca164acf3d2bec34c8cc40bfff96bb237f842f8b0b9903e69bd36 SHA512 93a13f9a0361b300c0f6af81584bc20dc381bf8c010bc8510e17ce8a61fd96cac71ba38033564c357a265536c130fef8b7c2525ae33ee491b2985df4b684c300
 MISC metadata.xml 466 BLAKE2B 7670303d76161c05828cb3ee7b349cb52ad02014dbbcec5887baad9ec2e1f53e2f388aa5782e3182a5478f64ac31afa5394e52f46539d4451adb9842a2655946 SHA512 c5f50d3f28ebd55380e26b349a3410eff3aef28f37a42174c018fb49e37aaafa17021d73fc02503c8ee7482536a8b18ee8b75e4eeaf6ea1d1dfa58530e283307
diff --git a/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild b/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild
deleted file mode 100644
index dd71f623c568..000000000000
--- a/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin vcs-snapshot
-
-MY_PN="${PN/-/.}"
-REF="fc11d02fee330df7b30c83a80f09dd0c60ab43ce"
-
-DESCRIPTION="Vim configuration for Rust"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild b/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild
deleted file mode 100644
index ca93837d63dc..000000000000
--- a/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin vcs-snapshot
-
-MY_PN="${PN/-/.}"
-REF="eed97e75117faaf210cb6103cf39a797fe21bfbe"
-
-DESCRIPTION="Vim configuration for Rust"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild b/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild
new file mode 100644
index 000000000000..41a3397d2ccc
--- /dev/null
+++ b/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="${PN/-/.}"
+REF="8e75da9834abb22f8d7ece3f4ca4324a14fa18a6"
+
+DESCRIPTION="Vim configuration for Rust"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/securemodelines/Manifest b/app-vim/securemodelines/Manifest
index 5eb92933a0b4..2f6c52ae952e 100644
--- a/app-vim/securemodelines/Manifest
+++ b/app-vim/securemodelines/Manifest
@@ -1,3 +1,3 @@
 DIST securemodelines-20140926.tar.bz2 1562 BLAKE2B 14b58973e25eb91970f62733840a8db20680cc57266e68129d6a490fac970951044a350d936e497797892bf428de737226c9c57c986de5816c0e771bc65418e0 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35
-EBUILD securemodelines-20140926.ebuild 526 BLAKE2B c94417e57d3b4dfbb20fff7dfb25203df051d79b37126a61df73398493ab8c6bb080e523b2d7c5ec118d7353e71533b89899a060f20a63a5519ce259c0ba3b9d SHA512 3933237c8661e98075bd6a71ffc1ab2d935299e83c6545a1b48960d0d2ca23f49365735e2d10332a168ce2786fbd1acbcea898b26fb9118d7cf8db917925216d
+EBUILD securemodelines-20140926.ebuild 514 BLAKE2B 6c0eb328ad87507509f51adef39dd37a10424b29f159ee8126939d33d8af3e02d1f823316c717d2f58565611316f9975fd25cca081bf881d5556e630a82f11ac SHA512 75e6679320aa3e27304518d2bdc25bd94653467e22f08ec9032db126416a7a496240334ef931bdff6e938dbfc374b619943373558e112554ad71ee489dcd238a
 MISC metadata.xml 621 BLAKE2B 1917398769758c657f0975c986e7ee09056ad2a87782a47523bcc558a2ac1644da90c8310add6e86b29c697264ef817f2bb6f08738cb9df3668a9ed13d416bb2 SHA512 ca9e3cce0633bacbb643201bc746e9c6397e9803c6b6c717c1a6e8fd2582e85e61f9fe7c8ea3ea575de6150ded96a0d26ce0fb6ac973884c37c19ce28ded9204
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
index dc217ecf0e85..7a1cf507ab1b 100644
--- a/app-vim/securemodelines/securemodelines-20140926.ebuild
+++ b/app-vim/securemodelines/securemodelines-20140926.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
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: secure, user-configurable modeline support"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
 LICENSE="vim"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
 enabled it in your .vimrc."
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 32eca40e7f85..48f75a388341 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
 DIST vim-tmux-3.0.0.zip 12713 BLAKE2B 11b2aa2a3a2da98d1977023b42063dd66ffc330894e76284699a0988d94d373116606decc4505b739ecf9454261bec43f9f88ada1196a1050320788709aebc99 SHA512 d6bc94c34ab32608610fdfffc3a3522b6056b3b61dd3cb9c63a71cb20d1597954aec65a06c5ce22352731d4e70b6a239ca5f303427182cce93324042b7f10c8c
-EBUILD vim-tmux-3.0.0.ebuild 538 BLAKE2B 6e68f28cbc20557eec72356f4fd6784ed8aed65f8fc0e12ca6fb0ba30f382822229f4508af24c729652e06e79806aaff0e8190f9d5a35c8691a8e47621fb24dc SHA512 58af16f82a16436e2c993d342666a8cfd2d05728081f7aea53b9c5b22346a83c0d8aeb07637c044678e16904622913ed93369e49018fbfd47199c7941e90339a
+EBUILD vim-tmux-3.0.0.ebuild 550 BLAKE2B 4bb9e8bae67b1efb7436f47b4e03a12e443c3fe9ef37d6401c02c1bba22ce0d971df5c2eaeecf24573c5d94ab6c5f1e627177385645c9f7f9a5aee12d5479e1c SHA512 02a20074f86728ae0e47b79649562158385fc3fa5aeb0dadb4efdda5ffc6901a3044b4cc1e568d8ac142b196bc4a67b0936545d3e62ff204f8d200ac5965a027
 MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 21c876b7995e..3694ce4b6ad6 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.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
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
 SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.zip -> ${P}.zip"
 LICENSE="vim.org"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
 # Bug 603526.
 # Remove this line once this version is marked stable
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 99f663610a00..5942ce93b16c 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 244d98241783..42ad7cadeedd 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,6 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
 DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
-EBUILD aws-2016.ebuild 1063 BLAKE2B 8740045c5cc3080020201210ec47cb3d534375cf34252cc8bd224beeadb61abad46458d9c8d3344a5b93678be076221cfb960f899098a62b182e0f1b5d7b7f35 SHA512 4ff9923478be7c849cd4dce904c44ff228e2e66d188f732e61930af8b9a7cdd592b5de788cdce602e6bcb240706caf9a98948436dbc2d288433476e29425d41d
-EBUILD aws-2017.ebuild 1070 BLAKE2B 73b9197184d9975165048ffa6650ca0b0bc05c96e2a960bc150e0575f148f19dee1ce0f8f113c0898c6346dff1967020ab3a4d3912a427f3351b22df118f8665 SHA512 e1d2dcd204465fbffec546df8ee7fed6e7ec72cfd01ae163d93de0de025c49b5dd6cdb3bbda8fb4222389ee882e2e37715401dac2a637ee098f8ffbc3085fd46
+EBUILD aws-2016.ebuild 1068 BLAKE2B 18daa6c3e03eec724aa91a9c915530db708651b975e803b37b65c3426b20389b81b33203bc8095de269861804185fbd22b8296a845ef9d2f971aa3b1149ea864 SHA512 0d3eb5c5879c3d4ecfd0a8529c59e2999ad6fc76a6604fb88f6e76bb6d42a20ce953af14717fb2da59ed4eeeded14c57cb09259d4d65bfb71eb1f5d9aff30fdf
+EBUILD aws-2017.ebuild 1075 BLAKE2B 88126d8f186c6363ffd00d4ed2cd020b767339bef3ade2913d6bc6e4b81363f207f5558f3a6ecd9826bcb209e28e9b8201ce67d3280436d9aa3c53ebeb167ad9 SHA512 0e4ff02f6aa2fdd6cc97b0e8473ddbb8e3caa61ca249683643db545d739041c9b901977fc97e5a8688487b9eb8ef2f427aea5e4fa7669282044a4953e2c0ff72
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index e0d114382774..61bfe3b8ff8c 100644
--- a/dev-ada/aws/aws-2016.ebuild
+++ b/dev-ada/aws/aws-2016.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
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+gnat_2016 gnat_2017"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 919248e920a4..ddae3fbd89b2 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.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 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnat_2016 +gnat_2017"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 1295a74e6495..118af85fbd03 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,5 +3,5 @@ AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c0759
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 EBUILD libgpr-2016.ebuild 1168 BLAKE2B dfb30003c3f2ff033c0748dd62c7b2236804050c9cae7e76a83cf2bc02b92bb447b28a9b0102e7399427cf89ead48bd17ed381f4afe5ad4c8aa015b5457f5cc6 SHA512 7b8eb381deb93b476d661e01b36a19314a2c75e811a38c6471a97c70ee3ab7305c90cb402ac9772c80063dda640893effef7d1d8b7a7b43992b061fada97d00c
-EBUILD libgpr-2017.ebuild 1549 BLAKE2B ef7ed848ecccd7cc7d53437c859ef066fa80aa3af7e0190a6cb47ae5595ade408f40e696ed159862e0d6073a67cfd8db8eefc3654c0a9747522101ef61fd8a59 SHA512 68f2ded303465eef392a550e540a58b7aca5ce8e82727cc4db30d1f99c7571942f5e8a8619c6ddb701c8bab7b2d4cf3fdf37bf2583c91a912e541e05fb641363
+EBUILD libgpr-2017.ebuild 1554 BLAKE2B 04d24fbbb0b4476dd6ffa00a9b4c54706e4f1786e0b8574085726541f573635111250d78b15e807449145d2796e5d6dbe9f72f0db7e71aff08759b478b6124fc SHA512 b32b7cb469b338557f8672f624f20dc18f8e3be38eaf51d741b98a2ec29cc88a2b5197876c6ee5506968636bb7ab543edbefe474576d859ddcc157c0b15e9484
 MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index 333c21736a07..1c5295b68c91 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.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 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
 
-RDEPEND="dev-ada/xmlada[static,gnat_2016=,gnat_2017=]
+RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 DEPEND="${RDEPEND}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 1dd5088f0fea..acc35af7804c 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,4 @@
 AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2017.ebuild 2005 BLAKE2B ef14d181496c26de1ebe71cf496830ea75015c816ee6b28fcb8d60c40cb8c8cc78ba6ae446f79ab8ff16abb47801ce4830142af0b603f53e0fd365161c0e9d99 SHA512 81a6efd7a7959958f496e8d3e5a73bdcce62c995f2bdbeb11d6b95c424421317492feb6f028355336e991052366074e609550184882da73bc98b4d812cf69ff4
-MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
+EBUILD xmlada-2017.ebuild 2117 BLAKE2B 663d3c4733de28834c2d88a4bab9e0ce2ae481c2413cbf20c434b7da3cfc54ab5353bd04e59f4db64c6e74bb4370355817857b090e82445406727a13d746abb2 SHA512 5ae386913ad0a71d7b69768ef566d831ba2e8a432eebbcc3138c91133fb408e7c5b9167671d4244967a38e3e4c28e4fea04bf88a48fab74eea785cba6afc61e7
+MISC metadata.xml 1075 BLAKE2B f22c55f2e3e81e0284911b281ae3db216682681bada1b3fe2756bf1e3ef85ebf82dfbbfc302657da1914078c56197f179d9f2d0dfe74bd6e61206057543950d2 SHA512 8a290180597185d3f42ecbb09d4d18512a88ffccbc413e5346bf310ab340d927f90db35c574de1eebb87431c8892a04cf96d731a9ab20846a2343ada24e40797
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 6a0e93a661fe..a31a912b0055 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="shared">Build shared library</flag>
-		<flag name="static">Build static library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 04b53bcdf500..c13e8f5859ba 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.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
@@ -15,8 +15,8 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
-REQUIRED_USE="|| ( shared static static-pic )
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 )"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -41,11 +41,12 @@ src_compile () {
 	if use shared; then
 		build relocatable
 	fi
-	for kind in static static-pic; do
-		if use ${kind}; then
-			build ${kind}
-		fi
-	done
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
 }
 
 src_test() {
@@ -64,7 +65,10 @@ src_install () {
 		done
 	}
 
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake PROCESSORS=$(makeopts_jobs) install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
@@ -75,11 +79,12 @@ src_install () {
 		if use shared; then
 			fix_install ${dir} relocatable
 		fi
-		for kind in static static-pic; do
-			if use ${kind}; then
-				fix_install ${dir} ${kind}
-			fi
-		done
+		if use static-libs; then
+			fix_install ${dir} static
+		fi
+		if use static-pic; then
+			fix_install ${dir} static-pic
+		fi
 	done
 	einstalldocs
 	dodoc xmlada-roadmap.txt
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 687f8ee71e2c..bbe6af4c6029 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 5f46fe73f13c..dbc6dd1b5ac8 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,9 +1,7 @@
 AUX eigen-3.2.7-adaolc-backport.patch 1192 BLAKE2B 92be1ae6f4310a8b6b7ffce4f24711543ff67918fc3950c505d385138e175db8fbef7d5c49b44c2ef02efcaa665ddc71d4d096865fd85f5a76d7beae7aa984f7 SHA512 49aa6b1e85572d6a589cf44e21367e6e107bec3721bca50ce7477eb81d39fa43b68d67e28890a933f34aa7abdbb3a6e09eb3519c03b734875c7a4ad8ed0f8b45
 AUX eigen-3.2.7-pastix-5.2-backport.patch 1893 BLAKE2B 4b192d74f12f579afd8ea1574a8219daa0a4b266981470f10285d3b9f2520b2e6d0117f343ef42ac5a73a4ef11db74d177ea8f3294d64b8bab1c620e49664402 SHA512 8d5a05dc707c08161895fc566b94b38d8e190869178f1e89a616062e81f2c1e8b4b05461b3e962671f5338b14bec474ff539da054f22af74c53187e0194aeee1
-DIST eigen-2.0.17.tar.bz2 367890 BLAKE2B 583626a51d07b7292a8f6a895754f05f353930821ea6dba7696ec7eb45fd3dc53f96faaa5b4c53cff8ff155d6beb30cc27a21f33eefda11cdcc0f866b37fb6fd SHA512 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72
 DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100
 DIST eigen-3.3.3.tar.bz2 1642001 BLAKE2B 51d870a6bf04865c39642205ac8e12fd638e1d383fb33b064835ce4b5a4d4b056507c1a4fc65d9e665bf659ffd742179415caccac27c203c9388ca267e29e802 SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3
-EBUILD eigen-2.0.17.ebuild 1356 BLAKE2B 93d7d98346a59187fffcfed748a41fbddeb1a52c2c1c9d7a1946f767e42c63f834c05da45dd2f1aa41d91cc4265713674d22b0277a68e609fc5ab91079f49c45 SHA512 142e42c213ddd740d7e43e91dbf9ffb957f379fbf996e3f33b3d4d2050ea5b3d67d09d5180364c37eb1da583ba5634206aaa6da0063a64f8c29b847d8a73cce4
-EBUILD eigen-3.2.8-r2.ebuild 2546 BLAKE2B e461a7c52aea2f330b76b16ff3e1d8e0ea25f4d48d7e05c14fc4df3d3284fc17acf3c834e57979f68fe6de53addc3c3fe2d869563c4dd6945e7dbfdb16f7f235 SHA512 b6879c780252842d486ee347bdaea5fc77e7f7ec98c10cb8f6d0060145a607fe3486daaf5102aed99f221b20a05a1caba9c0c8fe066a13ff68f10f638cb16bc0
-EBUILD eigen-3.3.3.ebuild 2142 BLAKE2B 7f0bfe0148e1f4330e475c97295eac36aa50bcecd8c8b140ffd0a63d42229bf70420a4d0b30d84a4c112b4298388df9ab3a3903d74e87fd8ba06cd6172736e8c SHA512 6ab4b28b44512424b11d43d1dcd4c004010a959bb233ad0f876f82a14fa808490514e631d3c394c3da84ce230eba8c6d85b6b7e110e5d52c8d4d835ff59e6b58
+EBUILD eigen-3.2.8-r2.ebuild 2551 BLAKE2B c2a476ae39ba11db622357f3a650fd718966080931d408c02fb490c18d28db1fb99cd0c64a46df21ef4b29b6888d2d71f4b3d4b156e5b968474d813333d59d19 SHA512 5ef223e8b54cb73efd3ab42eb3e8630834b6fa04078f78db753a9b8ffa4fe968f6f39d65cf6244b04d58c874228d322fe35d5ca80d7f9de1b79106ccac9b3fc2
+EBUILD eigen-3.3.3.ebuild 2147 BLAKE2B 3ce3d04c837491c00f435acf3f3c728ed0d63f39bbfe72b30ebe6bf3565cf074050679657eed9a966606d9b8b93971c4f9ec8a49c2114a75808f1e5c746c733d SHA512 72ca1c975abb1fc78b105d79a534790013b3a58a60cba281261beadb95af1fc009ffd0d87860b169325abea98321b6ec13b9d0a9c9427c2d40ed9663cff2a660
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-2.0.17.ebuild b/dev-cpp/eigen/eigen-2.0.17.ebuild
deleted file mode 100644
index 842c54187eb2..000000000000
--- a/dev-cpp/eigen/eigen-2.0.17.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
-
-inherit cmake-utils
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples test"
-# bugs 426236, 455460, 467288
-RESTRICT="test"
-
-RDEPEND="
-	examples? (
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	!dev-cpp/eigen:0"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	mv ${PN}* ${P} || die
-}
-
-src_configure() {
-	# benchmarks (BTL) brings up a damn load of external deps including fortran
-	# library hangs up complete compilation proccess, test later
-	local mycmakeargs=(
-		-DEIGEN_BUILD_LIB=OFF
-		-DEIGEN_BUILD_BTL=OFF
-		-DEIGEN_BUILD_PKGCONFIG=ON
-		-DEIGEN_BUILD_DEMOS=$(usex examples)
-		-DEIGEN_BUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-
-	if use doc; then
-		cmake-utils_src_compile -j1 doc
-		HTML_DOCS=( "${BUILD_DIR}"/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install -j1
-
-	if use examples; then
-		cd "${BUILD_DIR}"/demos || die
-		dobin mandelbrot/mandelbrot opengl/quaternion_demo
-	fi
-}
diff --git a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
index 8873a615661f..1d562fa4bbed 100644
--- a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.8-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
@@ -38,7 +38,6 @@ DEPEND="
 		sci-libs/scotch
 		sci-libs/spqr
 		sci-libs/superlu
-		dev-qt/qtcore:4
 		virtual/opengl
 		virtual/pkgconfig
 	)
@@ -86,6 +85,7 @@ src_compile() {
 src_test() {
 	local mycmakeargs=(
 		-DEIGEN_BUILD_TESTS=ON
+		-DEIGEN_TEST_NOQT=ON
 		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
 		-DEIGEN_TEST_OPENMP="$(usex openmp)"
 		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
diff --git a/dev-cpp/eigen/eigen-3.3.3.ebuild b/dev-cpp/eigen/eigen-3.3.3.ebuild
index 77378a727f22..f8ece584d568 100644
--- a/dev-cpp/eigen/eigen-3.3.3.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.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
@@ -32,7 +32,6 @@ DEPEND="
 		sci-libs/scotch
 		sci-libs/spqr
 		sci-libs/superlu
-		dev-qt/qtcore:4
 		virtual/opengl
 		virtual/pkgconfig
 		cuda? ( dev-util/nvidia-cuda-toolkit )
@@ -77,6 +76,7 @@ src_compile() {
 
 src_test() {
 	local mycmakeargs=(
+		-DEIGEN_TEST_NOQT=ON
 		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
 		-DEIGEN_TEST_CXX11="$(usex c++11)"
 		-DEIGEN_TEST_CUDA="$(usex cuda)"
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
deleted file mode 100644
index 54f49c530a46..000000000000
--- a/dev-cpp/gsl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gsl-0_pre20180108-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
-DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
-EBUILD gsl-0_pre20180108.ebuild 693 BLAKE2B c4bd89221cf43635a9531cc42537a18258aa1013ca14914de6442534543c04c74e82ea99a75cfe300dead36bc48cfff53e9e51cc2171bf893070c8e06df94680 SHA512 5be04db011e6cf768f1922846a8594d0179678b8155be68560065bde96e028ce5dea1235d175b9b327f72252b8a8f9df0c56a5bf5d394281cae5987d74420686
-MISC metadata.xml 532 BLAKE2B ed7921df36553a0104d453583f96796d9b0c4cf1d45364fa0e9a8a7054e847f32056e3726b0f7c9e036cff0f31d53015d37219049a45547e0787722c4be65fdb SHA512 7a1971470483fe40c26cf6576db01ee90af3fd0818d6605b0b1b6ac9f09e1379382bccdcc37ab351fbeae3b6e7760dd06af21341ceaa212025fc58162b75c1c1
diff --git a/dev-cpp/gsl/gsl-0_pre20180108.ebuild b/dev-cpp/gsl/gsl-0_pre20180108.ebuild
deleted file mode 100644
index 95ee05e9cd36..000000000000
--- a/dev-cpp/gsl/gsl-0_pre20180108.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Guideline Support Library implementation by Microsoft"
-HOMEPAGE="https://github.com/Microsoft/GSL"
-SRC_URI="https://github.com/Microsoft/${PN}/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# header only library
-RDEPEND=""
-DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use_system_catch-636828.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSL_TEST=$(usex test)
-		-DFORCE_SYSTEM_CATCH=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
deleted file mode 100644
index b1f7b8de77fb..000000000000
--- a/dev-cpp/gsl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@taujhe.de</email>
-		<name>Jan Henke</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>Microsoft's implmentation of the Guideline Support Library.</longdescription>
-	<upstream>
-		<remote-id type="github">Microsoft/GSL</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index f04b8505fc4d..7afb0304dc0e 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,4 +1,4 @@
 AUX lucene++-3.0.7-boost-1.58.patch 1149 BLAKE2B 0021a7a27caabb92232adb42c7b1e8d4832902954018be4bf89e2765562e1e26cc29a67dc75be82f9d2ca7dfddd1e137fc742850d6707527da04574f2b1bbac9 SHA512 7fd0089895ab77da158a49510241fdc894bd3d30f7a6691ddc230f4d52631ec9222a04e13ef0a118f7838b4320fd313502f635c8f0827ba5bb4c6169fdd404b9
 DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
-EBUILD lucene++-3.0.7.ebuild 813 BLAKE2B a0ef82ca4c6a5d5b6a1319e5308fe1c71785bab000356e5cd39e5df38b16e61cc66b7950ab5fa007fda31e3aa7bad870ff9005696c7bcd23556e46b22a3b6aaa SHA512 9e92ec151c823381bf8ed2648d5be7f90cc73fbf1fbd1aa73980fc738fe19ce10ce200df713e8cc4d766b27c74093b4d379c91731d7267549c7cd3dadbeb4fbd
+EBUILD lucene++-3.0.7.ebuild 812 BLAKE2B 537e6c3af01a963190e0e33f007591757bffccb352b58a8e2f03cea18ed2c7958e0a21abe4ad8bbfead786e0e624d2c578cc4471b44fd8312980fe0e417e9882 SHA512 a587ae10c32e1c0f3b562a691ca31950bed697cf0aaba0594b37451db083e909d9b79a5a68d1664dd15666803f6b215e6a7ec5e97e4f64c997458d7e330c176b
 MISC metadata.xml 339 BLAKE2B e503e6597ab8a20f9cb8613a4a4b7be729dd84d664b03fefa4cebe16da9adbea68de1adabf0055934815a70abfbdcd8f7603c7b7ff4a75bf8fac7973790a7412 SHA512 8864d26ad6eb0c9e565932a3f9a0e28e0e86c51998136e9ff56c2ef3fe0e7eb78bcc5d3b7a5e3acdbd0a89f3cf335e2af837a1ed3f0e492db42492e5a85eac26
diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
index 75e282e5ff4a..9f00187a3ea6 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7.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="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
 
 LICENSE="|| ( LGPL-3 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
 IUSE="debug"
 
 DEPEND="dev-libs/boost:="
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
new file mode 100644
index 000000000000..11dfe384b90b
--- /dev/null
+++ b/dev-cpp/ms-gsl/Manifest
@@ -0,0 +1,4 @@
+AUX gsl-0_pre20180108-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
+DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
+EBUILD ms-gsl-0_pre20180108.ebuild 691 BLAKE2B f9aad64c668fc74cb94d419dd3cc607ad3255a165a826b3033c387d96b83bd346dd4a7825da5c800f5fc64ba3d1f286cf57044cb347ac93365f14b778cc007ae SHA512 59dd335079191e874c5580183e57bcd02381deb3395716fe6bce126ddeb9674ac1f81ea947872e3eee6dfbafe21430d063f3a00e6cc5b527cd8d5106f049b52d
+MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
index 12d92605dda8..12d92605dda8 100644
--- a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
+++ b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
diff --git a/dev-cpp/ms-gsl/metadata.xml b/dev-cpp/ms-gsl/metadata.xml
new file mode 100644
index 000000000000..7b3ec3f962e5
--- /dev/null
+++ b/dev-cpp/ms-gsl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Microsoft's implmentation of the Guidelines Support Library.</longdescription>
+	<upstream>
+		<remote-id type="github">Microsoft/GSL</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
new file mode 100644
index 000000000000..1bfdc9e3c5a0
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/gsl/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-use_system_catch-636828.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+		-DFORCE_SYSTEM_CATCH=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 258ce969f28f..6e009cea3163 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index fe875f78fae1..611f3c661fd1 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -7,9 +7,13 @@ AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10
 DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
 DIST etcd-3.2.13.tar.gz 3047049 BLAKE2B f0ac987aef60fcc28636cfb60d5f4e00daee29a3d5167900599760090c3fa3d7932abb6224df5fb66ea5bdbc29a9ce7f7263a0e81522853ab190be94a6551ebc SHA512 4f3c5856ecf9e8a725d0ef80bb584e7b2edaf7215635a5c74fe32b175ce9f8d07ba57685586dfd79b893d04641d4169382d22f2eea442efc1112fa91c8175d45
 DIST etcd-3.2.14.tar.gz 3047100 BLAKE2B 5b956042542e7daeec3985f0dbd02b2766ca27287b55b0e1fd67c4296103ca9bf05b2ccc0e93640949c85e8099503b5a22d36c2f03d9904762ae1bbb59d35ac4 SHA512 f48cdb368906b36e7ce80c60933b0e9bc4415104c31f2da9346940f040febf27dbd9109e7f659a281c7038cadfb02b0dad614685a15ff46c87c600471c5de432
+DIST etcd-3.2.15.tar.gz 3047626 BLAKE2B 81f312fd5df6b64bf9e13994500387ab11ce145e296538492ccc71b94659f93e84e191cd2347d53d6d20e070cb1eb2760d4abd467655af53eaeb3c40cff7b500 SHA512 3ae11dfe918d409893e3168fbf31da0e910ce498a13f6bb31c3dd3a2027d72550f086d55b702803f2783de815dd349537bd581334146f8c4d05b9b3f4d3d56fb
 DIST etcd-3.3.0_rc2.tar.gz 3358540 BLAKE2B 8df7b2bbe84c5440c1b778107e7817def6b7a14a8568e6c1d7b5eba5479cf58ad6901482937df149b658a7e06844037cad95b57196c23810b309ae638c8961c0 SHA512 4c9513fbc599b218072bf441a6a37e622554df1597e18d0b72efab3f85d8ffb2b21d915a78289a865de68bc25e4401df15f291521f3dd22d19c2ae37941c0e4b
+DIST etcd-3.3.0_rc4.tar.gz 3359330 BLAKE2B deb5fb6df059039864cebebb74498637163a3331de3191948d34f792a6a579eede32951176f18e4535020c7b06917796bf3c36640087c73c948ae2bd8ed7504a SHA512 754457ce230273b3f79d864f6175fd6c0456e1eebf244003d92e54090f1cecc262ff8228f2c6b56fd41f3b500070cf2ef9a9f949946d88a9af86510f174b7a02
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
 EBUILD etcd-3.2.13.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.2.14.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+EBUILD etcd-3.2.15.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.3.0_rc2.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
+EBUILD etcd-3.3.0_rc4.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.2.15.ebuild b/dev-db/etcd/etcd-3.2.15.ebuild
new file mode 100644
index 000000000000..34692b679e18
--- /dev/null
+++ b/dev-db/etcd/etcd-3.2.15.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 0700 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/etcd/etcd-3.3.0_rc4.ebuild b/dev-db/etcd/etcd-3.3.0_rc4.ebuild
new file mode 100644
index 000000000000..bb257b8fde56
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.0_rc4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.9:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 0700 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 93da41c7148f..c5b85092c27d 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -2,7 +2,9 @@ AUX without-flags.patch 1859 BLAKE2B 846c177b9773c27b329a23f54592a2b789b0d8d123a
 DIST freetds-0.91.tar.gz 2136329 BLAKE2B 99dee4ae4d61a8d5c5340f220df9bef711c7da6f4f20ee293100e2f7c0c74821eb67aadc5814df8e82c2fc4d79f68457dae20a4f99b04dd9c043375c0a51b218 SHA512 4dadafe49848ab5505b0fa5bd650e19e7652c3e1181d3c49f087c50ed055f395eaf5917a99744ed3594e4af9032c4e18f397af58fb1010e695ac2c0bc601b5e3
 DIST freetds-1.00.41.tar.gz 2904915 BLAKE2B d92789c9a08dc9f7f04e8efc828841c3cace0e5a3affd11d8751a785db70db79fedffb3745a681b960d30a11efbb4fa457805eb4f72444eecc20eb65d46e2d82 SHA512 dec3197a6478fc59b7386f9a7a562df8b581bba7184210c42f26827e957b9746e6820d687a9c6cbcd7c825fc5d4f556547c0483d06c786a064d5c4859db4daa1
 DIST freetds-1.00.54.tar.gz 2907015 BLAKE2B 332888565c2890657ca6440e4bbe92e0324daf6c6e67f3fa2243bd2d5746e7e9aa100a7838d33cc8fa93e71e5d6a650976ce5164317f3147b192ceb915362534 SHA512 a2a5034705fe06ee38b085f980f6ddf086789abc9485331fdaf829e7243f7ba95a5f0c612d7e3ec9e10f28a5c8b3a3fd8e7853d66f67110bd860afce949c798c
+DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
 EBUILD freetds-0.91.ebuild 1118 BLAKE2B 52e8827d92b9ae22154364e90eac4f4ca3c76b2e9036218f82809cc50436262112734867c4c602267d88601dacfa82c2098566e004650707dd7d208cb0f5328b SHA512 c4623548cc786c3f114f71456011e2b9a5f225e3a032c7268dd7152bb083aac8242af24f585d9ce40baf2e1f5a616cdbf003997874ead4621af8007804d3c3e1
+EBUILD freetds-1.00.341.ebuild 1856 BLAKE2B 8cf069020ba0fa8a06b2b4af9e760a0cc46ce5a7fdd4a48ec5286f1550ceb316cfa096a0281e4e6f115d8f83a1535bfb51015b79eea7c86c202d6ab3758b8a42 SHA512 08a74242a8df775fc7360e7dac588713acce0abb1cdeee06219aeb051083622992fdaa94369fed37cefb1afac911af3d3b59f2cf35e8362e77f63ad0c43c5e32
 EBUILD freetds-1.00.41.ebuild 1988 BLAKE2B 58e5b9ecc1ec5196c3e4e50cfccefa6ca44510ba344b1d024f1280667e47d4351ce1946dea1f963cc3feb0a8a5382812e046173579fd961d522b3155ad422261 SHA512 a48ffe06b8303885d2e795d9cfe756979652460da4912de33dde0a06b635c3466f3abebfdad17ef7aa8cc35fb5f79eeca8457f18c2999108b13367eb2a8d7e02
 EBUILD freetds-1.00.54-r1.ebuild 2064 BLAKE2B 6ec6575c86163e8678fbf841fbe8aa85e5fc7fd6e1839ff423dc542718e8ef88c2ef19e178bc7f76493e78b8e6edbbcfec87af85ebad2ca1153e07cdbb15e664 SHA512 48931c5f0e49cdd9f07e413339a0e647a4b48eec562cfe337a6c57243d11a99d47977d8987902a6ecafa3930a94a1102912c57359e146f155f6fcf6ee5753ce0
 EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
diff --git a/dev-db/freetds/freetds-1.00.341.ebuild b/dev-db/freetds/freetds-1.00.341.ebuild
new file mode 100644
index 000000000000..f975c08fe565
--- /dev/null
+++ b/dev-db/freetds/freetds-1.00.341.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# This is from the "current" release series, because the "stable" series
+# is a little too stable for us (missing bug fixes, and so on).
+MY_PN="${PN}-dev"
+
+DESCRIPTION="Tabular Datastream Library"
+HOMEPAGE="http://www.freetds.org/"
+SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.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 ~ppc-macos"
+IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
+RESTRICT="test"
+
+# sed, grep, and awk are used by the build system and the osql script.
+COMMON_DEPEND="sys-apps/sed
+	sys-apps/grep
+	virtual/awk
+	gnutls? ( net-libs/gnutls )
+	iconv? ( virtual/libiconv )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	odbc? ( dev-db/unixODBC )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+# bind-tools is needed because the osql script calls "host".
+# binutils is for "strings".
+RDEPEND="${COMMON_DEPEND}
+	sys-devel/binutils
+	net-dns/bind-tools"
+
+# iODBC and unixODBC are mutually-exclusive choices for
+# the ODBC driver manager. Future versions of FreeTDS
+# will throw an error if you specify both.
+REQUIRED_USE="?? ( iodbc odbc )"
+
+S="${WORKDIR}/${MY_PN}.${PV}"
+
+src_configure() {
+	local myconf=( $(use_with iodbc) )
+	myconf+=( $(use_with odbc unixodbc "${EPREFIX}/usr") )
+	myconf+=( $(use_enable iconv libiconv) )
+	myconf+=( $(use_with iconv libiconv-prefix "${EPREFIX}/usr") )
+	myconf+=( $(use_enable kerberos krb5) )
+	myconf+=( $(use_enable mssql msdblib) )
+	myconf+=( $(use_with gnutls) )
+	myconf+=( $(use_with ssl openssl "${EPREFIX}/usr") )
+	myconf+=( --docdir="/usr/share/doc/${PF}" )
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index e389ad5c2de7..988b3eae5834 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,5 +1,5 @@
 DIST LMDB_0.9.18.tar.gz 139156 BLAKE2B 6a8d32c6f203272a212d5e298f7d1af290c12a87680c3177521d1b10d0c42691dbdfdb3b49d467c97cf4c621ddef8e00bca0bbaa352203eeca66e8e294c0fa8b SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
-EBUILD lmdb-0.9.18.ebuild 1247 BLAKE2B d5ca053ef6733804c826a1114b255777ab910261f25c3d3ab03918cc65affb6c4da485cf88b52bc98336e745cfd5a6d9a241cdd57133a4a2459156da8d4444d8 SHA512 b75fb4c52e5128665f29e6e0fbf977c1c01f55f56dcb9322888d8fcb25b07b1b32e6a9f337d2bf768a2a982a82d25872ed8617822d718d818cd832c26949e936
-EBUILD lmdb-0.9.19.ebuild 1855 BLAKE2B 003d33f9f28af20678763ca1beae6ac866ef63e19fe2ef98f455de81430279192c39c885946cd0b8b3698183fb29984b52ccf397333a2979ab7f43035dd9037d SHA512 29ca4503e247f340633a4a8d0f289bf56da9e37e3a847ca1bb863e655b447a7f12c5aa65bf6dbca27395cce3197b8a2f77030cb9d92103e0b2272cc67813bc22
+EBUILD lmdb-0.9.18.ebuild 1235 BLAKE2B f3f7a963ae8c0dbba7f14068ead2871a3c4507a3da73799f4f0246fff7bda61a248891ab78fdb94ee224ada9627ce0aab41e73bfc335bd7f47897cb020605da6 SHA512 17de880cc785a743202d95eb22c1e41addb418d86c8650a53d632542545917c93adbb7664a6c724f2474e61151e594174dc78b71cff9c14f3c90cc17af98485c
+EBUILD lmdb-0.9.19.ebuild 1843 BLAKE2B f61c817f72fc99e6cb8a3b3c9b0e6b5c0c7eec84a98d9aefd4cc823d84c1f5e867819ae65ed7de498a23b935a2ba1d99a3d7f1262eb0f94f8384bcfaff1a3615 SHA512 103fdfc21e4a7761e9af991abd349c954602ab105374deb64a4e8d32ebd8db0cca9aab3a7fe7e867cbbe717898b5de2fc597d7f09aec8a9bd29f282b75d09881
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.18.ebuild b/dev-db/lmdb/lmdb-0.9.18.ebuild
index 6071b64f9718..3752e4ce51ca 100644
--- a/dev-db/lmdb/lmdb-0.9.18.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.18.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 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/lmdb/lmdb-0.9.19.ebuild b/dev-db/lmdb/lmdb-0.9.19.ebuild
index 116e69d4f999..18b1eae55131 100644
--- a/dev-db/lmdb/lmdb-0.9.19.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.19.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/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 84b0409b5dcf..37c80cd0bbea 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -21,16 +21,16 @@ DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c
 DIST mysql-extras-20170830-1210Z.tar.bz2 312079 BLAKE2B 821451c88ee812d6debed56f62102824370568999d16a469830c3ed84e9eb1aec7f823c8a422db60c9a74d20f19581178fc06ee0a483a6ea31ef408a882a8db6 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
-EBUILD mariadb-10.0.30-r1.ebuild 6886 BLAKE2B be043c0f686c65d21e7cf10b30d7c55a2e624dca259c9625781eb89be8766b9ac71385ccea330d4b68fa6e66d7006ba0849010ae8da667eace1ed9c8b29e6fd6 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3
-EBUILD mariadb-10.0.32-r1.ebuild 6767 BLAKE2B e94e20c605369bb8244673048a0c42eb1632c730aac1b0ecb251641de8c728431eeb714031353a81f3f8d89ec568615fdf105732d52981f6417ed34a9a1ad081 SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e
-EBUILD mariadb-10.0.33.ebuild 6730 BLAKE2B d5b3dca19f8c990f3406c92127546cfb383b00050dc3e566d77809a031375468a595901b9cd5df7171cb82933435cbf5f5dc77a613c20d9aeeeb73dd90a14bd2 SHA512 ba6d01e22b74756c6cdb03e50dc74073c15769a9e42e5d592d3c757d4ff3cbfcd4f22cc797b56792d41d58d82948a5d9f374df7fa81d8b5cfaa82c65b3b336d4
-EBUILD mariadb-10.1.24-r1.ebuild 7187 BLAKE2B 0d018118c3f9bb6d6e3c4b2fd26e7a64340d278bbdd466fe0015cf48618db74ab21c21521b8abc7fd74c40ec46da6267e9a4cdb85f16ce7d6a959d8f948015f3 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a
-EBUILD mariadb-10.1.26-r1.ebuild 7255 BLAKE2B 69863e33f40194ed5b594f3af6b2cf290261f9e8b311efa373017e5e40b5b0384baa37f97e09960806aa3f4abcdc82e8e8d6049afd9445069c25fa5b399356c5 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7
-EBUILD mariadb-10.1.29.ebuild 7317 BLAKE2B 82a46a30d76d210243e224f4f5028ebb2114234c57a190fce8206981b0bf6383b712640b22f3f1d5a9047145b1372e74a3cbd8509fb8dd2001ebf8fcdbac57bf SHA512 82eb8b1f0d949060e8c5a27998c39b67b29565af8832a44faf53c71ac8207cb99a25277558d4307fe432bd514d0f8e394f5f11cbca363b92d86a55b9ef5207d7
-EBUILD mariadb-10.1.30.ebuild 7623 BLAKE2B 596196dfd19aa9c5432667e8130c3bc1f36ae19088fe7628c30c71e4d16457d65d4e1b745987cf697c37473befafcf127a9ffecc1d126b028a8c8d1c18b84d50 SHA512 f2c7d3d51efee75db2d8b6c852cad3172d4d7997a3e0697d2f211f4d4f792fcdd8f247889c22cdf0b0f391e536d1caa7223b00e8d08b92cacd43a8917fa27df2
-EBUILD mariadb-10.2.10.ebuild 32355 BLAKE2B e144135f516726c6abaf8239bc830a881df70d216b07372f3fe4d346e0050b9caa6cb762544e57fa5cc27c66cd814082d180fc2d841185932fd06b93ab44fe35 SHA512 56116f8a65f22c89b491cdd4e72c6fb118dbf7efae56c9827d1520055e555abef57e9b88957c3460e1e7ff76b44f2955a0092acda08e183a9ed867c08053ea44
-EBUILD mariadb-10.2.11.ebuild 32540 BLAKE2B d9834013d4a8efcad1240a80f7ba2f8f259290716cb3f05e3d9ffd41b8810937503b6fc75de83ac04a16d798879d6f1935767794c7942596e6a4bd1c1c739788 SHA512 162123fb2c338d84cdafc89cf362f622b25235d8430b505b3dafa8948122461485e08f28f1434ec9bf8f99e3a27ea9682ada57c6578c12d24234123fd2e6cd91
-EBUILD mariadb-10.2.12.ebuild 32540 BLAKE2B 370987e4c6bf137aaa32d5e4aa32e8fe1ebfe9ee02482253bc378479410c1d500f53152d087a8ee5705bfb93839d48d5cdcf9075c8aa512a79f13f8031475f65 SHA512 e4ada81572664902c3cb29a973663180819c9f8762a53d807d136f77ac533d27892e21f1a85ecdcc29058be53c260b528b5bf8a10ad160709ec70122ed9d0a32
-EBUILD mariadb-5.5.58.ebuild 4241 BLAKE2B f296031afc5f43c890217a3f1d34d978fa83919164cfcde6a6d897d1a2e67894aeaaa88c8488c5d7f4143ac7c08170142e1c4ec0e7e024cbe79d3e37c33d9523 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944
-EBUILD mariadb-5.5.59.ebuild 4232 BLAKE2B 1f6bc234b102f2273ebeea9708976c6bdfc6606891f93a2309234495a6145651a19141fe3cd6726f832a0961c9879ba251adacd5f27e3b858b906c97135fb308 SHA512 e78c6e8e8323ac82df497a28bb91eadc8adadd14048caeb4702a1d232729de225c1a96416edf39f0ba8e618c0958c10f6aaf58fa2d8bdcd483e773853ecdc34e
+EBUILD mariadb-10.0.30-r1.ebuild 6874 BLAKE2B f599097904869476a5a30ce264a2c27683ae1c59129bc6c4e4d73d5268fe5788027a2f9056309a9b97fa00881f63b7f8b88560f38272866d0d89767b10f602dd SHA512 370fa3e79b5aea1b89e2136da06a3d7b3a3bcfb49dfdcf030346764fbcee81b4c365e43be6a994e4bc6ad067aba126bd4be66ec94096dca25eb45b8fc0a136bd
+EBUILD mariadb-10.0.32-r1.ebuild 6755 BLAKE2B a9b5dcfa04719168afdf46a93cd45e0b7a3edf7fbedc931be9b1b6333536516bb743c7c7a7c06b9d4cde59552753affe8a2b39ae32f222681df563c087002968 SHA512 b11371bd98f48a45637ed7d3645a2721a5cd6fc2bff36442c105811d637a6a0462215eea04b1bd81f22d651d8b73384272bf440c43bff9cda8b9414d14cf8e53
+EBUILD mariadb-10.0.33.ebuild 6718 BLAKE2B 46e9980c6d4143e621aee1341b88b8021bc80e42faf54f0f7dd8a9c830ba88939a292016cf07c9e39a2c3c2addcd7de6d7724d3404cab8daae4002fa81a98f7f SHA512 f46c1b1e827d283d930ad6a4059b4d3e8f8ab5cf9bbf33c0f985646119b000eca0474f2447d0bf6dd22243b859de2496e29c5b9b862ab3f8610cf5fb3a674bcd
+EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b694204e40d4a89ceeee742395965067f4ca4dd301a832db5db9804237e6f9aa5da2b6840fdddfc80aee768ce32c804 SHA512 3c164ee1598deb014be1dad3ab4f11d20e4a560cb19b34f407db51ddaedb7a24f8c9910a7d4f40adc6f552c9db5594248e273c8cca13e9a3a6cef26bd83b23c7
+EBUILD mariadb-10.1.26-r1.ebuild 7243 BLAKE2B 82e3e6d8024dd89a389089a94f3e4b0f48c3e6f01b1d553a528b625e4f6445939c833c519a117f69b452bd96bbd379bcde9a08220d31888cba409c1a7babc32e SHA512 c5b884d63ead9d89de3227b73da3f3d504ba86d21a2f253855871afc8eac4078ee1256a6476985e8f0be0f784424118f6751468552fff43d8feae3991361d193
+EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
+EBUILD mariadb-10.1.30.ebuild 7611 BLAKE2B 5c23c5ba6c4a6ab7dcf2e0c62f1feaeb2c97ee18267ac41930613185067e859ecec0c2a195af2ef6507f2dc40bbed1c857b218336124aa7e6984c28b036730e6 SHA512 27235b2f0c52a36a96457fc5ffa20fd7c3d3805dc77d0510d0c4c91d1d2fe64ace0f11b04b010256b22958ade51cfb6d3faaa7a20b23bebe59c99e549f293eae
+EBUILD mariadb-10.2.10.ebuild 32343 BLAKE2B cdc6d67466738598f725ccc6ff8c39ee69923ce787b95097b1d06bc5971b21fd9e8c44f34036792beda3cb6eabfe40bdb1282d3a5432929b92496aff929341ee SHA512 5fa3e3e817811832b940cf857f18d9574ab67be23488b042591ca7c358a844aa755713e0bfa5c481e6fa6c94cbd8585f902fd43dc2dc36adcc7bd53705d51904
+EBUILD mariadb-10.2.11.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
+EBUILD mariadb-10.2.12.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
+EBUILD mariadb-5.5.58.ebuild 4229 BLAKE2B 1fa5de1698d51777b18e0cca97af44b974eabeb528d5544da25dcb0c7719ba6001626e1b41ac2d1bce6373daa6990b2ce5e1b53f352df578d2f47b4e88235586 SHA512 a458aec6fbd1c69aa8548c784ed07f5a16ef80ec9d19b01d0906ded82724e69dbbcafa023c8f83d73f59987aa47ed638f7b22d3935631c3cc3a216959764e911
+EBUILD mariadb-5.5.59.ebuild 4220 BLAKE2B 15d84c6e8405e0f2339a1fa2c1dac8c5cb5d070f083219e5b0b6b6f59b83a5d147f049a7874f4109bea38a295be86f560faa6bf21b8665a2696a9ef4ff09ad08 SHA512 0397ba6f08cdedcb3812b61044d6d58b42db9009747fd1a0af53e450d530b56bbb748ffdd0a9c3de7dc535f9e4566e2513a7ea01fe893f250b9a31fa074de5e1
 MISC metadata.xml 3051 BLAKE2B e74f1014d147e7a392d46b35818c1a12f5fe664fb0e8f2237187b98bd9c54b3de3f1c36b07255efbb072be0315102248837f5b41708d0a9d7fa82e8d9e2c4465 SHA512 e6fd6d89b587b8b1fc29fc6c6c6ef8dbe0ec209a52887468bd047e5813dd5479f6e1217e4d29db0a278caac544c645157721fefe8b3c59e59431eb8a85019a68
diff --git a/dev-db/mariadb/mariadb-10.0.30-r1.ebuild b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild
index a0218bb32389..0a74c1ba458b 100644
--- a/dev-db/mariadb/mariadb-10.0.30-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.30-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"
@@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.0.32-r1.ebuild b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
index e02c2cfe240c..42d7b20c89c0 100644
--- a/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.32-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"
@@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.0.33.ebuild b/dev-db/mariadb/mariadb-10.0.33.ebuild
index bfae29f17213..6aff85a96538 100644
--- a/dev-db/mariadb/mariadb-10.0.33.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.33.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"
@@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
index 12dfcd871287..6340ea651b31 100644
--- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24-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"
@@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
diff --git a/dev-db/mariadb/mariadb-10.1.26-r1.ebuild b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
index c40f1daf24c5..babcf78b15d1 100644
--- a/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.26-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"
@@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild
index 552db693d654..0d36f069a0e8 100644
--- a/dev-db/mariadb/mariadb-10.1.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.29.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 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
diff --git a/dev-db/mariadb/mariadb-10.1.30.ebuild b/dev-db/mariadb/mariadb-10.1.30.ebuild
index 31f4aec1b090..b191b1e8769b 100644
--- a/dev-db/mariadb/mariadb-10.1.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.30.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 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
diff --git a/dev-db/mariadb/mariadb-10.2.10.ebuild b/dev-db/mariadb/mariadb-10.2.10.ebuild
index 821eb9665f49..6cdcc22d6190 100644
--- a/dev-db/mariadb/mariadb-10.2.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.10.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"
@@ -44,7 +44,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	static? ( yassl !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.11.ebuild b/dev-db/mariadb/mariadb-10.2.11.ebuild
index 1a35f3624d8b..51e0d67ccb02 100644
--- a/dev-db/mariadb/mariadb-10.2.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.11.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"
@@ -44,7 +44,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	static? ( yassl !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild
index c61311f131f1..51e0d67ccb02 100644
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	static? ( yassl !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-5.5.58.ebuild b/dev-db/mariadb/mariadb-5.5.58.ebuild
index 0619086e848c..ad3d7ce4c164 100644
--- a/dev-db/mariadb/mariadb-5.5.58.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.58.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 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mariadb/mariadb-5.5.59.ebuild b/dev-db/mariadb/mariadb-5.5.59.ebuild
index f8dc51f9e5e3..96f116e1a1e3 100644
--- a/dev-db/mariadb/mariadb-5.5.59.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.59.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 86d621ec247a..6a277479a5c2 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -1,7 +1,5 @@
 AUX conf.d-2.0 2944 BLAKE2B 94b94868e840267c5bf604226af11a4c806f48111472e417d725b51f48e38b8a4bd0dbbe8f9dba95c2250590c23bc0f9bc301203fdf399cd141055e54fa9a067 SHA512 2781e2caefed0c8be9c612f92cecf5a572dc17b97519034637a2b3f98a88af02dd8973f6c6b2af524d235067df6866409d1fe9d56740bfd0efb09948073c8d3b
-AUX init.d-2.0 4534 BLAKE2B 7924c1e949d020badd63389e0cfad143917682b8f5f816ef0939544fe3df0dec23949fa66089c910b6ff40ea0a76d02bea5a4c042f3004d12abbd22f08812c1d SHA512 f3ba5b3f9b6d60ecdcda3a3aa38f62991969d597586ca0bdc70f2c2901409298f88cab7f98665edd486a6ce312f27c74796afa9c2d880a132516c3b2c002d69c
-AUX init.d-2.2 5604 BLAKE2B d9cb9f14ef04e60165985a0ebde06731b07f154d11d5614115a0bff00a822ce3551db1364d497ee14280e0ca98bd8ff5631299149e89136e0dde5d980313c479 SHA512 de7320d3f37b927cda80d47e416e2dcd3fb56ddc1fe95b69dd97b2f85e06d7f83a420837b9604f776282f75ac9450415d6936b77b26535ad907c1e175ea6a013
-AUX init.d-s6 3879 BLAKE2B 59015d498231ec0db2d6988c503f9c08d79355cb7fae2706be943f3cdfdb8e585895f73979b1f742038f719bbfd084905eabead7c9fa16aa3b611804866087b6 SHA512 dc3b7bb441b3df58ecb99d977773365324b43474b1c2d3f9bbd8e18542579008445bbe788e78bc4ef6c1cd0cb51d0c2f16a5577d3840aa125383715f1938b8d9
+AUX init.d-2.2 5720 BLAKE2B 6d81ee1275439e59926ac0f2dbaa2f4b1ceed130f9047d7f6c19d27927fb0432701121554a77205f6f803c9f4e6e0ffdbf96ac8d6ff2f7ca149637585b859df4 SHA512 df1c85d527ec1805bf5ca22f5db37714ace6c55e4095ecf2e4cc1c4dad8a4aa6539282b11cb9c6a85b72e2412e1fbae90d85a8dfcda077bedb667bf784e4c613
 AUX init.d-s6-2.2 4978 BLAKE2B bdda1ecc926a5236be865487cca01974865c7d0c8e115b0bf4e5f791293ffd3be3976730fc21d3a4f2f81389d88c40d6b427d67dfeaa694ba8487e19f03b0aa1 SHA512 77d3691837a08d117dbaa8252368ab54f1bbd5969189261e498e57cacd158b87e5600b3c2ce62b25f72b8bf5b9a08f26d56fe93b6e2e96bc58c208d92ef1befc
 AUX init.d-supervise 5303 BLAKE2B ae0b30000d74028866512156e6d565e1bc4456680521e7af9195ffed2a7b75b0504c313b78d3629d0d2894c0ea980e8d8049624862200e64e82087e37bbb8d53 SHA512 149710600ca4780434e07101aa164e84d7decd86fdc4c2a8c5c37d2a965aff4626408885f98456773c6f8fb27eeeb5ab7028ccf73088739368c45f8ad9d587c4
 AUX log-s6 373 BLAKE2B e4579d7288c7e05c1abba55c29759eb3b0b49153c7b134e28b7308ba83e33c409d82ddc2e9794d0a398330b5b72ac33d165c6140259857ce3204928b20c2f6ac SHA512 e686bc0a4d9d5daf263c5a5f6bb883da1495feb9910f93c791af2d858b2adbf7cfc785c336ce470609f3f7bd12dabb97b470453bd67316feef5ed4df9ee9307d
@@ -11,6 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.1-r1.ebuild 1821 BLAKE2B 9b057ff952b3cbb5104c3f3fbc3346c452f0042846d5168c0829d59485abdfba6ccc0aff280337809c00891629ae709e7acf75dde45c9f81308da2e8ef5ae6e2 SHA512 22ded8b5a54f56a24f15e9285cb5900dd2cda89b21c78eebc0e7b8fd04ba5cde0b4a50f2d2ba51a520263d3ee97f6f5a0dacd30a754af3c5c992ba498be5d657
-EBUILD mysql-init-scripts-2.2-r2.ebuild 1884 BLAKE2B 49a116582ef97f6186a572e3be6ed42edd7086599ddffa56fbd8213440bb17fdaf511c2cf63c9d3f7be0b84c6ce4bb19dd27fde9ccd41bf04ddc89d319015391 SHA512 8b16a6c266ca769516513f63dd4e02295369543a9301d95d1cb9a3dc1ca07ead83299f2f7b11017f06ea225bdde2a2a34994456ff11c674bddc03006986e7c2b
+EBUILD mysql-init-scripts-2.2-r3.ebuild 1870 BLAKE2B db7efaaa2e6487c5fa38f4e4a77251611a449c72ec2ba964f6f720f57f08721995646997ba1ccf0c6a299e6c5ca39c6f17211303f1e5434c5d9b1497565ce4c1 SHA512 900ed926adc1860da8665c3afeac3081f4bfd189a2207b91942bd268b34e9f3dc8f8a26640d2a2a78b9f3134b898c0101b0001012a04bf0227c600308637ca45
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 b/dev-db/mysql-init-scripts/files/init.d-2.0
deleted file mode 100644
index ac94a9dd39b3..000000000000
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount
-}
-
-get_config() {
-	my_print_defaults --config-file="$1" mysqld |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${SVCNAME}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${SVCNAME}${ebextra}"
-}
-
-start() {
-	# Check for old conf.d variables that mean migration was not yet done.
-	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
-	rc=$?
-	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
-	# It does have a use in testing, as it is possible to build a config file
-	# that works with both the old and new init scripts simulateously.
-	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
-		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
-		eerror "Not proceeding because it may be dangerous."
-		return 1
-	fi
-
-	# Check the config or die
-	checkconfig || return 1
-
-	# Now we can startup
-	ebegin "Starting $(mysql_svcname)"
-
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-		pidfile="${chroot}/${pidfile}"
-	fi
-
-	if [ ! -d "${datadir}" ] ; then
-		eerror "MySQL datadir \`${datadir}' is empty or invalid"
-		eerror "Please check your config file \`${MY_CNF}'"
-		return 1
-	fi
-
-	if [ ! -d "${datadir}"/mysql ] ; then
-		# find which package is installed to report an error
-		local EROOT=$(portageq envvar EROOT)
-		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-		if [ -z ${DBPKG_P} ] ; then
-			eerror "You don't appear to have a server package installed yet."
-		else
-			eerror "You don't appear to have the mysql database installed yet."
-			eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-		fi
-		return 1
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
-	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--start \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--background \
-		--wait ${startup_early_timeout} \
-		${tmpnice} \
-		${tmpionice} \
-		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	local ret=$?
-	if [ ${ret} -ne 0 ] ; then
-		eend ${ret}
-		return ${ret}
-	fi
-
-	ewaitfile ${startup_timeout} "${socket}"
-	eend $? || return 1
-
-	save_options pidfile "${pidfile}"
-	save_options basedir "${basedir}"
-}
-
-stop() {
-	ebegin "Stopping $(mysql_svcname)"
-
-	local pidfile="$(get_options pidfile)"
-	local basedir="$(get_options basedir)"
-	local stop_timeout=${STOP_TIMEOUT:-120}
-
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--stop \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--retry ${stop_timeout}
-	eend $?
-}
-
-checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
-	local svc_name=$(mysql_svcname)
-	ebegin "Checking mysqld configuration for ${svc_name}"
-
-	if [ ${RC_CMD} = "checkconfig" ] ; then
-		# We are calling checkconfig specifically.  Print warnings regardless.
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-	else
-		# Suppress output to check the return value
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
-
-		# If the above command does not return 0,
-		# then there is an error to echo to the user
-		if [ $? -ne 0 ] ; then
-			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-		fi
-	fi
-
-	eend $? "${svc_name} config check failed"
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2
index f6ad52496e4e..5603f9e60310 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
@@ -12,6 +12,9 @@ depend() {
 	use net.lo
 	# localmount needed for $basedir
 	need localmount
+	# This service has its own timeout and may need to wait for repairs
+	# or remote synchronization
+	keyword -timeout
 }
 
 get_config() {
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 b/dev-db/mysql-init-scripts/files/init.d-s6
deleted file mode 100644
index 74ff34b04fcf..000000000000
--- a/dev-db/mysql-init-scripts/files/init.d-s6
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount s6-svscan
-}
-
-get_config() {
-	my_print_defaults --config-file="$1" mysqld |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${svc_name}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${svc_name}${ebextra}"
-}
-
-extra_commands="checkconfig"
-supervisor=s6
-name=$(mysql_svcname)
-s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
-#s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))"
-svc_name=${RC_SVCNAME%-s6}
-s6_service_path=/var/svc.d/${svc_name}
-
-start_pre() {
-	# Check the config or die
-	checkconfig || return 1
-
-	MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-		pidfile="${chroot}/${pidfile}"
-	fi
-
-	if [ ! -d "${datadir}" ] ; then
-		eerror "MySQL datadir \`${datadir}' is empty or invalid"
-		eerror "Please check your config file \`${MY_CNF}'"
-		return 1
-	fi
-
-	if [ ! -d "${datadir}"/mysql ] ; then
-		# find which package is installed to report an error
-		local EROOT=$(portageq envvar EROOT)
-		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-		if [ -z ${DBPKG_P} ] ; then
-			eerror "You don't appear to have a server package installed yet."
-		else
-			eerror "You don't appear to have the mysql database installed yet."
-			eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-		fi
-		return 1
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	# Prepare env files to source
-	mkdir -p "/var/svc.d/${svc_name}"
-	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${svc_name}/env"
-	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${svc_name}/env"
-	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${svc_name}/env"
-	mkdir -p "/var/svc.d/${svc_name}/log"
-	echo "SVCNAME=\"${svc_name}\"" > "/var/svc.d/${svc_name}/log/env"
-	echo "S6_LOG_OPTIONS=\"${S6_LOG_OPTIONS}\"" > "/var/svc.d/${svc_name}/log/env"
-}
-
-start_post() {
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-	fi
-	ewaitfile ${startup_timeout} "${socket}"
-}
-
-checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${svc_name}/my.cnf}"
-	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
-	local svc_name=$(mysql_svcname)
-	ebegin "Checking mysqld configuration for ${svc_name}"
-
-	if [ ${RC_CMD} = "checkconfig" ] ; then
-		# We are calling checkconfig specifically.  Print warnings regardless.
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-	else
-		# Suppress output to check the return value
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
-
-		# If the above command does not return 0,
-		# then there is an error to echo to the user
-		if [ $? -ne 0 ] ; then
-			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-		fi
-	fi
-
-	eend $? "${svc_name} config check failed"
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1-r1.ebuild
deleted file mode 100644
index 1d910869dcbc..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd s6
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.0" "mysql"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	if use amd64 || use x86 ; then
-		einfo ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	einfo ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r2.ebuild
deleted file mode 100644
index f97a9eec6219..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.2" "mysql"
-	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	if use amd64 || use x86 ; then
-		einfo ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	einfo ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
new file mode 100644
index 000000000000..8fa8c8341de8
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.2" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
+
+pkg_postinst() {
+	if use amd64 || use x86 ; then
+		elog ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	elog ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1777246cafe4..bce59045fd7d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,10 +11,10 @@ DIST mysql-extras-20170302-1359Z.tar.bz2 306816 BLAKE2B 7ac3d79f265916306ba8dd0a
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 BLAKE2B 4ee604de76d9da004c7cb9f84e7e4112c0cdab3b18a82923ad5bcb880377813f85e369697d84b37ed2fd9cd26b160d4616bfb7d1dba3bfe0b6bbc296e0edd5ea SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122
 DIST mysql-extras-20171018-1948Z.tar.bz2 313540 BLAKE2B fb39cd40af2a013f2e8c71094a14b72f0be6c24c440e17839b447afc01b6a8a3264dec4cfa6973a1e919c96e9cbf6e2bb7d4ed6b0c32502d02dd0d3af316ee1f SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
-EBUILD mysql-5.5.58.ebuild 4402 BLAKE2B 64a7d3de7a3bf3a711f9a4974bc0967f361b20b761568d3a4e910cdfda8c1f540758f0dc10812834433021b417d5387b54cdf833f2e8718e290e1d9719b745b9 SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916
-EBUILD mysql-5.5.59.ebuild 4393 BLAKE2B 628bfb3743ebd2121bb60d70292c3ee109efd196699b4066466b805e74adf0d51ab3509677ed6147d54cc68271c27788eece83230f199feee0f52dea83f335ae SHA512 722851a3e09def2e8ee5eacd783a603e8d2c861b5e82778b8c850e343c71d55d0523bea2d94262ffc74ff7de2fe8f12b6166db2ecc005e4192323f410312c124
-EBUILD mysql-5.6.36-r1.ebuild 5950 BLAKE2B 30dfe2cf66382326b43a1d206d11c8466042193c5182043ab9c0520f6b4893b10fb958b26c933672b38e7f8b314bcab3d136afc09f2cb9ee1d34a6f3bce4984a SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55
-EBUILD mysql-5.6.37-r1.ebuild 6169 BLAKE2B 3d52e65caedf92d2f52135b3f6d0d0fcecf3382f63c83bbce132816f705792b29e0fcc677296f9303b35e374072bd01ae933741448d046b07d2440b934367a32 SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5
-EBUILD mysql-5.6.38.ebuild 6478 BLAKE2B 69229cb3d1c2eefb9242f1389be57c9c9d18d56f29ac40c3c25b880e5a0871543d366016160323d052ac6945f1bdc3ec5801c7317c03a7eab086723bf7949a4f SHA512 ff33fb5832f81557b228e90111268bb9196f1b077b2179b025c049f318fca45fd4f0015ddb11379d24b705efc8faa4f5a31a833f7c26578d4a0c6079825dbc71
-EBUILD mysql-5.6.39.ebuild 6476 BLAKE2B bc1c6b353af11c34b20734991e82e6199fa3fee352495e5eaf38f0c457085fd678e3be45616170601b6dbe08f17bb20a2a01287574676a47fb20ab0ec10c1dc5 SHA512 122315e47b32fdec24ff30a89cf904f15d83248b15c3e274afd60c40d24e43f1328127ef2709241c5d010d87cadcdc77f9bf62676ce1ad5041cd90cb81bb1ec4
+EBUILD mysql-5.5.58.ebuild 4390 BLAKE2B 0a465cb0956aa4c392713232b878fd8c72be02d2df15bcb39c5ffe3ff81883ce79f03486fa0403d05ed02c6d37d6e9bc1bbb9f09dc21d2f6778ea19ef7c77390 SHA512 9b6882465934de33e8ecc3d903569661cd3119b37597f965002580935d0b1474a5ad625f7eed561f4f773c629abda5e744e7861d5d3278a3d37cafa038ee4d55
+EBUILD mysql-5.5.59.ebuild 4381 BLAKE2B fc3ac09a47073258035438d1c3754aaf83a73a855f071ae2a9e1575794c3ada4e18f8277b19d8f8042a26fcd551f815b52242d54b3e368a36f5109c1f2a12317 SHA512 356fc3a65ee7b12187130bfd61227e6e315034fa29495a56a481a8880577e45f2a14dabc463df5cbb4806e1aeb165010e56b57db514dd7ebdf7e5eb4fc98d5c6
+EBUILD mysql-5.6.36-r1.ebuild 5938 BLAKE2B 60b72cfdb9030a77e611cfa5e7efa092e08f2fbf698615d75b1809b55c9c1eafeec3601ea792b96a92003002d41678e7e32a7a137608f3efb3076cca7c53dcc6 SHA512 b1affbc1dfa67a167c13403a63e05a3c56aab6957a852d8b6958e6c6bd51b4ec50f33f3c5234034fc554f091b49738b08cbb24aa15a8d7a38a63961f715d255b
+EBUILD mysql-5.6.37-r1.ebuild 6157 BLAKE2B e4dc21ce1095263789262ef65c5d70d53d20c23f9288d5a24f6530ca89808e7c2f5c043ad49f2bdb62af37c44cf35eb8136b244414b2a9c758902180e30f1fe6 SHA512 dc8b11488f07522ca014a2b2a4687d5aefc9d08493f58b4d918af7da35141d25f0320b5891469ec5a701d4a98a9c7dc4adb87ca0e4b9d5feaa65802a5f1a6b0a
+EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78
+EBUILD mysql-5.6.39.ebuild 6464 BLAKE2B a4d0616c503b0fb65fa3235238feea1a4e234ebdb92093aaf06f3fd205ffa41f4004f9445176e619027592129bb5c1aa1ab06f1aba07917ac59bc7a6e4deda95 SHA512 1984790d4f3bde1983cfda4dd619f48d8304b1eeb8b1ec1f372b8024db62398edd82145ce395101da3484967a8aa33d2df884edb288cfec96438a0f589b0bdc2
 MISC metadata.xml 1777 BLAKE2B c1b1e002ac9862e77fec4ac2b2ba27e4c17210c2a877e2463119336856a6431cd6f8143679edbe33b2b835523d4e126dbe9dce45f28bf805201c040280c4e5e5 SHA512 089e8752a6658ada634a019a4a77cdd70560ef001d9f7e83d38b0818253563f2819c3fd78186b6194b3dd3c34b2103ca75f7cd60d6a8a84f96041f338d771eb5
diff --git a/dev-db/mysql/mysql-5.5.58.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild
index fdf3c8d8ebc5..aafa5a49293d 100644
--- a/dev-db/mysql/mysql-5.5.58.ebuild
+++ b/dev-db/mysql/mysql-5.5.58.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"
@@ -20,7 +20,7 @@ IUSE="$IUSE"
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql/mysql-5.5.59.ebuild b/dev-db/mysql/mysql-5.5.59.ebuild
index 11823557e497..9faba7f8febd 100644
--- a/dev-db/mysql/mysql-5.5.59.ebuild
+++ b/dev-db/mysql/mysql-5.5.59.ebuild
@@ -20,7 +20,7 @@ IUSE="$IUSE"
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql/mysql-5.6.36-r1.ebuild b/dev-db/mysql/mysql-5.6.36-r1.ebuild
index 3ced3a4395b2..41dc65de4325 100644
--- a/dev-db/mysql/mysql-5.6.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.36-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 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
diff --git a/dev-db/mysql/mysql-5.6.37-r1.ebuild b/dev-db/mysql/mysql-5.6.37-r1.ebuild
index 016e3491ecf1..57e2e56845bf 100644
--- a/dev-db/mysql/mysql-5.6.37-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.37-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"
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index 6cc24125680f..dd37abf2cc6c 100644
--- a/dev-db/mysql/mysql-5.6.38.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="numa? ( sys-process/numactl:= )"
 
diff --git a/dev-db/mysql/mysql-5.6.39.ebuild b/dev-db/mysql/mysql-5.6.39.ebuild
index 1b72b98b3c71..99ffe9e4fb97 100644
--- a/dev-db/mysql/mysql-5.6.39.ebuild
+++ b/dev-db/mysql/mysql-5.6.39.ebuild
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="numa? ( sys-process/numactl:= )"
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 6df6df3ab1f7..4818ad354171 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -3,6 +3,6 @@ AUX my.cnf-5.6 4568 BLAKE2B 633cc45bcc751046ef766dcabd1c8db2cd474f13cde436d41698
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
 DIST percona-server-5.6.37-82.2.tar.gz 56296960 BLAKE2B 70d0c40c96be3c3f674466d2406b5622a7a37cc59d9daee7f0315ce6dd2ce13751f48d440646a0f377ca86aecd6bc749d050ab4f58bfa7400bcd35167ab8d480 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e
 DIST percona-server-5.6.38-83.0.tar.gz 56390422 BLAKE2B 2c5ae8c021c95da210402b79314698b7286ca7791c35f059260537b19660e33bd6a06701f24f121b7b051faab38b41b037ea3d1305d281abaadd07c3c432a13d SHA512 25b3dbee188e0608f3783acdf70eb3ded276ff25dae3ee879a70e3eefc8df5ac15e3b5fbe310537f84ccde9434de51ac5927322de13f6b89e0530ebbd7d36f6d
-EBUILD percona-server-5.6.37.82.2-r2.ebuild 8859 BLAKE2B 162163f63ec4f4c6c82f914bdc4cf8912fdb32714037f08ef4fb4e3d1374edc87a7a8d0098c26193eaf8c963c3892730ad3fff98073b8a465d773499f857a451 SHA512 d896ab7598c072e39e7cbe322d019350052bf0a9dbd296bd6e7ba0d1ff81d5d80d279b6c4a8f5d497f7588800de91cd314db43a300b413cfe0c36fb5d280adea
-EBUILD percona-server-5.6.38.83.0.ebuild 8518 BLAKE2B 090fe3f392cdf68e08a104ae9a52756a7ecd75faa827d8deecf4800ff47a4cd1deb04d9e1f63baccc978d324dda7689630fb1ca8e891e045463391ba49279e05 SHA512 6ba3fa470caa12748ef162bb38c7c9544b3731549311c6f54e53df3dd096215d93b53f13a9db9526ea3cc2455b3fd62d201b0b53eb0b2a5a362983bdc18e1392
+EBUILD percona-server-5.6.37.82.2-r2.ebuild 8847 BLAKE2B 1d95b631e89e779f98cbd2edfa32734e13e74fdfa7e59ad908a3ba63ddd7be35888320acd762468be5c61408acd0dc6b7996f4fc1340d63a120a9abfc2926887 SHA512 dd4343147420888c4bf2db5ceffe7f7e25a182456d6027027c8065877a474e1ac903a79ed34655b2321d5745730e220678ad705b148c8e778328442d401e3ad5
+EBUILD percona-server-5.6.38.83.0.ebuild 8506 BLAKE2B fe867adcb0963c377b7f06ccba8b4d49fa878390321c5dd77562e27527c9503182cdd853fbcd42c5558d3ff8cb4676ec0e251fc65331bd31419bf92907ba8b2b SHA512 fd146e3f0db22253af87e4c98c34285ff9fd39bb640ab968cd58ee181d8b573c970ec71e7f34aa0999a05e6d4537055f4f588a2434412881431747e5c79c31ea
 MISC metadata.xml 1505 BLAKE2B 63c11ed734843c7f07a7b71525f21113828cf7bea4fe9f15cbfde952f5e27fbeb8ad1942306a3224478c1a2d19f2ea22d26ee124db19fa7122d573095f98847e SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6
diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
index e56e97809f8b..27c8676451e1 100644
--- a/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.37.82.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"
@@ -12,7 +12,7 @@ inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs
 IUSE="numa pam tokudb tokudb-backup-plugin"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
 HOMEPAGE="http://www.percona.com/software/percona-server"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
 
diff --git a/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild b/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild
index ebb378805f4a..2e7499a7dc6e 100644
--- a/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.38.83.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 @@ inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs
 IUSE="numa pam tokudb tokudb-backup-plugin"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
 HOMEPAGE="https://www.percona.com/software/percona-server"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
 
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index a7de926a31ca..5495f91cc78c 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,11 +1,7 @@
 AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8
 AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2
-AUX pgbouncer-dirs.patch 685 BLAKE2B 6a12d056f9a61a637d491cee28ec00cd9f6e24f0278176392775102a3a2e37e11fe7873654854311132bffab82db02a54a8db41a8c71b657235ae8cc3a53adcb SHA512 6a475bf5cff10b464177af619051529ad78e802c56655500ad23130c5989721f41592387f9bf6719810eae2d876a8dd36219b87ae1fdb29304b2adc98c49ae4c
 AUX pgbouncer.confd 425 BLAKE2B f9b7065c043474f2208b44eecefb9cd1d6544295a47c3aee51f340f522eb4ba87bb270c99e18183541aca144eb16487a622ff5f2b5d5b87b2d1c7dd950262afd SHA512 9f997cbfb18f5bb1623aea2a9af706359a973fd2167be91ee6ffb37a22a6dc453280c66b6d2c11ab0174dbf159a195f0a1612be198466633d728a5317a878035
-AUX pgbouncer.initd 2183 BLAKE2B 1a1cf76abf1de076aa7c4362a52ff84d754306d51a8da19f6d7c320ebdd64b7bea5c1e914cb947d55ea274220543ce5adbd2969656f582dc439f2b73c0be2914 SHA512 ecd34f017316b2c0aad172e5bf5393137da5ab841f4d6de93eb82a07abe9f234a2426ca7dada2dc047c33ea4c7dc0af3040b249ec1f9d7e0c1782fb0463a7293
 AUX pgbouncer.initd-r1 2216 BLAKE2B cfc489a5db03b6e4c56c79036d070152a6f78ce6c300fdc52049aaf91c41db1e2a41af409e701ab8dc2a24a5ca4e8b89b38cc61c52885a1330a04ef727d7585e SHA512 c2af62daf4e7c8e5a25acd17237de2134f1e496a51bd054abecc020a65b39c309c85572c17105431fd598a80ada187fb32fa8f2b1db229d2207c59607748220a
-DIST pgbouncer-1.7.2.tar.gz 462374 BLAKE2B 0fea85063e30dad3b7e5d145ecd8660d260c6c09202af3661e8acfdcb5ab25f5c23a2f4e02fcfdfcee872ddeb92b78e157457aafa158ee759a1d73a3d33eb009 SHA512 11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d
 DIST pgbouncer-1.8.1.tar.gz 465930 BLAKE2B 692c551cb7bfb56bfe1b354791b06bdf61866197150a78a7fa9688891a2e4cd3c015abc5fbe33bf66dc85ab0ae83745f2db852eae91ae99596c97be0154e8bd5 SHA512 595a94db98866cec211f2b8c1ad13d209dba00e5fd41f2e9025aabdcb660194f0f772810270a1d9f067c3039c9fee630e8ff2d56f231935add17207aecc10bee
-EBUILD pgbouncer-1.7.2.ebuild 1786 BLAKE2B 00dc4c138a598a44bed9fedd366eead98f0d0f560e3dd941cfd472989c88824f8193839732b146b989c2d0f906424155f8d7d7be530d8f3941c04fb540bf5201 SHA512 dabfa3936e5292c14d6aaf44489c4d8b530725328776ac207b90b2b0dbecf6a3767b858848eb3d94be8766cdc496584c5062dda25f2b291e2aec68c05cd29e98
-EBUILD pgbouncer-1.8.1.ebuild 1894 BLAKE2B 9ab35b90aead2714dbefaea801bfa13d9c3f83926124f368b39614edefa7f0e77e7c1321fc50aab884ddcdcf6a919dc32382676772ac5fd35b854286d7e85136 SHA512 84323f9ee97ff31a1ca8014aa3a1b90ae2dcb8382566192f3ab854ac0a461d46d513c5b592695b3a80c5866539dd5cf45316244b5898d85f38dd07ce64310059
-MISC metadata.xml 550 BLAKE2B 62cc3b07c70773656e24c6a90af4d0e19869f4472f3de01221b08a2361ba1c00080677f3bf07cf25734e280250821710e6281038b263cb4656790c7332cfe40a SHA512 7639d610c12de943d4b7c7b77e832a1e47865dc3deb934f9d23a2d521ea1c72a8c481dd9e3c1fbe5b88863e37e19a5a6229184791f4a0a04ef7989a91300bb7b
+EBUILD pgbouncer-1.8.1.ebuild 1892 BLAKE2B 7fab90d3eb06d905c21a42773532c21fb978d7040915d14262f5203eb54db0fb7a6747b88fcf0183b6980f29a81774d79b809c50193bfdc07def521b9df42f2c SHA512 723a646c3694518d5a0e40b8dc6dd6ea2d393b6dbebccfafb324a1d6f160415166c3ac1fbda068aadee277c2ac549fca92109d432a6ec49f20f687ffd06fe931
+MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/files/pgbouncer-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-dirs.patch
deleted file mode 100644
index 62bcd0b84409..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer-dirs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naruw a/etc/pgbouncer.ini b/etc/pgbouncer.ini
---- a/etc/pgbouncer.ini	2012-06-10 19:57:01.000000000 +0000
-+++ b/etc/pgbouncer.ini	2013-07-17 02:25:59.598888628 +0000
-@@ -29,7 +29,7 @@
- ;;;
- 
- logfile = /var/log/pgbouncer/pgbouncer.log
--pidfile = /var/run/pgbouncer/pgbouncer.pid
-+pidfile = /run/pgbouncer/pgbouncer.pid
- 
- ;;;
- ;;; Where to wait for clients
-@@ -40,10 +40,9 @@
- listen_port = 6432
- 
- ; unix socket is also used for -R.
--; On debian it should be /var/run/postgresql
--;unix_socket_dir = /tmp
--;unix_socket_mode = 0777
--;unix_socket_group =
-+unix_socket_dir = /run/postgresql
-+unix_socket_mode = 0777
-+unix_socket_group = postgres
- 
- ;;;
- ;;; Authentication settings
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd b/dev-db/pgbouncer/files/pgbouncer.initd
deleted file mode 100644
index 20479dc22dab..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-depend() {
-    use net
-    after postgresql
-}
-
-get_config() {
-    [ -f "${INIFILE}" ] || eend 1 "'${INIFILE}' not found"
-
-    eval echo $(sed -e 's:;.*::' "${INIFILE}" | \
-        awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-PIDFILE="$(get_config pidfile)"
-UNIX_SOCKET_DIR="$(get_config unix_socket_dir)"
-
-prep() {
-    if [ -n "${UNIX_SOCKET_DIR}" ] ; then
-        checkpath -o postgres:postgres -m 0775 -d "${UNIX_SOCKET_DIR}" \
-            || return 1
-    fi
-    checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname ${PIDFILE})" \
-        || return 1
-    checkpath -o pgbouncer:postgres -m 0644 -f "${PIDFILE}" \
-        || return 1
-    checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname $(get_config logfile))" \
-        || return 1
-    checkpath -o pgbouncer:postgres -m 0640 -f "$(get_config logfile)" \
-        || return 1
-
-    return 0
-}
-
-start() {
-    ebegin "Starting PgBouncer"
-    prep
-    local ret=$?
-    if [ $ret -ne 0 ] ; then
-        eend $ret
-        exit $ret
-    fi
-    start-stop-daemon --start \
-        --pidfile ${PIDFILE} \
-        --user pgbouncer \
-        --exec /usr/bin/pgbouncer -- -q -d "${INIFILE}"
-    eend $?
-}
-
-stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_QUIT_TIMEOUT} ))
-    ebegin "Stopping PgBouncer (this can take up to ${seconds} seconds)"
-
-    local retries=SIGINT/${NICE_TIMEOUT}
-
-    if [ "${FORCE_QUIT}" = "YES" ] ; then
-        einfo "FORCE_QUIT enabled."
-        retries="${retries}/SIGTERM/${FORCE_QUIT_TIMEOUT}"
-    fi
-
-    # Loops through nice and force quit in one go.
-    start-stop-daemon --stop \
-        --pidfile ${PIDFILE} \
-        --retry ${retries}
-
-    eend $?
-}
-
-restart() {
-    if [ -n "${UNIX_SOCKET_DIR}" ] ; then
-        ebegin "Performing online restart of PgBouncer"
-        start-stop-daemon --start \
-            --pidfile ${PIDFILE} \
-            --user pgbouncer \
-            --exec /usr/bin/pgbouncer -- -q -d -R "${INIFILE}"
-        eend $?
-    else
-        stop && start
-    fi
-}
-
-reload() {
-    ebegin "Reloading PgBouncer configuration from '${INIFILE}'"
-    start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-    eend $?
-}
diff --git a/dev-db/pgbouncer/metadata.xml b/dev-db/pgbouncer/metadata.xml
index 29bfef0ab645..ee74448388b1 100644
--- a/dev-db/pgbouncer/metadata.xml
+++ b/dev-db/pgbouncer/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="c-ares">
 			Use c-ares as the DNS backend instead of evdns (libevent).
 		</flag>
-		<flag name="libevent">Use libevent 2.0+ and evdns as the DNS backend</flag>
 		<flag name="udns">
 			Use udns as the DNS backend instead of evdns (libevent). Supports
 			IPv4 only.
diff --git a/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild b/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild
deleted file mode 100644
index 39eec25d1f5d..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Upstream has *way* broken tests.
-RESTRICT="test"
-
-inherit eutils user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc libevent udns"
-REQUIRED_USE="
-	libevent? ( !udns )
-	udns? ( !libevent )
-"
-RDEPEND="
-	>=sys-libs/glibc-2.10
-	libevent? ( >=dev-libs/libevent-2.0 )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="
-	${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=app-text/asciidoc-8.4
-"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgbouncer-dirs.patch"
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		$(use_with libevent) \
-		$(use_with udns)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
index 69a361cbeaeb..f590a731732e 100644
--- a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.8.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"
@@ -10,7 +10,7 @@ HOMEPAGE="https://pgbouncer.github.io"
 SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl -udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 4d476d428b7d..9bad49031efa 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,13 +1,8 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
 DIST phpMyAdmin-4.0.10.20-all-languages.tar.xz 4323896 BLAKE2B d645280c185904a91f2f9b7d365416d13fd3416c46c82fe3d9ed6e406af0c97e6fe5110db34311689d2fcb4ec3b52d6db64e9e455ca1283794c4667c315f97ba SHA512 e1d8b8a503eaa19a090d24d5ad011241aab06c2767138424d875edd82a868b4ebcdf5bba154b7eefef23b41d1949dcd021defe17e9047d0bf5fcfd0d6a5f4d27
 DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 BLAKE2B 10e1168ab7a1d8dfccf5837c211a2e6455d767e27f11aec870a9c4a1a19e8a4a1df67b82a7a83ff3c184c8a111dc272da5c876150615a9fd9a32a643bba84007 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3
-DIST phpMyAdmin-4.7.1-all-languages.tar.xz 5665344 BLAKE2B 6fc7570badf6496da6d038a117f7ebc523c3bbd4c7bd5193b5350df69b21f1b631391bc5ab0845193c2dabe2b9c54e16c6173495d0f383d17dac5734492166e4 SHA512 583ad8c8ee871fedd4df79e49845554f2f6182a343439fff8f91f61428964a85f3305590792096ede95a2ea675f065a4a4cdee31d365c03d2cc3aa721b0aeb6e
-DIST phpMyAdmin-4.7.2-all-languages.tar.xz 6270116 BLAKE2B 6ce9d6940f8e6e9fce73b4177cb85283c8719fe080082a5f3c493493133e05deba76a6ee57843f9e01d4ba15109f1d56a73f436eba1d105bcd59b4b914a7723b SHA512 ed0b26fd53d1a7d77dcaac98c8570282855b967aee23814fb61737484ea899ede7d900fd0baa27c20fa8ae9a55009db6037b1be42bd6a24d471d672f138d1761
-DIST phpMyAdmin-4.7.5-all-languages.tar.xz 6254188 BLAKE2B eaa4ace63f6f74fd36249d23c839f574a2a78373f831aaf89fd42013684242e1454005bf2b8acb10d49893288ef660767e869d38e6e255592626aec895037bb8 SHA512 f79a6779d3cd216e53c14faad74fcd35f4e89865c2b91cc6fb7599cc16c9a273143a6a491e960c0c902d29dd9e85f123f61bdef5c7b0cef45b827296f50d3d82
+DIST phpMyAdmin-4.7.7-all-languages.tar.xz 6411768 BLAKE2B 59ea3c69ee6bd019d5ff61f16ec37c39b9f94dde72198acd1892d4212d2258b9913305d22c93f6925426a9554c411ebf1a20beeae0a5b5a4f869a3bf7da9d73b SHA512 7eab8567a7889b79839104c3a46cfa7a841cb7188dc0bb0a306a6e15d06265b70e2b389c25e69bef2ebb77c7460381342322e2cfe546686d9b314b99c9419513
 EBUILD phpmyadmin-4.0.10.20.ebuild 1562 BLAKE2B 402c8f669c785bb084a8d7af247c62cd070eced8a613b43303bb2bb44781041f3e099fe5a4ff5817e63ff8260b898f4bed232ffa7e358075991bbe6f5a5656cd SHA512 e15e47f37a54090574b4c4554ff295fb9ad73543aebed5718e28575c238b3e59c393b091eb34ddccc04be8297b08deb442d27e12c595f846d8810aa50561af64
-EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B 80439ee64be9386811dc843b83d11f82e0518d031608174c428963cf472c1d6e02e3a9bf825ed5d778c0c27aa59c6348361f2859d28726a4f77e190ed39ee7aa SHA512 5dfac57cc1535df8edb5cb2ff9b37ef0336ca199d306e0adc9522b80172f19decba837f9314b8aa8dc5981eb4bb6a13e235022a7cb788e65ba4c136b13bcbb0f
-EBUILD phpmyadmin-4.7.1.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
-EBUILD phpmyadmin-4.7.2.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
-EBUILD phpmyadmin-4.7.5-r1.ebuild 1569 BLAKE2B bd9908d6d725ce669bef74fa23198fb15009afd4b03c3f966c5c8a24b8eadfaf4ac9afd42c2b6f7d73b292d097057bfec5a4dc5a0f5cffd562b4f6f82073119d SHA512 a6ea4d0eea7b1c3a1a9fd7e8c3cadc9b661e627c3108212d466c37f87bb249d2b7e89e33d739836c96e71520af72c634442620387772a7bb22698bb9310c7dff
-EBUILD phpmyadmin-4.7.5.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
+EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B bf1ade74bd74565b12e48237ed3acd11fbe066aeae08d8336cde2dcf104e6caeefa351aa8da751673cae6430e0b96bdf93ee382b3df22e22ead06d434c6b17a4 SHA512 9ba65eb7c35fe80be1f4bfe6a967e72e4e287f868f6126120f972ff12ade1def36a6bdfe02a8ed8b9cf9fc71f8c8561de4696567fe539b414e5ddae1932a0a0b
+EBUILD phpmyadmin-4.7.7.ebuild 1575 BLAKE2B 0453764f5d69021d970a8a4145c73cc23956d143555bce4b1442e2db40c95eca71d5368327f0e119969e58562541fabddda5ea325650682dd27bc58395ffe8e4 SHA512 5bb3cc05f266fb2abc4a6ceacc83c82d580b73010c7be4d84220c33edba3a35d5798825688bc99672155762bf224e97a36ffa135fb181043305615349f1796e4
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
index 3422d6c70f46..5ef8db1963ed 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.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"
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild
deleted file mode 100644
index 80ad74d42a80..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.2.ebuild
deleted file mode 100644
index 80ad74d42a80..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.5-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.5-r1.ebuild
deleted file mode 100644
index 3e718bb6b1e7..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.5.ebuild
deleted file mode 100644
index 80ad74d42a80..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.7.ebuild
new file mode 100644
index 000000000000..957fab2d7f8e
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e0c858b73ecf..d0fd83ff0332 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -39,32 +39,32 @@ DIST postgresql-9.5.9.tar.bz2 18677113 BLAKE2B f0d1b7440163a51e12769fac73458a101
 DIST postgresql-9.6.4.tar.bz2 19566875 BLAKE2B 8269c18090548f8df987671a4129edd79e76e81411d6c6b4945a78d44e7d15bd494707aff98b8308262e6f00ee7607639a2de3492b65532f297e02994ecb1f00 SHA512 b0527efacce6efc09340b68c8c56483cd884676e01cb6bfb4f9ce63226a394bdb0bcf3d832f84e4dff5ceecf09ef4cf93e9fbd0ac453ec85efb11ac50a7dff39
 DIST postgresql-9.6.5.tar.bz2 19576132 BLAKE2B 6b924993df6cd8cc990b83c0707fd04286ed5360356149b8ef587bde514c618592a4911b7e938513af3ee84b0835a2e1bae4d4e72472671931683d5f057eef8e SHA512 ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
 DIST postgresql-9.6.6.tar.bz2 19605724 BLAKE2B efdb13a4e32133b31a0ee368aed9bf76f0511596a2d77ade60129c2c76b0ba2c7dafad532cf09ae007d7110175a153968cfa151cf8aa7008b59d36ed00ed18ed SHA512 ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
-EBUILD postgresql-10.0-r1.ebuild 13718 BLAKE2B 27dd08a76dbc80096be4f9dd33e244998261054529e9c7d6d6ca1c903e387b0ef15d7b9d4fe3a5fd398e96950fc1e96adea5f242e016f908849eaf2caf0a9299 SHA512 e2443dd07eb0578ad06f99290a923a53249c032bb28aea4d716aed4ac1d5dec6c8838db707250f02a12225dc83b05eb725cd6da3e338418cd0f15537d0c52f60
-EBUILD postgresql-10.0.ebuild 13570 BLAKE2B 5d97cf3212ae7855a63594bc9be5e10b09b6224ed61cd9e638fefe1c0137323676af17ed893d553a2236b862aeb073e22c7a747d13076968b411d1a228f30465 SHA512 671f44a9fa22d505203fc6907f5232b7cdb5f19b756de9faa564f86b9d78baaa8129a4dce6ebf3f44d37f562bd9c72647132d461dd7bfea6366e596eae416f47
-EBUILD postgresql-10.1.ebuild 13712 BLAKE2B f7e1c0a089158f77e30e8fadfa8460d3c8640d3da3b78a270fd3816d6ae777f26edae450c5f30970698c9355b8c9314f1a7710c6b09504382f0459e86d0401af SHA512 618cb59600063d2f70b83561adc9259ccb37b45ad5296df6f99cc17d44d8418959692de262b3bb1199e850b223e54c59bc24d9aaff6936b8e03f6b2db0039978
-EBUILD postgresql-9.2.19.ebuild 11698 BLAKE2B 69b80a6fd5d0c7fb122ee5a2c09e43b928548df25cc0bde0ccb5921f58d75ce060620a397dc5094b0fef2fe88dfd09b5ec55222f12292d00f3f4d0ec05d52ae3 SHA512 dcb8c61672c107908474273cf3588709dd7c0bed6b1bdf7eaeb4696236b764652ce782f541ffc3d1b929ef116fa5f3a7060b7f838aa6b4595b162f4c3dfaf46d
-EBUILD postgresql-9.2.22.ebuild 13308 BLAKE2B dd79962758fbf69a7c19b906b2dfd6c8f0a12f5bc3c0c44ec50f6cb5a8c7661d5c64402189664d6a3a9cb1e4f4ea4a36d2b536dc3cd2b05d8f4714a03c59e485 SHA512 835f581474a442eaa64850fac4ac839a08c1ba741e8aef7e655d9c597dca8d8801324288df5d6262a29034fc38dc4feae382dd2d9ce46c68b1bef0cf51e61753
-EBUILD postgresql-9.2.23-r1.ebuild 13504 BLAKE2B 8b8a06adfd5f67a9ec338470d7d0e9154c111ba15779974ea4a62e538c44f92e822277187b4e7c696d426dd685c938f687d4cbad406f1b0d44b0f5e9ec22eba7 SHA512 ef5b97b14037821341e9f02b11997383fdd038425d2cfebc715d1c571aaae5bc6e6eeedc25fc897434511c38b38ebb871829bab076380933b86a7e5993c484e9
-EBUILD postgresql-9.2.23.ebuild 13316 BLAKE2B 9a8a8bfb497e0138b4d1d3c96a9afe2dc0426893c8f20d4d53d5e86308a2ad9850ee9a9eba7af963b514495ad7f1345daae1f6bf37887264ff62b9e1c5c80dc0 SHA512 fadcf072d550b3c86f91097778fc03688379c0056c962897e54308251e8ffd1c0f911e4d22216374391a270142e8ae0f2c757a39352cd8eadbb162f05a959328
-EBUILD postgresql-9.2.24.ebuild 13496 BLAKE2B 0bd2865add3c74473b93de19174e322369ccf5954b20b29c4e67c7e640190043b406000e8bf5636ebda98b0ca1a40e86411f60b201244423159b19b389fb0c03 SHA512 1280a3570920bdd3df81f7c82a12c18614d0ba933cb1c049f89e494fff7387f275991e7b63f13c3db2eeb82a1cb995553d364592d8eea7700a8059d42e75202e
-EBUILD postgresql-9.3.15.ebuild 11953 BLAKE2B 7aa6761b549e31aac82a3371958c71905cf3c3e42463bf193e9f2e460c0ee04f4f45e48d9277ba1b9b70a8de9b82ee2ba23b7b3aadb993e4f57afe6c9d89d1bb SHA512 c06f141c282ce71020bfac8cad64407aca9c7dda4d658bd0d83059df6a8ae3f75ba2b7d3c39e4f8fe13caf68594e26215026fff759fcd9683b52f8f1e7ca90aa
-EBUILD postgresql-9.3.18.ebuild 13567 BLAKE2B a9964d437ffad1b7ae5a1f435d0d037791271239074c42849e9989a5033d2e679af5ec71569f71d360312ad6ee2cfcb23fb548c86e73529ee031f0e4fa0e701e SHA512 da56d14afa727cf36cbcb5a9e6c61c45c54fca230e76a880cf687e8c0f876c9b450f7d98761f649fdf2d7a53639eb4b3e7c3e504335c1a6ea9e61d8df8db11d1
-EBUILD postgresql-9.3.19-r1.ebuild 13763 BLAKE2B 04d4904c9caf9796d410ef79de203c9dbaddb1b8bfa8038bdd65296956bcdfbfc0d122203c876b2e81f71ee1183dbb22dd9664b04dd4fa603cc96acfb172237f SHA512 df2a421306b42aaff1fa0822a1f2d252fd81bb58f6c27842b54fa042f1df22fa9cc6172ca1f8da38c3f00307acf181bb1d1f32dd1456bc191458779bb75fa526
-EBUILD postgresql-9.3.19.ebuild 13575 BLAKE2B d5f0075ee978f1196ac32d8446cf83052a6184090d7ec4d01ea523012fcd806f754984f1da1f7664be4a8068c3baf9fea5d062a043f70c3552f788959bfbe555 SHA512 2995494b44a7378a74e062a50606eab94dc9ae89fb9d22eeb74c3e56f9abd37272bc7cb66868503fb8d7424cab7cb59005f6179c3e8fe056c057c45108e89425
-EBUILD postgresql-9.3.20.ebuild 13755 BLAKE2B 1c17b2b8375386f95e2b0d2d72436bd3c6622fe4e42412097b638197076e4e3d31f304e92b10080bf6ba731df3d11621e450127621fa627181e3281f1cacf2a5 SHA512 bed62a4584fbc4346b4fc8475c0ac3658fec408f542b7619330180ba4c8f1b2a5fb8d92e3237222862c81a028a2177c6f4e0e662ee91cedf7244b34c4f8661c4
-EBUILD postgresql-9.4.10.ebuild 12763 BLAKE2B a40fe4e7e574b46501d9ccb76b4e0b2aacf6ea3b667be3fc95bca7d4b4b8ff3ec3fac9b381b5948687c5b6c4669a831a233f91fee20216ef8b053a63a5d68de7 SHA512 62231264545fbeaaab139742c97ca944e492be296b2b544bd8eff24c69ecfb47de1db1e0810eab1397b27e8488085086d83b2850837a9471b1843a8d6288fbdd
-EBUILD postgresql-9.4.13.ebuild 14377 BLAKE2B 1457cbf458fda4a6f89ba15968b9a67394b7303725f803ad6b789a257e0c58ed799c221c86e8d0efdf3469431214f959704d09d107705ed61f1d3ad5e6b7ae05 SHA512 d348aa6cdad7983f0a4e41e23a353bf8b1f72acb8396a78b3a64b5ca80533e25693b7a7f5129185b02e0fd7f65a0e59125fc2e7adcf6527c52494b50d1941030
-EBUILD postgresql-9.4.14-r1.ebuild 14573 BLAKE2B 756cf936089221584e7c9289506b9ff33f5d4a77a76cdd1c019c18ffae67319f7b3a2159f24fc00145c87eeaa97731644439c25c0957392fbe9f106a2f9749f1 SHA512 59039e81d766b0e80d54917ab0224a251f9f66d05ea696f0e93da2e84b440df3da67f1785b30f27ad276261767d570f5a5546e4fb44c2d114d23d1caccea8bd8
-EBUILD postgresql-9.4.14.ebuild 14385 BLAKE2B d1ea367beb96d77be2a607c9acfdf16b0eb58fdda13d67190de066a0a6d3d3322de2e2a1434f0110dd11c4932323cba21cca5c8763113e2c53281e780a9329b9 SHA512 60d858f68cd7e4c3fbf2525cbd3fe57eafe46d4f83df648834b4a5b74a0cc652c85bbc3a090594867c31c8e98d8552e5899dbbd0301ee59dd25f62652c843c49
-EBUILD postgresql-9.4.15.ebuild 14565 BLAKE2B a8ec98c534e85bdcd4248cfdaf9e0295f9ed6262832ce90cab3dd7bc9ea436f1cbed45db96e402eaff6133367821aecb643962c02dc3b851d1ec498c93d4e45f SHA512 80bdb6bd5922d39c1546e6f39007d7394ff0081008c88eede273deb748661543f97a97f3ea382c4d1ac589faf801f9ec614b51dd953fee22366941e9f2cea743
-EBUILD postgresql-9.5.10.ebuild 14793 BLAKE2B d0ebd663594a50714089237a71a2e2dded3b7656395e269a391a2b20d5d9cbe45703ea9132053d5e3b8c5c9a62439a93f1c7e0e4927b280f4656b924fe4d875d SHA512 2efe73b0c0c38e3bd88e92e485614b1fec90b6010f24be4d2088c4d8ceb349050706dceb58af94d6e0a44245e38ef0884a2b4c7e8a48c693c0111c03e2bde5fa
-EBUILD postgresql-9.5.5.ebuild 13102 BLAKE2B b620a0b684815c4871f397c9520c7e26e22290dc194de70274dda47151b317d8156f59c847e7e55cdddbfa7e88365fee71494a62c6327350469ab250f8eb6f75 SHA512 377d076aefad3e93555bef64523425bc424d1fe11b155e56d079c8b6b796af57068e8fa096aa24c875c22765a519a1656ceb56b31e1682ae233e8aebb655bebc
-EBUILD postgresql-9.5.8.ebuild 14605 BLAKE2B c9f0650de3d8a5ee356e2ba3845d1da83d6d1dd775f05fd6e57db140c4137447958e79f9f8560616dba94d5a58279fb6249026919608e7dc17279a8010dda5a8 SHA512 a5e2f36834f4369d2c6672355b71ff813ba4af7ad905ab1aa4e5993e3e2625198eea3d0e1b641880afecd721b49c6d30975e5ff6a258fb873285ac4b96ae0dda
-EBUILD postgresql-9.5.9-r1.ebuild 14801 BLAKE2B d535cc00c78f3010a2d4eff648f735e1d7c16433b2bc1bd9152e2f57733f233128afc1e4b98285aac41c73972ef30f36855db749a117324e4e14dcd8f0c465f9 SHA512 cedce713f3b1b39da7ac7d36e67c6fa26e8815d9677bdd10be7ec645ebabc0971790823513d03ecb1f5e755fb4c4403a251ed56994a5a8b1ebcb8e88b5e94889
-EBUILD postgresql-9.5.9.ebuild 14613 BLAKE2B 65f42a5efbcaf71805ceb5797a7a57600669e4be0fd1f85a0ab46c78c660fd68c795283df0029baa9c6e2720f3d2061e6e3dc8c5e92c4e990e30af693eed71f5 SHA512 4cde98b6e9b3268c60d190e9a20932219c5f7f48811d5fb359f6d6cfc6a165f45aa9854eb55a39f6d1b816846a532a57ad71cf239acef1ad5a1a19b8ff62025a
-EBUILD postgresql-9.6.4.ebuild 14787 BLAKE2B 2a17dd3d64f6df032121313c8f78c86633e0599170cd83a34bca5ce7e9366daef8b5e89b573d25375966141ac7b746c653fc326757d2727070d000930ccd315a SHA512 cefc41d43b471e90108371620b8373546e10ef38c562b15bb7cd01bf0a9b39f10f39f01ea70dc315e91de956990ad6f15ccbe004ec7a988affcefc06a84c7cbd
-EBUILD postgresql-9.6.5-r1.ebuild 14943 BLAKE2B b103b71e5020b4a416fef97d920b8eaedff670697cca0a15417d4f2fd936e60c652e50f164885137c1dd8dc054c3e8fee4b2d82fd03fd65cf4b39ff0daf32935 SHA512 0b2c3bdd49f640649d73064cb78b4a97e241b5468a5909adbe29d503c0e50194da0a37d9100d065f7de76ee42be69bbf2ac9e4005bd0b7a7404bc53773dfeb68
-EBUILD postgresql-9.6.5.ebuild 14795 BLAKE2B 65973ec63da43ebf4d4cfada7cab50da9e8ba683c26a832ab6322f2436c76b3a9547bad575b29725e328ed2a42d846cf2d3958142487aa23517adc726b4bdd4d SHA512 065a4370093a6123e6ab4d906ce8ca6d415873d2cd5f12c476cb70d71feac44237bc85f1a23a21ccc51794c553f7814c4ed39eecc7e3cda74ac7580f70c174d7
-EBUILD postgresql-9.6.6.ebuild 14935 BLAKE2B 94b4028c0aa708dd2f7dab96fa2aed500dba4f3841f8e68b72c7132ad32d9f9f28e9a0e82b20cfeb020f3ac3abc3d382d1be03d11b0b9251ae95be0e72c1afa4 SHA512 47d484e5f323ac896e6c1b1c51142ffe4525db81401c4eebd662b21639f7ca0c45decd6e3ed7fc05e89cb4aae65d1dcdafd71672ab7be4a94ec7b4fa329d9d16
+EBUILD postgresql-10.0-r1.ebuild 13706 BLAKE2B 39ba7094d70bb5b8446aea7c3b8fd6acecccc965a4a520fcfde569bdfc43133a010ad6d042e4d6caa990377776d041f43f56c73da4396e8c88853ea56e263ea1 SHA512 71dca86e4f7942a2ccfb6c9782b26bba8a98867716871bbf1a3552134cbca05323db02ce26f94e147596eaf14f944427f163d89a0216691b39a8f1c535d10934
+EBUILD postgresql-10.0.ebuild 13558 BLAKE2B 09ccde3b40e3b43072d0af7caca928ece14592fee037e75290660f04a4cbd4445e24268cbd3585c1608a177ff63969af14369b6cd8642b60173f3ce2f751f4df SHA512 0420a1e5a80840b026db1b244d11ecffd80af578b819160cde6e7dcef003916b84ad125594d135192a36ba546d3fa315b37912b796de271d98093f65dbd2db9f
+EBUILD postgresql-10.1.ebuild 13699 BLAKE2B fec9f438c7121374ea245c5833cbdc549daf2adde98aa0eb8cc1884da420748062df5fbf31f195c4b03aca648e31c8d504aaae0490a01a2850fda5621b672c4f SHA512 68cee960a2e0fc966387c2b5b1a6be17b8fc333eded55b91315f52de51ace36afc927679d12891152a1790efdfc9e8ab94d60ec116b53068320f0fa86429f963
+EBUILD postgresql-9.2.19.ebuild 11686 BLAKE2B f925064291b78586507d974cf47f850cdcd900dc6a8b60432ca02f242582ff876a13033a093200f4936898d48eb2ff47d74f808c84908962cac0f8b767a9c199 SHA512 886faf3fe74308c908e8c49e7a65cac36e55932eafee581ab021ef66ab3cc7fe2e37c5e4011b33239f6c11935465a6875e8f6d5b86fe4f64e5ead807a1e73164
+EBUILD postgresql-9.2.22.ebuild 13296 BLAKE2B da5e5cb771bbd20396f1621b7af93052a5e2fb022073286aa023245c083c146cad4d911d8754a94a33f9960ab91c8219c76bc624d15e2fbb385b54ac10f34558 SHA512 e16dca2871f2ede54993d9a81768ebc5ad3391041916d42108db09617c7d5577bf0f8daabc30b4d7a6851e991886e3155320a0a1c384c55eb248de12b3f7894e
+EBUILD postgresql-9.2.23-r1.ebuild 13492 BLAKE2B 912b67da2be82aa402ff4cb684f273a1630a6b551adb66d92125bfae9c81b66a48fb7eace28086525ee1bfffa1072a2f756b374a2d9ff10018ace257ab8643fb SHA512 cfb518dd4033579b2fe7f459555809c7d141bc0e15d80d308afa0ad1d3ec92e8809f81d92b855b97d76b299b2e6ec7a48971f2a6fc052da2ec82f048aa22c009
+EBUILD postgresql-9.2.23.ebuild 13304 BLAKE2B f6e73d69d67cafc83186920d4a6d9eaf171de7e9da604a7b7320f3272734ade7f3de09255bd7a979ff7c8a901cbe083cdf41a583020946dfbaf18d626ba39efb SHA512 7f66c1cf3ab6c9843c9ba4d36eb4752c9647a016500aa0e77a1ea30265fe9dafdb19eda53350c506d306123d17814f75de1ff124bc2672828bcc4b8bb22ce952
+EBUILD postgresql-9.2.24.ebuild 13484 BLAKE2B 348f9796cfcb9677460b11f9aea92bc2c85c33c3ac3a503d06ed111b87ed8b6cf6338c4a6611bae293d15a49e05c780506ba82a66307445e0d7585d9732e5360 SHA512 cd89c6f3ffa3703b1588f25134a068c3752686596d8d74a59331911a06b33878f9df4b3a013e42a4fca83e217d1a16c54059fc39d4614df7d102dc83e65e000c
+EBUILD postgresql-9.3.15.ebuild 11941 BLAKE2B 33410678e64b27a4802e11c1a5fcacadacb0b1332abdf61dfd64e0d6173b0be91ae9d457b58255dd56e410e13c9b5f778b7094acc8e1ddc1e265f685cff6a60b SHA512 3372d3801726ea6509713d79393ee59fc30eb2d832f17805f3d990308813064a59f42b7930d3342639475eeb37bdadc4952cf945e574f47c8ab7f0e9013b83d9
+EBUILD postgresql-9.3.18.ebuild 13555 BLAKE2B 7286c69b9e90f71b580a7a6322827a781159f4795c06ae451a67b2f9313d42feb2167731d2d90f41f82db964beb7d0dd7a14282822b1d93804d5a6277b2cccb3 SHA512 023e245ac034bc9f7ace0eda89cac335e860616694a2daeff3c6bc169d4175eadaaeccd4897e499fadb07c5834a23853768f0e54ca741e0c22d95b6e230424d4
+EBUILD postgresql-9.3.19-r1.ebuild 13751 BLAKE2B 1730adadd67e5b93b7d3e3dd8db055e5c7e3f7e91db5069dc29075c6ab2dd96fa70df8b1c579e66425deb6dff8c19edc11b29c9634b4b5d2480a12d68bdd283f SHA512 bf08d33c60165edc38490d72c3694f1cbef6410ba5ad15dd3688dc809a6f944c01deaef2e6b78028771997ff627868c115f37bd229f46a3d89f064702ae2e187
+EBUILD postgresql-9.3.19.ebuild 13563 BLAKE2B 59187354e0c79ddf17106f3eb10fd3ed18556ae39afa331d03b25a5a72a440b357de05915ee945676f58ca3d2baaa7c7db38d594dda306ae524c76c830ad22c2 SHA512 9ac8f183621716b9659d6989b68d8e03bfa4b1a55e1e9fe74a9b6ad0bf471b5349b4ee716a394f2f569711847fe3dd6e9ac13b8db8895a21151571f7dd7df4de
+EBUILD postgresql-9.3.20.ebuild 13743 BLAKE2B 0091b6d68f03e3cbc612d2f1f2a9973a27e0870b63247656ee14dc9d615a328a599c26c36d4915ee6334a22ffef68d5b8bfbfd0a684652335aee73746415ac40 SHA512 535b320d112f93d4d4c803befa0b2664088e124e354fbfa387a833abe012d114503d7f085cedfcfcfd084d8c74117797012a8d701ddd6bd7e1b80f4b4776cdfb
+EBUILD postgresql-9.4.10.ebuild 12751 BLAKE2B b90abd3b620ce5020b6c9af6e26856026c43204d7f15943a04c33c6dbe75c6b8aab8e4a59022a76913baa8596e0e44ffb454d8d98d7b1fad3747955d0e867ec3 SHA512 ccf11b56f79cd334fb67c13b549506c5c1bfe09b9496466d5d4d4dc976a9e5275cf9e9c1d0e579d615716f1abf320953126d531591439d5d1f777cdac8e4f70e
+EBUILD postgresql-9.4.13.ebuild 14365 BLAKE2B f2b228a5818894542ee25aff7cabfa081a3d29bb1f7ddfc9f590ef657fdfd1c00ea422ae7f817febc69d662363a03e5eee365e47bd66fae1ec469b97e0456322 SHA512 1ec266e5998d75419b93c8962be2593b4fdc1e9a0ac169056f50e9cc32ad411a6a6b77703d0ea2a5ae5348d01b2d38199af8a3eb7fee5b7e4c4b7a83e3d7d421
+EBUILD postgresql-9.4.14-r1.ebuild 14561 BLAKE2B 5256dc5e253fc837649426959ba6a710ef3b2a234b4088b46db08a35b2bacf5d45fba2357bd66c5c6e11a9e138d71d5495806d544fa4b60aca0a554656df1a61 SHA512 40d3a1aed466df25a5c855c420bced8741bd0d7cde03693ab7325c3d24fa64fda20db15c49e5f5b84b84468990f07ce1fd233d3e52e9b1ab9d8f28a3dffac0e4
+EBUILD postgresql-9.4.14.ebuild 14373 BLAKE2B b4f1d8917c03af03b2b5f84388eab671137fcb8fe7c5307ff91ad612e7898a0441162e080400b87d5ac99980ad69f3a13b66341862a442cbf3e5bd5124a3d489 SHA512 826c2aeed23a6b9b8f9afcecb10163e341250129cfc9784ebbb40a4ad95c05d5852aa71ef7728e8d216c04e27fc9fc144670fa96e136194f99ef7190a3753531
+EBUILD postgresql-9.4.15.ebuild 14553 BLAKE2B 91424a71edd45af2655f7b76195cae89758bfb415474593231528cdfa69256302b3d9459a158a98629c97b96d25666f2fdc063a24e3807886939b331adf5695b SHA512 916a5b114d607b39c94c277af28034f57cb497c70ee5e5b092e9b8780d490ef9acd138deb61accae8931c96f3924264723fcdfbbd5a90c114f3f08e943ff58b7
+EBUILD postgresql-9.5.10.ebuild 14781 BLAKE2B 7b3162668bafc31a6c706364ae2c0aed726525750f84b369948326c65222c5320c2637bf1fdba560eacbe95be1509947997f2512031ec8164034baae95bc1893 SHA512 074ab261c34d6e738015a9b0be1b2c1d9f4258ee3bf7c32d8189189cf040f7af744453d6e0e72f7020ff3cafa69bb103cca571327a9e41ace225abcf63085e1b
+EBUILD postgresql-9.5.5.ebuild 13090 BLAKE2B cdcc7cfae7249c37a72bdb0a5c91362bc926170bc47d046f2023ac34ea925281d2f136500c1cae288b4ca2d4c9c8f90b490ddb648c26b3fbcbbf9fcdbabfc2b7 SHA512 957a4a494eb13d125867531c004193746cac0c3197ae3f45b191f78c7c02941400bd02f18af8f954ffbb45523688f5dc3cb4d804f5504020e0304083395cf8d0
+EBUILD postgresql-9.5.8.ebuild 14593 BLAKE2B d00ef696f25ee20ae95df46bbe1b61523c23648714ca6e197394474913d285241b73708f096ed94e8352ca0f8f011f3b52485a6312a743fd97ee1be7184011f0 SHA512 a621f5a579185755ec9016f37dfe690ea4a370f51f32e3ed5523d25bccd89789608404f64ade342966c861719ba08977c85af9a2fdd8e49afe0ba9846fe63336
+EBUILD postgresql-9.5.9-r1.ebuild 14789 BLAKE2B d58a0098ea848973501beaa11e1842ca3cb9b1a0885c13966b51c12d6631f7060fd078219472402f55068cbcc64028d021687d7251540da618b1fb5693951924 SHA512 42bb6d13163d4cbd9ccbbd6dd1089fe8174a84df3d37d6d2ffbc3c2d65036ffbf75a3c7e022419b2cba7de7b4d9226fa77fb3d7985f8a9c9bc4ff5ff94d3d795
+EBUILD postgresql-9.5.9.ebuild 14601 BLAKE2B 55608bcc462415ed629350d22c01a28e5ab80a6a985539e1df1efd461d72a6fa2861f9e6788d4986b77edcdacfe1703e3bfbff138e4922e7f1d2fda93c756e4c SHA512 07bfdd6c888d41f7be5b6b6c02431a78d1b2b0794cae68c7b0eee1fe41ad863f33206041bb97acc14dee029e40ff019578123d1b73b073035302bcfb9a15ffc3
+EBUILD postgresql-9.6.4.ebuild 14775 BLAKE2B 2d93a17ad9365a2989e16f3c57074abe3d46d2bee8f8970447e81cb1b8c1841fb81efedfaaa1199a867d15ae38cea3d0f5deff058d588d9c1334b4443d11c645 SHA512 d2bb4d94f5861739a87998469be707cb088120d7cfddb37ce1ccd13f0574ddbe8a92c7cdde262b72b82252e97a5778743dd2da79eb37689f1abb64d60acb17a1
+EBUILD postgresql-9.6.5-r1.ebuild 14931 BLAKE2B 4987e4eed2a0eda2fb2a6a997648e60dffcf80b3b3ed0e06ae9f20bcc4257b460fa4add991c3baf8785c0abe9a5cda6b5a50f668b94aed951be6c19e80d577cb SHA512 6b8a5982697a8b4dbf6722330829f260af5715925d68ab0a6190b0a16b7669eb947b81fe35f332c70122bb820bc8342bcdc92a7c3420e4a88da3122e27542824
+EBUILD postgresql-9.6.5.ebuild 14783 BLAKE2B a0890050086eb4edfb308a2cd54197237b2d6155d67c354177175aae28419782824c4e8110e405e78a0698ce6e551de627dcc221bff52644a7ebdfefdba30a07 SHA512 c47552c3ddca3e35bfbdc915f989d0fdbdffd61501d8ab3c88bb87d39e801a4fd33d87927021081aa2b8041d66f9aa0e8cba1ca6b0fbd29c3450f03d7e5ef52e
+EBUILD postgresql-9.6.6.ebuild 14923 BLAKE2B 2ef343d5496d89bd8bd797945b922631b385f8241c76bbad5c5b07ae64aa971a2f72fa7c2cf3c5e62d6f71071b5ae2388e18162c3bc5e7b11ae0b6639fda3cb2 SHA512 a8872ec0d2012ea69dc3109d1a6648b8879125e78bb9f4c09f4eb7f9ed48e684c0e51450dd63ed29b5f62caa6b04a350e9d90140e25b797ee5fb87737b2d72df
 EBUILD postgresql-9999.ebuild 13544 BLAKE2B 2a1f9c50e21e7b9981adb38d18d4814903578a461d81f8a250fccc73b5680232f9d53d3c56486e65007b90a954f31939775ce5e4bcc621672e8b29e0ee332b0d SHA512 7c579c0a60b1e10e2d0c254fc9f60f2908db3634371d359c88ebf0acf581eaadf24ba5e8d3ee0ebd4aa05d840a97d0df74385578c0d792ee7ba87402b6931813
 MISC metadata.xml 751 BLAKE2B 4628a6d379a41b4646be34dfcfca2be58bc93b883ccd6f4d21a426aacb34dd7d5347c5f9d61f9211f4f91bff67d2d5935b203959ab0790c74031944a9ab799f6 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1
diff --git a/dev-db/postgresql/postgresql-10.0-r1.ebuild b/dev-db/postgresql/postgresql-10.0-r1.ebuild
index 1fc58e6071af..e7ab914effd5 100644
--- a/dev-db/postgresql/postgresql-10.0-r1.ebuild
+++ b/dev-db/postgresql/postgresql-10.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-10.0.ebuild b/dev-db/postgresql/postgresql-10.0.ebuild
index c3b086316a3f..c1e8575ce852 100644
--- a/dev-db/postgresql/postgresql-10.0.ebuild
+++ b/dev-db/postgresql/postgresql-10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-10.1.ebuild b/dev-db/postgresql/postgresql-10.1.ebuild
index 0a9959f34067..7e3f58344661 100644
--- a/dev-db/postgresql/postgresql-10.1.ebuild
+++ b/dev-db/postgresql/postgresql-10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.2.19.ebuild b/dev-db/postgresql/postgresql-9.2.19.ebuild
index 2300704b2044..54d1c48fa585 100644
--- a/dev-db/postgresql/postgresql-9.2.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.22.ebuild b/dev-db/postgresql/postgresql-9.2.22.ebuild
index af4ae8663d12..f68ece459c13 100644
--- a/dev-db/postgresql/postgresql-9.2.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.22.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.23-r1.ebuild b/dev-db/postgresql/postgresql-9.2.23-r1.ebuild
index 3b6ee92300e5..9eae7d8feef2 100644
--- a/dev-db/postgresql/postgresql-9.2.23-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.23-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.23.ebuild b/dev-db/postgresql/postgresql-9.2.23.ebuild
index 553284151503..bc6bfbfbf3de 100644
--- a/dev-db/postgresql/postgresql-9.2.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.23.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.24.ebuild b/dev-db/postgresql/postgresql-9.2.24.ebuild
index 1159151f7afe..920620508a5f 100644
--- a/dev-db/postgresql/postgresql-9.2.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.24.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.15.ebuild b/dev-db/postgresql/postgresql-9.3.15.ebuild
index 4f8c108842a1..2a15daf099fc 100644
--- a/dev-db/postgresql/postgresql-9.3.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.15.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.18.ebuild b/dev-db/postgresql/postgresql-9.3.18.ebuild
index ef402d99bd30..d61f66c1da2e 100644
--- a/dev-db/postgresql/postgresql-9.3.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.19-r1.ebuild b/dev-db/postgresql/postgresql-9.3.19-r1.ebuild
index 8a1a8f9bea7a..9bd6eb22b922 100644
--- a/dev-db/postgresql/postgresql-9.3.19-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.19-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.19.ebuild b/dev-db/postgresql/postgresql-9.3.19.ebuild
index b84e6edd3dbc..b42d0fe83355 100644
--- a/dev-db/postgresql/postgresql-9.3.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.20.ebuild b/dev-db/postgresql/postgresql-9.3.20.ebuild
index 9962b3bd0055..7d174a469778 100644
--- a/dev-db/postgresql/postgresql-9.3.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.20.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.10.ebuild b/dev-db/postgresql/postgresql-9.4.10.ebuild
index bba0449641ef..0c0626e267cc 100644
--- a/dev-db/postgresql/postgresql-9.4.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.13.ebuild b/dev-db/postgresql/postgresql-9.4.13.ebuild
index 552f2428fda6..8ced27e38676 100644
--- a/dev-db/postgresql/postgresql-9.4.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.14-r1.ebuild b/dev-db/postgresql/postgresql-9.4.14-r1.ebuild
index c799ad1927af..2f448ba1c0c0 100644
--- a/dev-db/postgresql/postgresql-9.4.14-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.14-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.14.ebuild b/dev-db/postgresql/postgresql-9.4.14.ebuild
index c287bfe08a6d..2e39d521831e 100644
--- a/dev-db/postgresql/postgresql-9.4.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.15.ebuild b/dev-db/postgresql/postgresql-9.4.15.ebuild
index 13530394ab52..f40cb53ae05e 100644
--- a/dev-db/postgresql/postgresql-9.4.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.15.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.10.ebuild b/dev-db/postgresql/postgresql-9.5.10.ebuild
index 28e6fc826d3b..af7b5fab1067 100644
--- a/dev-db/postgresql/postgresql-9.5.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.5.ebuild b/dev-db/postgresql/postgresql-9.5.5.ebuild
index 81221d49db5b..18ae5023750e 100644
--- a/dev-db/postgresql/postgresql-9.5.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.8.ebuild b/dev-db/postgresql/postgresql-9.5.8.ebuild
index fa7874ed7e5a..a0936cb1a594 100644
--- a/dev-db/postgresql/postgresql-9.5.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.9-r1.ebuild b/dev-db/postgresql/postgresql-9.5.9-r1.ebuild
index 6f8aca3f8ae4..4e1148a89f37 100644
--- a/dev-db/postgresql/postgresql-9.5.9-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.9-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.9.ebuild b/dev-db/postgresql/postgresql-9.5.9.ebuild
index 68ba88f280d4..39f5427645cd 100644
--- a/dev-db/postgresql/postgresql-9.5.9.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.4.ebuild b/dev-db/postgresql/postgresql-9.6.4.ebuild
index f588eee23f35..dcfe1825a087 100644
--- a/dev-db/postgresql/postgresql-9.6.4.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.5-r1.ebuild b/dev-db/postgresql/postgresql-9.6.5-r1.ebuild
index a777d660e8f6..1d5a335c5909 100644
--- a/dev-db/postgresql/postgresql-9.6.5-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.5.ebuild b/dev-db/postgresql/postgresql-9.6.5.ebuild
index 821aa3eeee05..2e8ef81d12cf 100644
--- a/dev-db/postgresql/postgresql-9.6.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.6.ebuild b/dev-db/postgresql/postgresql-9.6.6.ebuild
index 08aa80472d1e..136a3759b716 100644
--- a/dev-db/postgresql/postgresql-9.6.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 0a15371bc44d..21e1cf1d2098 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -2,7 +2,7 @@ DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fd
 DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
 DIST pspg-0.9.1.tar.gz 853229 BLAKE2B 791a8d05ac549b869a3d31578277709f17a50b9aebf3ea84ffb30199ebdda8faae6828e4f5068880fc1e74d57d88086bf363b1825789d4968ed77087561a5435 SHA512 40fb07153c36e2e170ddd1fda18a9c2e663e7995367c2ac30e136f65e07d36f812bf69f886767fa71588d548d90c47c442c0503fdc775b5f61826e60672d9d54
 DIST pspg-0.9.2.tar.gz 855891 BLAKE2B 0e0a992e5885ca4b2e058d19df2d9c7eac862e1a45e8d80f31df33ab2f3c02616c67cc528af6a52225db938a0c1f27352e13c7dfd01b15bda908bbf3ee9ef128 SHA512 8ad31a5e744db96bec7cfea7d128aa4ac3b44ab51c3dd1d0661178c1d139571a955143a3ccfe6556ce2a215ec193a45224720794da5d2af1e93beb2fa713aea4
-EBUILD pspg-0.8.0.ebuild 388 BLAKE2B 17032d0dadfe6fc68d7df37ad154e6c783ee9e41f336f3a4e9800081ea5e2f8bb7dc7b31ef8958e7007e8eb3dc60d113bfabe956157e3143756424789d92e7e4 SHA512 98a5917e78c393fd1cb81c5b1fa81e91038f3307ce668102656813834e085d0321cf14ac7dd91fbf6999a344894e6b7581ad7a0b507cafa607a3dedc28a8b29d
+EBUILD pspg-0.8.0.ebuild 387 BLAKE2B b2f49b9e1bc7a032b064e2d65cb832c1177a51fabfaaf2b466d024346635bb9af319f0c656328d0084519ba12697f4a385627194f34330cdcc28b7644298acd2 SHA512 27636211a65612ed5424d4984e737e751677048f41c91cfab69f5de351f875622a8edc68c26e69ad9a2cf13b0e294dff07742c037f57262f1149966ca53717b8
 EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 EBUILD pspg-0.9.1.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 EBUILD pspg-0.9.2.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
diff --git a/dev-db/pspg/pspg-0.8.0.ebuild b/dev-db/pspg/pspg-0.8.0.ebuild
index 41c42740c924..d9846d4a7335 100644
--- a/dev-db/pspg/pspg-0.8.0.ebuild
+++ b/dev-db/pspg/pspg-0.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:*"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 11d0663435e8..f4b3b7d1e043 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
 DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
-EBUILD psqlodbc-10.00.0000.ebuild 683 BLAKE2B b1b6cfed09a623b54cc90f9263cef4d00a5b33774b10b71244a9ea24409f63652a3dfae75ce74fb88598df448b79378a701cf955d146f0445f1d5520b3e0c4e2 SHA512 06690e24fba494ab0b113a21e4e63304e75afef392e6fe7a6396e43359ee924821fdbedd23d05ec303069ddf432fdcc58880bd9433aa5035f01c66077155ba60
+EBUILD psqlodbc-10.00.0000.ebuild 682 BLAKE2B 24cb9dea014d5864ee30c06fd731b5375526f61beb2833e4a2d399eb1ec8add1acc6e5f347cd7207066bfded78d0ad99e5ea81cd38ac42ac5aaca82d7ac826f5 SHA512 d19554f16da5540d8925062536aa3ed2598cd66a0b21d93bfad2fc07fb00531477a5d53660b266f4bd3181fb7fd5c311a749d5e101eafa5a696349d61206dc89
 EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
index f85303f96164..2f5a480ab1fb 100644
--- a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.00.0000.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 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 63ce357dff8c..27c67d521f58 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -17,8 +17,8 @@ DIST sqlite-src-3190300.zip 10193997 BLAKE2B 2286d410594cb04acc79e4877101cbd5018
 DIST sqlite-src-3200000.zip 10575632 BLAKE2B 2f0f41129e56477531f59d91e02469ccf5e21eaadce57a2a81bde9bcd549c12d55a496f27fd07bf0ded78b55aa8a6e4d48e5073638dc87eaeef8e989906fccfb SHA512 40fe7972902d041f012c7739c8712aa40069aebc7be680fde8f43b33fed885bfc42331bfb7200651486484edb71cbdd77ddb9c119d0847bdfb0e92063090f029
 DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca35584092c663fed176fdd69164623bbe58afd15cd74fcd32a0cec893cffdb0f096873188c42ec5595ef7d635c79ad SHA512 845a0d64c9356aadf178c04dd716bbd37a7353526b06cfa8e8f65653cf6a1893a5c5e8c78d20b43910c34d9167272cf517749c91ed0ba7686977e3d0327e8939
 DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
-EBUILD sqlite-3.19.3.ebuild 7623 BLAKE2B b12db6b484a7a12ee195e8a5fb640d945b6b2a6247c499de5088d2b0ab298e4b8de1a0ddf479feccc2b149b9feb8817b0794132fc343a5060f5b2a6138d12717 SHA512 d99371e9ad210926749b5b162c8aeeb58b963dd1e2da2135b6a3372b6587d58b6e846323fc3ecff6138545e1b84733a3326f9628eedfe8c18566a32ae8845550
-EBUILD sqlite-3.20.0.ebuild 7632 BLAKE2B e3878c30f7c1ae5d80be12aa59d2a76efd7fd1b25553495b687016fe060223011a7882ac7b018fc5ab87b89746b10844ba3d92fa4677b63e3365c7046b77ba8e SHA512 0429db119f90a2292eb5ade11f55acee08a68be38bd37e4455e686e5431d1d04475f860fa459d4746e7404123869ebf2ec75fb956d57cad06b49037f25ab8eed
-EBUILD sqlite-3.20.1-r1.ebuild 8084 BLAKE2B a3b39bdca770597dc3eb540788e832e7665bc05712d5835a749d5bb8c406a1df083a3f99dfc26192f6148a0ec6f209edbf1b7ca0105eeb343ea4391cfb86e9dd SHA512 b6bf063b4d0ffa604f82ec2f07d31279217373f356785adc2e103f3cd54b4b39cf39197d4e09107b53212d52f3f9cc6c3f95cba886216804954bdfb32b36fe50
-EBUILD sqlite-3.21.0.ebuild 8470 BLAKE2B 62d2932eca2597f08a81279f4fd49f3c602ed59a5fe898b5398edf29a00621fb72fbfbf6458dd8d2525ac2bf3435bc5cb411fe4bb21c4a1a83bf608ce93edff3 SHA512 a240c8b818c0b55b57f5ba3498f1f3938efaa6ba773cce310dc1c18d3256f48bb3cd1ad3b7ba124d5d1b245b61955e523f33ed460c496612d84c4783931762c0
+EBUILD sqlite-3.19.3.ebuild 7611 BLAKE2B 1263a4f8abaff47d5295084f20992bcba69901f1883bd7413d6ab5d8c3b0a8ff6d3a8155857939a4498ee574244222af7f9d1194e32a97bd7f7b0ddbd6d4f067 SHA512 774cca8ce00fea1abd5061bddf8a5661b6345c7d92a40cff80e67e50c05f8015374ee9164a56345a27bbfaa5b377cdbd24ff88b1747cde2c7d32ad3b48c0650a
+EBUILD sqlite-3.20.0.ebuild 7620 BLAKE2B ea080930bb5e163562cd5e1b7e7e66437cd10638c2e8de05ef657028d5811169b0ba769c43fe016e7fb630daf8e9e03a92b49056bc06be8d6145e2e69af789dc SHA512 22a41d407e0c18fe978eb26cf7606bb977779f61fa26e39f9ebb9d289c26a884ec4d8dec311a2147c5eb51532b8fa9ef6eab4f042a3d7a6e6fb7f06053e67193
+EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
+EBUILD sqlite-3.21.0.ebuild 8458 BLAKE2B 48d854b3dd9c48c14fb534aa2f37cc0af1fad552ea940d4381aa60ede0e236a343040fbb2c6e83b19ea08079e0a3501f66dc389f47582f2507d8e8acba125a88 SHA512 3d6f5278c9bf233e16e40acc54f6e0bf30f5456736c9f86f34c2a156573495438783811428fd9f470e02df84177b4cd67dcabc87aa3669a8df7a87276c6d8042
 MISC metadata.xml 745 BLAKE2B 967f5a809e007354fac9d750f068aaf552aac8503f72d20c57dfd0f85dbdbf620209bbd9646cb2b79cfc5f2a40917422c4925784d54220f61132d70ddd414d53 SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849
diff --git a/dev-db/sqlite/sqlite-3.19.3.ebuild b/dev-db/sqlite/sqlite-3.19.3.ebuild
index 5b2dafba9215..c8602deee4ea 100644
--- a/dev-db/sqlite/sqlite-3.19.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.19.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"
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-db/sqlite/sqlite-3.20.0.ebuild b/dev-db/sqlite/sqlite-3.20.0.ebuild
index 931807da09cb..8d12b64e1104 100644
--- a/dev-db/sqlite/sqlite-3.20.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.20.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"
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
index 9fc8af5cc324..b70e5bd84537 100644
--- a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.20.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"
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-db/sqlite/sqlite-3.21.0.ebuild b/dev-db/sqlite/sqlite-3.21.0.ebuild
index 59ef4346af99..3ffed2d02980 100644
--- a/dev-db/sqlite/sqlite-3.21.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.21.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"
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index db76c05ee339..79724f7327ed 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/gitrev/Manifest b/dev-haskell/gitrev/Manifest
index 8323beb0fe4f..3577d1fd5bde 100644
--- a/dev-haskell/gitrev/Manifest
+++ b/dev-haskell/gitrev/Manifest
@@ -1,3 +1,5 @@
 DIST gitrev-1.2.0.tar.gz 3238 BLAKE2B 09d1a3bc132c7e28d65246e3805323f610f5d9f9f129e1f0f26316523c11639ddb44d8b439b7de979976431d4257940387ba6ae8311058fb1eac3aa3d19e1360 SHA512 ba794dfdec21a5b8ca19dff3ce712cb31f254ac59e166aad4fd33435649a7a5209fe9952cff230edc88d81e3622fe3b4f6199f3ef89e153d6e31cc6bca14d303
+DIST gitrev-1.3.1.tar.gz 3756 BLAKE2B 6871cb2c036bba9d6e727749778e0e16939a4ff84cf5ca74caf0c198a998265a8cbeea2019ba12e1e6190413499ed1b82874bd002416d620b70bcfd85bfcce1f SHA512 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd
 EBUILD gitrev-1.2.0.ebuild 557 BLAKE2B 8857552d63e2e5834284f954895a8867ae51f51040c4c7a2b345c94e46b8acf36407d80b1a37df9333cbff2a4c795c039cda93f99cf049980184efdb49ca6885 SHA512 d093d71469b4f469478e53b6391d1a306d6d89a3ba6a62b992cb703c3283fe234e0f8f038e308341a45423c9abe55ae797625fd953a9104ea308ddc09f46f5e9
+EBUILD gitrev-1.3.1.ebuild 597 BLAKE2B c14edfbbe12b533f1061fc82484330cdcd7695cb959dcbc8df03838f3071d77f6dea0912d44071b87a0ec248c0a6dc8abb94368b7087e2164b42f18bd7b5b393 SHA512 70147af878419d30d061536749f59aa67eba82429516b9dd03afedc2f7d6e1209d970e0eb2aa15515a54773b9440fbbc59d538ff6f23769320145fb54e8e3a55
 MISC metadata.xml 595 BLAKE2B 5a06ef55070d88cb66e56e0355747df3eac531e986104588ced77148f56c9279920d6dc3f700ce9b3d3d6a4be18e8643ca2f7ad449a83e73f9562c64c1d52892 SHA512 cc629c279fc1e19e374e312f42b1cc26850aed821b51aa2f1660abf8a131c17c66d184279b4a127138f74ad5405fbd05ae871b38c41bf054f117507a2cbf0c80
diff --git a/dev-haskell/gitrev/gitrev-1.3.1.ebuild b/dev-haskell/gitrev/gitrev-1.3.1.ebuild
new file mode 100644
index 000000000000..a6b2b895465b
--- /dev/null
+++ b/dev-haskell/gitrev/gitrev-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Compile git revision info into Haskell projects"
+HOMEPAGE="https://github.com/acfoltzer/gitrev"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-0.6.0:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
new file mode 100644
index 000000000000..1cfb10743189
--- /dev/null
+++ b/dev-haskell/language-docker/Manifest
@@ -0,0 +1,3 @@
+DIST language-docker-2.0.1.tar.gz 31658 BLAKE2B d2f4ed51db1f6367ccb53aafc25e7473d4b7b1cf1b0d4f4e0692ca5db4b2f245ade1b80b37f9989c0a50be6b76996107c1b8e06024981e68ed1c9d96fb2f209d SHA512 f716f99dc23bf9e0de68e658330ee90befb3724a53ae97604c9a8369535db679dd9a5851c2961996619f4a3cf3ea462df487063a3e08afff7cd0c47538fc624a
+EBUILD language-docker-2.0.1.ebuild 1079 BLAKE2B fff9d69117ae6912eebdb2b97fa6f6648f8201f2db6cfbe6dfc2d3193a5b477440eab803550f33f82e9ef7407e78f14b81e55ce8f72d4d3e94b8009aac780c66 SHA512 9f99dbb7fcc63e888294c001475161b56c94359953a7c3ec014a838b8814706855f1f1d7dac3c51c7e989fac184f39f367e552f264f955676673dc82efb6c986
+MISC metadata.xml 589 BLAKE2B a6e7a2c01fe4fa9b0c1b0b18e612e7a1b39459bafea5ff32139ef28e09079c22845de6123df9d1977942fa7d0e791807b118f8f7be4b763372c289370f8cd668 SHA512 e9062624fda6b6ee56e3343948ad43d54e3c294c78e6421a1ffb1761f9254234a7189520247f0e3a4875ddc7492307902f27adcc5f0686911b6d4698bd41330a
diff --git a/dev-haskell/language-docker/language-docker-2.0.1.ebuild b/dev-haskell/language-docker/language-docker-2.0.1.ebuild
new file mode 100644
index 000000000000..24fdd9a0d180
--- /dev/null
+++ b/dev-haskell/language-docker/language-docker-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
+HOMEPAGE="https://github.com/hadolint/language-docker#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/free:=[profile?]
+	dev-haskell/glob:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	dev-haskell/th-lift-instances:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/language-docker/metadata.xml b/dev-haskell/language-docker/metadata.xml
new file mode 100644
index 000000000000..aa5da45aea28
--- /dev/null
+++ b/dev-haskell/language-docker/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		All functions for parsing, printing and writting Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality.
+		See the https://github.com/hadolint/language-docker GitHub project for the source-code and examples.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e764a1cf005b..a0f8c9ef52f0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index af149c64165c..c14d9d952955 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,20 +1,6 @@
 AUX fontconfig.Gentoo.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
 AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
 AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
-DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 BLAKE2B 07abee47a2911e2f98220e3152be1d037931c1afa36bd95d197e8fa611a8dd3a9e9755afbf9b348497ac93471cbfe43348f9d72bc719714746c22eb5c4785d6c SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053
-DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 BLAKE2B 794f20dd05088aea228365b8e27af4475e90bc0d905bfc600651ffbe11cb92d1ebaa212f0e700572d0016eec952373c0f0b7463073205324d81b22ea0538e491 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32
-DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 BLAKE2B 895b99311add1b91a1436af52e8a36c2c29ca21df5ac1c44046a2aa963fa04035b3601485cc7d10fdd671db2dc5da666960af2f21a2faa4cded05850a92dc3f4 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7
-DIST jdk-8u152-linux-arm64-vfp-hflt.tar.gz 78513081 BLAKE2B 4c3fcbff1ede3b79aedcfbe44fcc3387dbc3a76e6d912ce7f6b312eb85e4e8e9c7dbf961790a2ebfcff7690d48f1b04fc8447b136ff28514933b3481f0fcb7ad SHA512 fe35360a9ffa73e9745360560db6a5dee9665d31801ea58bd8be676588c93955f47077dbcb5a415c0074f9759a9cace77916e3b322c572b4d3b23a1d99f16578
-DIST jdk-8u152-linux-i586-demos.tar.gz 55096721 BLAKE2B 22a890eb6a392817138412973d3494f4fc993bdb599d04dbd458e56939cb271424ee5e9c19458f840b05d271baf867fb392fb6f69a60b473f50f7f933d8cfe03 SHA512 44776eafd70306a392fae5cf269036d7500c7cbaee13a9fcda14b9f7191376dbfcbb03262693e3114a08f5d4ff27ede1ef570fa6008c9ef71ab3b24d44f9ad2c
-DIST jdk-8u152-linux-i586.tar.gz 192699649 BLAKE2B d6a4f5528ef5659d280e2dce954abb96672fb2228c520830ed514b475eee5f9d53e503b96919c087db5f7f3578d515aadb20b2682c7defede2121091d6c5882b SHA512 6b7576ec40b0ddd0a54fbcd61c22b95f472192be5855d143387f1b56220dd68e851a8b87894802c181b1039c14f5a278d950f100c4bd10b862fe4049d9294ce2
-DIST jdk-8u152-linux-x64-demos.tar.gz 55162003 BLAKE2B 5658107413e2de4887b65eea85bde84e5b8adae8d5f4d048574eb7cbbc0a0ded5b9d89ac6e2f88276116758bedd837c984ea265a0efee20e2310a08f31b473cb SHA512 51303580a702c1fd1227d8f57c546b6e11de6a87d3ba32123a3e001688c5ff308efa1feaa6da8d2bcff8143fa61726ba9e4aec959a70e82817d628480b0a576f
-DIST jdk-8u152-linux-x64.tar.gz 189784266 BLAKE2B 64867e595da97e5e447df49f7d7c84d3fc1786ec30d348c5e0122bea17e21db8da16fb612b86758056ff4796c7efe823bc6fb50561804a9c3d237b385518977b SHA512 b0851d46bf0385b7595f8d60da0f06ccdcd59aac75efa9b48635ba77a3e4eb557cbda5585fa5886787a0e549d9e5cfa4a992741349cfc224b36f180907838321
-DIST jdk-8u152-macosx-x64.dmg 259130998 BLAKE2B 60908860a4510150b7cb44ae54dd93f68f32c31c9013bdd37a5622b528299c1be3bf6f36d4e0c17df25f363dfbc123e609fba632135b9b78367940ae36bf959b SHA512 9b3b8ea5119a2f5d3e221244ec07e6da6405041a65fec6299643133a89434d44719e4ccea35498749c00bc400c125dae7a1f4f41fc44d0d6748235bf92601eb8
-DIST jdk-8u152-macosx-x86_64-demos.zip 55705509 BLAKE2B df58db3779c412076a070fdfaac10a13d03fc5c449410a6257b767cca8907149d8d0562c949a1dd1e4ef3bfbb3319d15b4d0842276fdfd8d2c3befe90cdc17a8 SHA512 5b17f84aeda22a145d8171c8789a8fa1127d1e9b3b6acabdc9e2ad42e4ac5b8c95f2afc0e1736096bec246ca87a22908a5ede492fde34a081984a02382c19ac3
-DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 BLAKE2B a811ceae2a7ee8d6081b0bd594058986985d953b5895935bde8c305e7b6ebfdaab76a53f09cae414f4e16cd445dce199fd318e0b08d67b6183dfe2ae4ca27015 SHA512 32e35cb2b3f9e3cb5b5d77a84612fe37f90879e7eb38578af6a922157f12878d1b5f893a3119df055facf7457a5516f502a7da5cb93fa3d5614fdf1f855ecfb8
-DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 BLAKE2B 1dc8e1297594bdd84186d4422dfc8fff94a78e0316f8873920c79342e7d0ab504794296622f0357acf137a3170f263acd0b2c1dd7179e50ff538b5648abf5a4b SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d
-DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 BLAKE2B 4a5ca101e20d1693eaca23120bc3244412276d51dcf7700dd5142b9d23b90a7ff0d3599dce7862e38a183ea9e1ea67afbc075bdfe84908811bec700a928f46f6 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2
-DIST jdk-8u152-solaris-x64.tar.gz 101758540 BLAKE2B 18b04a0eebc618148bdb215d4ca286fce141fb91dc9c0f05de2520eb073a819161af7a1533b3ecdab9961080ad52acd523b771c23a8a3da8797f0adaf974164e SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0
 DIST jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz 10432598 BLAKE2B 49e8ac44c52b41851ccc96d41f77eddc92304e0ebb7b62da6bf393d73aadbd94e67d92b87bd13f7a2ccdedfbc0fc7c6ef7dd5cd2595860ee8d1776dad308e341 SHA512 00576347ec158f4f996db1aface6067b7df99a9e125bb2c22980b11ab84660cd2a3997d9519db3302fa31cbaaf98c01c5b3967b51daa5469926ca48037ef60e0
 DIST jdk-8u162-linux-arm32-vfp-hflt.tar.gz 81719419 BLAKE2B be6bd2ec7114e313e6abbd040aa9b29fe415cc15ce93b5c6fa350b0964faa7a1a3c0882c303596156065f9ea79a08bf8542757c5a8a16170d31f9cee5d7dd426 SHA512 86b835c388010f2bafd05114813ab84b4cd13334244891e9a65ae140fb65c9ad4436380043255fab36d44a91df9210ffe0858d89e48fc4efe2e460ae62928134
 DIST jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz 10434399 BLAKE2B 528476df75ec63acbe66dc58aad87e21633f34407e147352d048e76cc48c34afccf3d407229dd95ebd51bf2b5864d5b2626ddbd4a6b0d07142ce290fad58e786 SHA512 4ac7f4485c7290321221874fcac695cc47199e7ef76a0270a2d4b381bf42311a2d3dc0d325c1a50cbc0e79a82f9b876f5481a717425a7919d53e97b11d3f0a29
@@ -32,7 +18,6 @@ DIST jdk-8u162-solaris-x64.tar.gz 101741152 BLAKE2B 9e01659aa83b11b20e47842b7ef5
 DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
 DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
 DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
-EBUILD oracle-jdk-bin-1.8.0.152-r1.ebuild 10432 BLAKE2B 723f8be3fdaf73d1cabdc1d0004d6de431263755d712935686b41da08f9f5a7d3954428e4bf78ce371d12500bd0b5017c0dde2182e2778377643a0d0deeaf771 SHA512 9530367083792aceb6a0264a9b1df4268b3221f5061624be9d343fe193def4c56b57d503d29543127f64474f3a03c4f1ce4ecdfd20a468ba6c193feaadcda8e6
-EBUILD oracle-jdk-bin-1.8.0.162.ebuild 8425 BLAKE2B d0d47b2e42f4161ebe6e7876686113106915739b22a1f933cec1583308f62aff65cb0d990d5209660ca317753ecc3ebe3bc09abe63fbd40bd348ef7f22927ed9 SHA512 3e0dcbe0825ebe73d6993fdfbccab52010e795ddaf4d0cfe4cfcc768ff50d97863d0d78f977186f1c212f960958aae4a7ea47a976b98e55eebd3c13cfa9502cc
-EBUILD oracle-jdk-bin-9.0.4.ebuild 6710 BLAKE2B 1a01ddad717d764e8459f0bbf5665da82a224f5b3c6319bc7852da1d0a78c4ce0597ecef068176837b6deeeb439d65b42828229ff84cb925773b5333436004dc SHA512 d2fc8e409bcc5f3b261fad7f9404a257eba2273336c2c811b02454e24865276ffdb25302d89660235ddde82c8790eabe5421bd73a2c00b895e779090e13620be
+EBUILD oracle-jdk-bin-1.8.0.162.ebuild 8558 BLAKE2B 362a0e866d590cfe000660cbe6ffae98417a85e1af0dadc1144e9c043138e5485692e99ff447cd3ab2047d99e2158861bbe2d79994753a87d2a652c18f8421d3 SHA512 e4a434c7ded313e830045b930314a99393ee29168aca37f36d8379cd48e06c924d80eedf97205b6041e658d95510ad110af916cfa1947f1c389a2d54141c6256
+EBUILD oracle-jdk-bin-9.0.4.ebuild 6773 BLAKE2B 4a14d476a65369fb37ef1d28c1419142a9912cf4f42a602df71873886d46a10acbae7a4ca8e1259d565ca1040803d962a39dac860a2a956b5962fd31eb59c268 SHA512 36c52361def1f6b9eaa04900595731ceb9d63279788ff434be6fad3066f88574bf044239319d5ef91cf958dad8419d4d811bc08146a2b2c859409caf799d8e87
 MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
deleted file mode 100644
index 96e7ab522852..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URI needs to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
-DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
-	examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null || die
-		mkdir dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount || die
-		printf -v update "%02d" $(get_version_component_range 4) || die
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die
-		hdiutil detach "${T}"/dmgmount || die
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark m ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial; then
-		rm -vfr lib/missioncontrol jre/lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* bin/javapackager || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	# Packaged as dev-util/visualvm but some users prefer this version.
-	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
-		"${ddest}"/jre/lib/security/ || die
-
-	if use nsplugin ; then
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		local lib
-		for lib in decora_sse glass prism_{common,es2,sw} ; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${ddest}"/jre/lib/${lib} || die
-		done
-	fi
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
index 77a16f6c75a2..a57793e032f0 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
@@ -113,8 +113,14 @@ pkg_nofetch() {
 src_unpack() {
 	if use x64-macos ; then
 		mkdir -p "${T}"/dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg -mountpoint "${T}"/dmgmount || die
-		xar -Oxf "${T}"/dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		local jdkgen=$(get_version_component_range 2)
+		local uver=$(get_version_component_range 4)
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
 		hdiutil detach "${T}"/dmgmount || die
 		mv Contents/Home "${S}" || die
 	fi
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
index f86453303c61..fee4dd82f889 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.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
@@ -92,7 +92,10 @@ src_unpack() {
 		S="${WORKDIR}/Contents/Home"
 		mkdir -p "${T}"/dmgmount || die
 		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
-		xar -Oxf "${T}"/dmgmount/JDK\ ${PV}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
 		hdiutil detach "${T}"/dmgmount || die
 	else
 		S="${WORKDIR}/jdk-${PV}"
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 8abd8730eee0..e122fd246f9c 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,14 +1,11 @@
 AUX fontconfig.Gentoo.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
 AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d141eb032055f0dcdb252a4931662d719ac28870ae72c5fd2f0901addb3bb552fa071f637ed674061f313fea2 SHA512 d98fbbcb422258f604489e630d4a3743ab44f9bc9648fdadf62da82ab4a8ff53cf9713e28d448eaa6c9e7fa412158a2fcdb26cb91c4abb3f8100c084d14977dd
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
-DIST jre-8u152-linux-i586.tar.gz 83131659 BLAKE2B 5f0619eb8c0f5937d2c5da573f40daaf46d1fad27fd57fab7b422017dadc2ae51399c3a99ba6044443d535f12b2a891a7b767d7da06f8567ef19eb74f7c92b33 SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542
-DIST jre-8u152-linux-x64.tar.gz 80061016 BLAKE2B 5aa25c152aae5e106bd9cb3b1b14125437531991f082548faf0b12f7e52a77e9dd01f178806d48d71d99c718358798b214a64acdfd1afa55e3791c6d78aabf95 SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d
 DIST jre-8u162-linux-i586.tar.gz 83185844 BLAKE2B 0739e0e272e19560554976d993d229e0bfd6df11389f6dc8e8292717620fdb8e2786128890667375b5399f96d696ec7fb2ac2369d1edea82753d8c6e659c0aeb SHA512 154af4397163c68266e963280bdc4794ca088e207f9426213035e06bbfc4f024ec5c20c89d8d58323e56ace6af4e89d2f08a80fd436c70fc712ed0401772d213
 DIST jre-8u162-linux-x64.tar.gz 80107578 BLAKE2B 28b86729414cfd58290b01990a57b7a87cba1b4ff6361df45988433b90b6c29878abe120c6b90e6c31cbd306960bb75139ea054544f109d863cdad723fd4f0fb SHA512 dbda4346d76925f47ffd288fe9ad21cb2235f55da380945d6cfed8d94322ba97cf8832d3d328f0622c6175620f1682b93e9e380403db3f2d4804062fb7832e66
 DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
 DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
 DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
-EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 BLAKE2B b8d6d8af36e186c06aa9df958b316aeb6974b5e90b29b72c7a2c2c06ecf461fafa517eedb50f131a9d18850f325e949c9c6e702f0028115d7fbdb45a39796488 SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908
-EBUILD oracle-jre-bin-1.8.0.162.ebuild 6049 BLAKE2B f85d4babe337421eaa8e9436e17e9fee4bb0f8776b018474c7ec73c15473d5163a4a9cf34317a9effb4e386bde94a1dc41dc8ad34c3dbe15d886446809194eec SHA512 ea297e0274c5644c4756ca79c1b230298bdd9af175bc540df354da74f6e61b3a9a04ce92ae5b814b830be8659850874697eb35e1339bee0a6d5d899794f0604f
+EBUILD oracle-jre-bin-1.8.0.162.ebuild 6047 BLAKE2B 29f3e6efc9f786cb856531665ad50c23fcabe1b0eac6faf8e0a621de9f10b7d1a636ed5664a7138d60bd370ca71cbe7be65700081c64c04dd4936ad48a4e7ab9 SHA512 a333603325ee09376c0ef87178ec15017496ce6e03d0371037c84c8a11b311a1b5e61d8c32c0e01b0a08773f9aee660c5b2e516dbba9eb535c823b6f5490986f
 EBUILD oracle-jre-bin-9.0.4.ebuild 6271 BLAKE2B 6921bb42d99f25b55c06be1b1e8b86ce748c1d610f5a70e9cbb9376f221cb40eb0150cad55b857be5f27fb60bbbceb669bb81b97faf67a9f82378f2687efd19a SHA512 5237fab65b48a29b5229955ffce011b293bcffe2eef0a9e2f8627a06f0b6df0db16161f70ac03a039e30b9921442162a803da1a8ce541bd28896a0362811cf28
 MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
deleted file mode 100644
index cdc8dfd0e2db..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URI needs to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="amd64 x86"
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	local AT_ARCH="AT_${ARCH}"
-	local AT="${!AT_ARCH}"
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	einfo
-	einfo "If the above mentioned urls do not point to the correct version anymore,"
-	einfo "please download the files from Oracle's java download archive:"
-	einfo
-	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
-	einfo
-
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial; then
-		rm -vfr lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
-		"${ddest}"/lib/security/ || die
-
-	if use nsplugin ; then
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
index ae1df986f57c..01e3433b5fd6 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 6679b6866e39..33ba73ced9b7 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,7 +1,5 @@
 AUX as-needed-and-flag-fixes-3.6.patch 7755 BLAKE2B 8e15b6cba2fa403b63647eab5e9b1ffc293d6db67cac2c2ecdc437cbe540433ef4077a333e9290a36c9615204a8361864b322442be9030e66d4d8bfa1569a8ed SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083
-AUX as-needed-and-flag-fixes.patch 7229 BLAKE2B b1789b5eb28f1c05f640d6584b0aaa650d5513d8c316bd44ac54b7a04551199968f7347e479c5b98787769fea53c3d0879f22f656d3ad2f21ba70871d54700d3 SHA512 1c4d217965bd8ee9a293095dcf8abca399277a103e523610340a6f3cc25291cc53c2e89b9fed396298e5f9e7b78221df5c4bc881d65713058f029810799f8010
 AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
-AUX swt-3.5-manifest 752 BLAKE2B 6b6ce37d88343836605b7835770354f45ef2f38b42f2ef7a7f187467f9792ae7e61ceb28de002362695c41fd7fe765d9f15ad62e684411d05b1388f4a213d501 SHA512 7021ce5766ff50b999ad3474de00a2f19490e5eaef1f811b95d3cf01a43467de3e8e4913b668d019d59513ca54a159b50fd0bda427c4efcb3fddc522fa2925a6
 AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
 AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
 AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30330339da12ffac079eaf616cf1f2e9a3a8e984789d38c43019ade81d9a5a444b0a763df3026732dbc515a3a6b329efb5 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d
@@ -11,9 +9,6 @@ AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e8
 AUX swt-3.8.2-libwebkit-compat.patch 1104 BLAKE2B 4184e262dd2b21e6170b399222833e4a88299fa910f36aebd072ec1ee701fd3f23b8743cbcb263632c52983d0d5753fbd479129bee0d03b5923c979746a23852 SHA512 f063be5652b44b776f774a8e3d7f31be3018858322cbbe8b7c2e47a18bc705c4ff751ed239699c2014a5f51785a723a2d8f4fdc9804f4fe1961c861cecbe4117
 AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 BLAKE2B 96edb84193506ed8c4c293970def5c1c38fb0cd66561030e1e07f214a70f84c657260e1adbdf41f2eb404d4069794cca9b5422dea344ceaf028fbc75cf9aaa26 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1
 AUX swt-4.2-manifest 739 BLAKE2B 031d2e59e4b20c8aacdb4c5b03ff3bdfd14f9373386766993efeb833995d4858b09ac157bdc847820271bd0a354f5c0280aa0746eb0038413782c5cf59f7ba4c SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1
-DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 BLAKE2B b3ad008d8645de9a85c05801696bb65c32676e1482d873a5e6ba58a9915328526440960daa9f146fdc646aaa1d4ded8c72fefd9bebc1b2a1acaf05018e3b524d SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae
-DIST swt-3.5.2-gtk-linux-x86.zip 4881316 BLAKE2B fc6be0e041a4fb3decb602d1a0dbde0bd7f22c12a3fb869b364de663c3a870351a794ece2f2a2a73ffdee6ccac71390d70700ff609c1cf86320f9a14bdc70002 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82
-DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 BLAKE2B 410cc189b5625061e89a4550b2d0904bd3bbe68d2f0f71ed38cac146d2aa5dff99838173e0fe4499be9f9847c8c43b282df00f907ce54a84b0ea5c9880ef70c9 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
@@ -23,8 +18,9 @@ DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f6
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.5.2.ebuild 4602 BLAKE2B 86045a4b24369f463dba178254a120f106a2d97b9bb64529f71858d0b0b62b3abed35529e2ae67194deb2ca7d0729217d287184e9340f54d482cf255b2f314f4 SHA512 cdff54906b1a7cfb98ca02cde97354cbaee4b34fe76724a9d9ee7720b6565e1dc1ba930ae060eed631f9db5891f20a96da567d1324436c381b3daecc7d80ddce
 EBUILD swt-3.7.2-r1.ebuild 4764 BLAKE2B bf0060e3d5029c81635a5c570b46ae6d781f8074f686242d3d7661eb6e520011749d7ec0ed3e1d8445422c279b222e6dbbc61bee1a916e5320f1e3da76eaf13f SHA512 2c11e4795f4aecd246e1128c81169fe6b3eb8283632fd4a371b7ee71a716da0469a86c8b5be9bd35ffd87eecfe87acaba95464d0ed31f2c79085a7c5562b2880
+EBUILD swt-3.7.2-r2.ebuild 4607 BLAKE2B a6801ff0d23257f51bf41c78412d27dbf2a8cbf450919b5b04a4a23efb8662ed87a7cdf4a82f0eb4680438e0da7ab52cff99f1956c35799a3e44b6931dc0e968 SHA512 b1df60b8cba4e09338d06f1a8aa809495a58f1a16878b522dfdaa381abd7f69a3c66dc97fe46bc6285cf2ad6741850a7b3e769eff6cd159f637eb7d805325121
 EBUILD swt-3.8.2-r1.ebuild 4645 BLAKE2B 4c699914d33580c55c5a512d098dc168766d7c64311274175c143e9253fad39cd67dddac324c857160411697a8ec236511354797dcd149756c2bb8b339448595 SHA512 b94a9b93af8431689e30d2e85388692a96e94b6dd624c9f2b5cf273e2edb5d24fc3994c625b098e7b1ce2be56d04a4c413b0cc374706d784daedf8d9ad76f062
-EBUILD swt-4.2-r2.ebuild 4839 BLAKE2B 26917b0d2e2fb40fef492154632c7e6b09801dd59afa6446910b223deb9aa9a15c61f1d20841a33ff6fa01e56e009fe0e39494e0002720f9decbb0f90ccb0f9a SHA512 0cc9aee2f5182070e882a150dabef7e0119519348d18e786ec259c1c211d9f5a3fce05dce5f8e73e2ddca7d6889514dc28366b18f536e7fdc189bad6c1d7855f
+EBUILD swt-3.8.2-r2.ebuild 4438 BLAKE2B 59f9d1843bd0679e7c9192eb5fd569e3fa9c86de0d735d9a54e824c52477e9df9438ec6e5d9c66ecc6a87dd12afe761271659a396642a67fab706d23a58ac676 SHA512 b8315c756dbeb3b47ba2c12b1d0e5f2588952fce9f422ef18315380ea8dc260b3841bac4e1493641b16c247bbf074d7f78d8b60fde3a8d3962c064354a1f42ec
+EBUILD swt-4.2-r3.ebuild 4683 BLAKE2B e2b9275589302ad282abbdf275441e9c53386e8e4d20c48e88010cf545e5e053045a29c508b46277401cf33a49a674e811c4447f268d1876c1a3276755b8c95d SHA512 8eefff1037692f3bed036627346ea91db6ab61c68c91be6f7a517774c2983024a0b7994bea1e4c359a9a082d813a2c9f692b4d63f7b1d9ae99b0ab13b94e7a13
 MISC metadata.xml 656 BLAKE2B a557635b1a3a5aeb1aaf70122648ad6deaad3cbb80533fd452b3f87e6cef39bacd48b4b2ebb012d661d2e1d1520ef024648feff9becf6440b71333d87173ae49 SHA512 1aa0b6b24df23fa95730ab3167ed5ad264305ee0dd73296c3816de3be9fdc965b70d84c930c21ec2baf8b4535a4fcafcd554b242dab2bf6b7fdaf75ecb3c1615
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes.patch b/dev-java/swt/files/as-needed-and-flag-fixes.patch
deleted file mode 100644
index 4cacaf61d671..000000000000
--- a/dev-java/swt/files/as-needed-and-flag-fixes.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- make_linux.mak	2009-05-24 18:38:39.000000000 +0300
-+++ make_linux.mak.fixed	2009-05-24 19:38:51.000000000 +0300
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -92,15 +92,14 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
--		-DSWT_VERSION=$(SWT_VERSION) \
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
- 		-I$(JAVA_HOME)/include \
- 		-I$(JAVA_HOME)/include/linux \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
--LIBS = -shared -fPIC
-+LIBS = -shared -fPIC $(LDFLAGS)
- 
- ifndef NO_STRIP
- 	AWT_LIBS := $(AWT_LIBS) -s
-@@ -122,7 +121,7 @@
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
-+	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -141,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
-+	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -157,7 +156,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
-+	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -165,7 +164,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
-+	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -173,7 +172,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
-+	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -190,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
-+	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -207,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -227,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -247,7 +246,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -264,7 +263,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
-+	$(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak	2009-05-24 20:09:55.000000000 +0300
-+++ make_freebsd.mak.fixed	2009-05-24 20:15:03.000000000 +0300
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -91,15 +91,14 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
--		-DSWT_VERSION=$(SWT_VERSION) \
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DFREEBSD -DGTK \
- 		-I$(JAVA_HOME)/include \
- 		-I$(JAVA_HOME)/include/freebsd \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
--LIBS = -shared -fPIC
-+LIBS = -shared -fPIC $(LDFLAGS)
- 
- ifndef NO_STRIP
- 	AWT_LIBS := $(AWT_LIBS) -s
-@@ -121,7 +120,7 @@
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
-+	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +139,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
-+	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +155,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
-+	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -164,7 +163,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
-+	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -172,7 +171,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
-+	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +188,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
-+	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +205,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +225,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +251,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +268,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
-+	$(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-3.5-manifest b/dev-java/swt/files/swt-3.5-manifest
deleted file mode 100644
index 70be33fb8ef8..000000000000
--- a/dev-java/swt/files/swt-3.5-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.5
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
-
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild
deleted file mode 100644
index 8f9fb56f021b..000000000000
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-SLOT="3.5"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				=gnome-base/libgnome-2*
-				=gnome-base/gnome-vfs-2*
-				=gnome-base/libgnomeui-2*
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		x11-libs/libXtst"
-
-# Use a blocker to avoid file collisions when upgrading to the slotted version
-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
-# so this is the only way to prevent collisions
-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
-		x11-proto/inputproto
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/as-needed-and-flag-fixes.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt || die "Failed to build AWT support"
-
-	einfo "Building SWT library"
-	${make} make_swt || die "Failed to build SWT support"
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk || die "Failed to build ATK support"
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome || die "Failed to build GNOME VFS support"
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo || die "Unable to build CAIRO support"
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx || die "Unable to build OpenGL component"
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/"
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-3.5-manifest" > "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html || die
-}
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
new file mode 100644
index 000000000000..63f3c11299f2
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="cairo gnome opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				=gnome-base/libgnome-2*
+				=gnome-base/gnome-vfs-2*
+				=gnome-base/libgnomeui-2*
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+
+	case ${ARCH} in
+		ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+		*)       epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+	esac
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html || die
+}
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild
new file mode 100644
index 000000000000..72289d111711
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+SLOT="3.8"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="cairo gnome opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				gnome-base/gnome-vfs:2
+				gnome-base/libgnome
+				gnome-base/libgnomeui
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+
+	mkdir -p "${S}/src"
+	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
+	epatch "${FILESDIR}"/${P}-gthread.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
deleted file mode 100644
index 10d4a3a0aa38..000000000000
--- a/dev-java/swt/swt-4.2-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.32
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	gnome?	(
-		=gnome-base/gnome-vfs-2*
-		=gnome-base/libgnome-2*
-		=gnome-base/libgnomeui-2*
-	)
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0
-	x11-proto/inputproto"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-
-	# Define missing g_thread_supported() to be 0.
-	sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html
-}
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild
new file mode 100644
index 000000000000..40625a0c8c8b
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cairo gnome opengl"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.32
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	gnome?	(
+		=gnome-base/gnome-vfs-2*
+		=gnome-base/libgnome-2*
+		=gnome-base/libgnomeui-2*
+	)
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0
+	x11-proto/inputproto"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+
+	# Define missing g_thread_supported() to be 0.
+	sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 4faae3ad7cb9..0dae496206a9 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -16,7 +16,7 @@ DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
+DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
 EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
@@ -31,5 +31,5 @@ EBUILD tomcat-servlet-api-8.0.48.ebuild 987 BLAKE2B cd69ed7724756db420f1dbd49912
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
 EBUILD tomcat-servlet-api-8.5.24.ebuild 1035 BLAKE2B 45ce444889c27792361db95b35b2d10e235e2778d44b01725f1cdae10c6088d4f3f2b9c941ce9b255505665ac328f1bd86a2c8542b3a8375b8e2de0b4cc95bb9 SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b
-EBUILD tomcat-servlet-api-9.0.2_beta.ebuild 1057 BLAKE2B 09d2eae655c8c3bac49cd39b48851f6062625eae1706e8f85ec2f4b218c055deeca1a47882fb1c8c386483c666b0fc2cafe483c7957b29f40176f42792c88d0a SHA512 f8c9dde308a0a45c0bf05068474a87219ec43148507986acfe52aa08c35a7cc02421597f89c18f03da8bd4f68a7a4bbd8f1e7d539b21698593ee8023ee2575c4
+EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild
deleted file mode 100644
index 94987d88ef53..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/}"
-MY_A="apache-${PN}-${MY_PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
new file mode 100644
index 000000000000..16548ef959d5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c9681b81dba8..54583606263d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 582c67455e07..ffb113072002 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -54,12 +54,12 @@ DIST ghc-bin-7.8.4-ppc64.tbz2 129284515 BLAKE2B 2e9a1e70830930dda7dcbd696ef3c27e
 DIST ghc-bin-7.8.4-sparc.tbz2 147340595 BLAKE2B 8e39d6b144f4fce5196ad758f89887476e0482e8b98a012874d293d5e57756659cb9acb897476593a28f98f5c859548efa2e130f3806bfa2bb9e74795078a506 SHA512 ee5f0b2f1cf2693a0f2be9df71ef61b52bc2327225d40b8be955c1584b9901ffc6aaab63c1e46bf9bb352633b605c98378f8fd3e6cd71aef1c089007e4110217
 DIST ghc-bin-7.8.4-x86.tbz2 102312459 BLAKE2B 256cca9b2353af30dd7c239db0e21781d9d8aa352e38b3dd678b1429be6251e81f8955ac6ee0f766cc55f4de71c68acd98bc7b9434c3ea4b056d446ca59adc97 SHA512 cabc5bd6d8760ce4120e7053f6c1dffca7d161ba454b6201087760096c037c932e3ff8c82e53346c8278855bf0cff1c2f5fb8046242ca4d8307355b060a9556e
 DIST ghc-bin-8.0.2-alpha.tbz2 234361847 BLAKE2B 8e3439f3bbae1d3f6ab71f69669ea065f5f36c9cb4b334f06161cc1b9507aae56297d5eeb8a9cf72916aa012fab0b444a179a0336f00d5f17a8d402d5807c6f8 SHA512 c8b588feeab85f7b8fd60e2e8bf755d46790d4882d2ecf6b2c8b8e02c62a11b7e6453bf0cfbc646bfbf24310fdc775337f3957ba5783675a271b68f0af2e9070
-DIST ghc-bin-8.0.2-amd64.tbz2 131007452 BLAKE2B bb0fd3199b62dee98ef6f47ebd1c52afa56af837bae85d96c5b745a50c6a2031885e7bdd4ad40d1fbed7c6edb446801fbe34cd93134234dc842dca21231d2dac SHA512 d960c40966e392d5497f694f0b47df4a6ec22ad1b4a607437c8af7c33dfbf122ccefb525d807716539af57c31660378e52fc495dd0a1d0fc3bccaef3578be177
 DIST ghc-bin-8.0.2-arm64.tbz2 191332951 BLAKE2B 305c4d618a6221e1322a5665544883624de4646e0186c6eab56d0b32877645f0b2bad8381848914751fbd2e11598727c46ab136de74c57207b75ecc6cce9572a SHA512 b9cabfda8fc6e851ba99f53274c1a63c5a6a365311a9203f1247ecf90ab843dd94960ad44c4e67032f4690f07d67bfd8bdfbe59f857d6c63344430539e2082fc
+DIST ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 133679542 BLAKE2B c50597857b53a2bf9d8047c048f86aa1782f74d5d9816d44b7bad7302181b407257ad0b52a03b4ad4936de3a15010b0ff5ca877b9578af6d3e7684dda2284718 SHA512 7f33e0b20a21fe076db142a58a81f68ab8f230ac9ce0167aba31aa0843bce20a9cf4065acc1c0ee2aaa01ea2ad4a8234388b0cf3ef886dccf25d7072602b430b
 DIST ghc-bin-8.0.2-ia64.tbz2 250237654 BLAKE2B e76987717399f4be0a3f99e9976f29416c768a61280bc5a05ca8759d5fbc6273e28d54fac102a5f69b65c7fb50acfd1a3c7505f697f0900cc3f619ffacf9e1bb SHA512 e8cb381de12ccc0a7b513683deb5de555fecea22a735d09b073b0199ab4124305bbd8a093b4710b827513d33fd4224007e7bd210b146508eb183be7dfd283a26
 DIST ghc-bin-8.0.2-ppc.tbz2 144760090 BLAKE2B 32410f3563f7f2555350806db460d2083c7248c57223c9c681d0b4913df942f023c7c1f5fda145179a524ee7ef105a9b8309ba87c20dc393a9f49151579b6767 SHA512 bc6bf8998064ffc1692c3bb83c44d1787760a3f4a1e6b79dedaefda5fe32b9052049a60f0ddd3c0b0bd24a722fb35e310e0189b3511721ff89d4d02b3d7c14bb
 DIST ghc-bin-8.0.2-ppc64.tbz2 117432068 BLAKE2B cae202f0d6e825127d543996b2fe7ae02578c47325674cbf22fddc53b1c4c9413f45c60d76ec3d07860cb8d0aae1ec792e4141822cc5c08ef9013308c5d29bf5 SHA512 0eaff0557b68649a15bbeb2019f46fa9e9e7b8a916aa210ab56888090a5b887d20d818e7987177bc6a8e7fde503de560026e6bb55fe39679b8b1ee13c6b7c4f9
-DIST ghc-bin-8.0.2-x86.tbz2 133372061 BLAKE2B 4a32e70e9ab767db4f03874a98f86730b696363874f593f6abdbeeda80e5f38ba3ac94824b9daef839be9f93a80352d529f27949ab91d5eab0c7ba4c57b25bc9 SHA512 020ce0e597e2907550c080f1bb0f863dbf83d5d45df2b3f44173506475bc4ef5423c5a060fdacd87614c3ec398ad94c2dcab9cff0376a54a2c54c2eb1e2f657d
+DIST ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 130852973 BLAKE2B 24d2032bbfc664d924800c1a317334e2342c8ec1e529178f9d1bb99bb4772a9cc100603bf70111b8cfafa715c1cccc643f115c77cf6adcdfb17d1f1735ee6682 SHA512 c36e0e2600fc7c284562a323d396a03062cb6e8fa63c353e672be61e76d2ec5c7698485e3a370a57cf512db9e5ba6a68338fff2ab404d9fe67b1a468ed72638f
 DIST ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 96157437 BLAKE2B 2b9608845db8cea78db07209fa054b3b05085d5c3ac07cbe3de02a93c87fb0cff12b1820f08757221c59c8a0a9e7a5563c44266b181525d916825e5cf5bac34c SHA512 e891e76557fa61853e28829b8bedc4a6abb92954f90cc1ebcf22a13cc137556bbe9262e7398b7e1aedbabeb997916b008bf1561a52f16a569f3d58ea9404f41e
 DIST ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 97490496 BLAKE2B 3666ea70cb8b3645db071040d2069fe244042c11954b34e5d92aaa90132d2316c0ee8c176cd4e674772bea3b99df150404f62bd8745c046cdaf102ecf0a0fa54 SHA512 52630a185d0eab56bce0469a612a54109895bfee041ec362ced59a9b35ba3b9c185e86bc7dbf0a5939081d3626baa19fbb3306e36d1857530248a7b9bfc100bb
 DIST ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 96638908 BLAKE2B b470f838e77330969f162196b0f1035fa764f5d123687fbf67c14323280bfe55216af0e16f8b79c62f290905d96abc8bfafee650f8d27c81608853e78329b2c9 SHA512 15b1525890477539878385efc15ce5f1cf2f126cc785c42923be958cabe3298cebe73526a2370cf4c630124160a7ca0f0f9062aebbf035dce807a0374eaddd14
@@ -68,7 +68,7 @@ DIST hoopl-3.10.2.0.tar.gz 241940 BLAKE2B 0ed7bf80486767c81415f99da8780a525401c3
 DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
 EBUILD ghc-7.10.3.ebuild 21684 BLAKE2B b5b4c381925d8f01414f90226055fe3ef62b591fab0b7af845cd70437a11aee55b44acb68d991b99ee436553215f1fe2d078cd431ab53ea1c09661b11df55b38 SHA512 f4b67c2e0eab5cc15eb0d76700e887e3d55e22fc0b4571df7f041a022a02f112b3dae825fb096ef54ca15e440f18edcfe9a4a5f69dfb4ae1b446b7448f369951
 EBUILD ghc-7.8.4.ebuild 19831 BLAKE2B a883d42fd0dcda56f9bfaa6da8ae316b4e6b2d40bcb1e17d7dd878e304375ee07ec69807fda368f70afa2d806a8bb6c201486e30a6b1b28135efbc75cff2572a SHA512 9a3bc30f8af34ff3feb842ac0a7eedae67bea8c64d1f6e2c819aa6b268180695ee6ea4824e1ae39f46c70bf0ce45fb109299834adff69496587100a68715c075
-EBUILD ghc-8.0.2.ebuild 21394 BLAKE2B f47cb817eb26bcf9dcfe58bf2f8dddf7bd19f451ddf52620210802524e4f58557711f90d1ac459c4d411553bc7ab147f9d1b4fe5e06235c2296a4c40cf641c39 SHA512 386f9b7a4e128e676d98e426cab20d647629f6c11e7516229d34b624eaf3ff3898aacfe53814c9e7a0a3982f0ea8eb58cee99950f264caaafa12ff9dbb221e6a
+EBUILD ghc-8.0.2.ebuild 21420 BLAKE2B 3e3b56d6e1956a4b9001413e759b65669ae82d50c04193148bacbb3e624bfca189f8cc72ffc321b598c5dc58534d6555dcda7df66d3ecf4802d87c1a7f4c2753 SHA512 31b755ef24ebf0c275696a3c03ff9787781b966a3c52db637e82ebccb219853125a17776d910ba5574a105232b71b2e712ab293db929d5d299e356808eb46d05
 EBUILD ghc-8.2.1.ebuild 24769 BLAKE2B efcd5670929fe91f3b5a059644c8a4848943c6f7065c4b2b347d14af9745eb867bd217d81c9ef822ef816f05e10b6d2d466eb2d15c7f5b35bfe3e2388a976022 SHA512 efa3294d0f540d7a53b3a92fbc15a8a095e517a60a1d9b1ed36bd73551f9ad690afb24ac88b9c8db430b1506318b12abcf4eb077470ce111bc1db93f6212e6f8
 EBUILD ghc-8.2.2.ebuild 24681 BLAKE2B fa04dd32410a955f956863e738afb01e60fb568173404e7c067b0a615f48e28ed25d2ca1f4f8237042e9f25db3819d04488f2a327584fc457ace78fcb04b9d96 SHA512 e7b5686858076a15bcb14d6818c6616e2cc3197e0e241367d3cf38cedb7cdace091fb9b21ba978b05cb908a3c8a7723f84512f4b94abed797957c83cc147c1cf
 EBUILD ghc-8.4.1_alpha1.ebuild 24643 BLAKE2B e3c9c1483173e60dc709f1b95e0fdfb173f7f8a64f7816ee62c44dc1cfa989e5877d53a26e9b96d807a5803ba10b17f72bee7dc921f3d53da08083482d4a5e4b SHA512 43e1e6169cd2ded70d4fb4d86741b743a51cfcc55f48a3621cdea1ee9fd18bb0a455890d430f74236c692d630fabe0c0d90bc56bac36adb5828e77a4470e2d57
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index 2063cc61ec9d..b95016abd958 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.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=5
@@ -27,12 +27,12 @@ arch_binaries=""
 arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-arm64.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
 arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
 arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
 arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
 #arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
 
 # various ports:
 #arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 43f916a9f6c5..15cc3294da84 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,7 +11,9 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.9.1.src.tar.gz 16377700 BLAKE2B 63558227bdbff43da788c43e082e54dfa0210e53de650b3e2a4ab09c55a9937a0d1fee66be8263653c2d8be774611f2485c7e673b8a5fbc7f7c0adc5fd4fdc1f SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793
 DIST go1.9.2.src.tar.gz 16383591 BLAKE2B 3ad9d0e7b6b817a4eab7ffcca30ba86a0e50e68ed028b11f54b8813f4b1a9a0598c79d501c733e7fbf77831c8f7df681692f9aa6b860b16a6288dcab59d40226 SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5
+DIST go1.9.3.src.tar.gz 16385451 BLAKE2B 0d16eba4d411a5ddb1915a305725e9762874568abb048cc5c8939e82481d7d530902d532b62c8fe10fe7e31465617171d17cb5aaf3ee51aa29b9a66837bf6874 SHA512 31c564af58b78c648c9bece8fa2ed3334feb80316b07b16f6286319e26d317da90d1af0464c3a2f776a3da72d31b22b063dbc620b93114bf142a11e8a625e527
 EBUILD go-1.9.1.ebuild 5581 BLAKE2B ad0fc38ca45942e4047137143513d7ce9c8a473278dca5b941b377e0454407d2878e625854448d3898cf5f3f9c4fc37a5e43f84d3e1c8e79da055dfecc0651dc SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997
 EBUILD go-1.9.2.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
+EBUILD go-1.9.3.ebuild 5584 BLAKE2B 235e48cd961466acd6fa167d10425588aba877b407f5b0abaeae2b69df440c528e7a6f217ea0d7d677d119be740523bf874aff9655e4f59704fade25d25fed84 SHA512 3794c681a1dccdcd4d644265b303a3f5b272d548694a3a07f1352133f1a7d918518a5c6165980e5a51828228a6740121a36cf1f5dcd399c974cb27b4b12728e4
 EBUILD go-9999.ebuild 5584 BLAKE2B 61972a420ecaceb45bd90c22c57e4b297766f018b9d6c9acd17add96e70c4c5a43d415e25f726151558d043ae6d1c4d6cee880cc2601ee289f9942e2dce431f9 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.9.3.ebuild b/dev-lang/go/go-1.9.3.ebuild
new file mode 100644
index 000000000000..480b7faabc23
--- /dev/null
+++ b/dev-lang/go/go-1.9.3.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7f3cf353aa47..30469f90e750 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,10 +23,10 @@ DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 BLAKE2B 2a636f5500f4c7d354f42113
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
-EBUILD python-2.7.14-r1.ebuild 10796 BLAKE2B 705db175a906c0087f462d4b7ed94ebfbf87acc5624d573860594ede1eea486ed65ff74967a64f24794e8f9efa85b27f9d74356bb069b82aaac47d906aa45b84 SHA512 d2dabd2997c85b26d82bebe4c9f3a24cf677cb3e0fd63c0a6896a3c29e73fec66f34eecdecddeb37264e51c3c379ddead561b4aef82f66b91289b8dc45c1402f
-EBUILD python-3.4.5-r1.ebuild 10670 BLAKE2B 2db50ef10323f864a5831813c65b180ffa5d4844ad680c21ad930ca517120941ad87d1f43e2734a8f6d8fd1c22fc1e6d84c397dfcf960df4eddf6bf22ce384de SHA512 efd34ae63f759f234b250e23c1ca6fa996dece9fe8da70cf496787dd52b20fd358f0d268985dd768a696769c3b61a184d98c460c96973b9e775dd5c4c9a677c1
-EBUILD python-3.4.6-r1.ebuild 10604 BLAKE2B cea6146a6b8643d1ba8def78647a83ee25bb055b9605c0f3d214220500034c7a412955fa8047a058e383dbcb832ddd1300ee2ff7a05b37d7dc7fa831d6631c5b SHA512 4aea9eed7fa7806d5eb8f51253c9665b6b887ed187db39959a42a99da2e4ef259109c1442886156019790b8f83c4a63dfb9e5ff33df318a9ec75521d02336359
-EBUILD python-3.5.4-r1.ebuild 10731 BLAKE2B dd485c532b73233127163845467691c73c53b65979376715d18b711ee787db78db869b0f09c00492981376cbecc204315af605a683972e9b408a0f6751f22f46 SHA512 13e023ca09f35188c2858f7fde9dd71e4fee35be808d2719706b60892d4f8d989baaea332e174ead6b4e6fde8259c52421ffa08473347ae8920b93cfd704119a
-EBUILD python-3.6.3-r1.ebuild 10164 BLAKE2B ebda210c0646c6a4f0b633b7c90b96bb53be52d5559164cf43d8ea6e58c994d3d848439a0ab538fd7ac580a41aebb1862e8635f0afd59a7a6047a3b76342ce45 SHA512 ef5efb5459cb6fd5d542010799533e30a64eacf0074eca562e571c493a97a0ae51544a42332ebf0cdc25c33397ab272df478a180871c15fe37bc512c5a6d6ae5
-EBUILD python-3.6.4.ebuild 10095 BLAKE2B 1ffeae9ed685b550c0828905ff313e159b6eb0c3ce90e4de2fdc8d3d069723d2cf3ca8433cfb5505c50ca718c5bd6c2723cf01bf433655fda4b64dc54570c412 SHA512 b70f8be85568c444c42f0e6e9827c47a5712add30749e4aa2d8417e2f6a12d1d7f9571a26cc0e011e5ed30418711dc024b8555cb2d87147fdf60fa94f547854f
+EBUILD python-2.7.14-r1.ebuild 10784 BLAKE2B d445806263033f5f6fb6bf816df12f6698acbb959b0a9b7a6db8c66d5d2a22cd849d3b80143fb6b7725133cad102bc3d97e57f079808fb75517f5fdc7d4933f8 SHA512 75ffa41dd4f6c15f02c07491c61ecbc3b0e47bab670e73eb34f13dba0aff06e9ce45da4c2220bc94dfc50cca2c9b3e2211d07263cfe2b13ce66b0ba79a2e01ea
+EBUILD python-3.4.5-r1.ebuild 10658 BLAKE2B 46398a90c4f67b4923d9c65476f0eceb42135084b0f71f456162557a2c7adf2cf0c6f07e2d9b65d49eb92ee75233c249bfac32a9e5fb1fcdcd67988f19e4033a SHA512 7a2e1312afcfa032aa16579868f2c7efe04eb38904db2b66f11f87e174533c9df89abeb16a28e3f6372651e2a733f885ae5bb78b07cacd150c9ffe8c66f9c2aa
+EBUILD python-3.4.6-r1.ebuild 10592 BLAKE2B 448762119589dde742a632950c21b423eeb7f48f7c5b632b28179839031b1a96232f131942027f1c41d0ceca76ca65592f69ee3d1d556e967b2125b257b9f4ef SHA512 a01670f2eeb8a8c86c6c6d597760c40208dc235c52a635099872a8e2f27332d9b094dfc41b4bd87e7db5e1f0a224d7bd24ece60ec71dfd0d63285093db7dfa77
+EBUILD python-3.5.4-r1.ebuild 10719 BLAKE2B da7ece23e2f6333066b9f5d74f40e21326ec785715a818c95627818ae3c1c8c55aedd88323e5203aa90e69290871daa1baae9802ed6dd1a2a20b7ffbd02eec76 SHA512 ec0248c551531623f02430182c299c0f19ed002c195ae020e8f5b815e9978bf7c10e0a4d85aea312e99472f117cf94089c8644a25e5a8a142f88a62daf9ad332
+EBUILD python-3.6.3-r1.ebuild 10151 BLAKE2B 9ec6af3cb9b012f3869cf28c5a59f6c3b36ffe403f91b0af02f2892fd083c36190e2d50ce2c81e7f9347b4a08847d1591debaa5d126734dc2d24ee349a897ec5 SHA512 67d93b9c93ee37fc46cf193730550636487b189c57fb47f1fcfc1a3bf2cf12e464df1614ee9b871f0c385c243d9fd2a167be8635a524ca322d0964c04df77f17
+EBUILD python-3.6.4.ebuild 10083 BLAKE2B 7d04d19bbc1163fd3425f666dff268ca58657ea4e6548bbe3320e9c2cec26feefcf66762d709680ad790fdd44e846fd587301b586a6f8f28a0806d7b47e29a1a SHA512 23e3d170b5f28fce900ba35108d8ffdfe654347e3af4c1fdc5920d49264f1976c16eb9393a811b4883c1a5ce94140700411bc8c2e5087a2d3a06abb164749a43
 MISC metadata.xml 738 BLAKE2B 464af9b051fa52c8d7f632163a0ea51e356f79d5f0a2ba82c8ac70ef2ebf5ea489bb0d5371ebd954ee0d5b07fc86b8497be3aa2f660929eb09c4a0222a6cf704 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847
diff --git a/dev-lang/python/python-2.7.14-r1.ebuild b/dev-lang/python/python-2.7.14-r1.ebuild
index 4784d51181a3..7a006eb67d78 100644
--- a/dev-lang/python/python-2.7.14-r1.ebuild
+++ b/dev-lang/python/python-2.7.14-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"
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.4.5-r1.ebuild b/dev-lang/python/python-3.4.5-r1.ebuild
index 02cb5d3f2cbf..ba53f11277db 100644
--- a/dev-lang/python/python-3.4.5-r1.ebuild
+++ b/dev-lang/python/python-3.4.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.4.6-r1.ebuild b/dev-lang/python/python-3.4.6-r1.ebuild
index fe9d1282ecc1..0f6328d60306 100644
--- a/dev-lang/python/python-3.4.6-r1.ebuild
+++ b/dev-lang/python/python-3.4.6-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"
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.5.4-r1.ebuild b/dev-lang/python/python-3.5.4-r1.ebuild
index 559f6eeee164..3e416a39721d 100644
--- a/dev-lang/python/python-3.5.4-r1.ebuild
+++ b/dev-lang/python/python-3.5.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.5/3.5m"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index d94998bb2402..a725f4bf9888 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.6.4.ebuild b/dev-lang/python/python-3.6.4.ebuild
index f0adb4196ea4..522b5b5078a4 100644
--- a/dev-lang/python/python-3.6.4.ebuild
+++ b/dev-lang/python/python-3.6.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4f49f9c794a0..69e0af48c610 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -10,7 +10,7 @@ DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4d
 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
 EBUILD ruby-2.2.9.ebuild 6917 BLAKE2B ac51367b247e80f1238fae974226c80c564c35324ead2876cb3b8c7c29cdc3807ca945c6ca7eeab71561c0b949c1ef2793bb9fca599e46fc0f98f2547c262b5c SHA512 a83633e841bd9452841e12bb4f16894973e753af788195c0ae12309db044efe3faa4db2c0ff1c32a6eca149ddfb89c7822e1056e31dfbf94dae87f03d015ba26
-EBUILD ruby-2.3.6.ebuild 6878 BLAKE2B 947540741635c2cc5d2d197cf20c162ef9a66eee4a2a7f820bb23fc0fc498938650b12054e84ecc445dcae382faf3022ccba6ee6ea6ea73d102c6a8076981279 SHA512 d62e6caab4ecfca57b27e082845add9d8803b7feaef946db5b99df7d529eef7aac921a3067d19e5084e7326e0e33dd7830d93584235934d2c7165875e712ede6
+EBUILD ruby-2.3.6.ebuild 6876 BLAKE2B a842d91f36609ba92b09e26e5ca2b4890278badd303b3e83fd3bcff0132e70187d9e88f402c20d69869623270e9cc72e183118833ad2fc42cfa22020f2d444d9 SHA512 d475de2039587bd03a5d6bdc71cd0214c6a32ec815924f6b11017d6894513f9b2b6d0ccbc2b6faaf7e4f46cc117685b542951ea690c922399bcd470165b18a4a
 EBUILD ruby-2.4.3.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
 EBUILD ruby-2.5.0-r1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
 MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72
diff --git a/dev-lang/ruby/ruby-2.3.6.ebuild b/dev-lang/ruby/ruby-2.3.6.ebuild
index 84da980b2084..ef91144c8658 100644
--- a/dev-lang/ruby/ruby-2.3.6.ebuild
+++ b/dev-lang/ruby/ruby-2.3.6.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-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="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index fc28ee089837..4b522508e567 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -12,6 +12,8 @@ DIST rust-1.16.0-i686-unknown-linux-gnu.tar.gz 106129219 BLAKE2B ea549c33e4a4be9
 DIST rust-1.16.0-x86_64-unknown-linux-gnu.tar.gz 103142459 BLAKE2B 6fadb77e75c11ede8eb4dd7eced4d19c3405f81fe072cb9170d798a114da71f3cdb538ba69d4d20c2d42074dacb54dbf9a9c5dfd44dd3b8b441843ebc88c22b9 SHA512 f3d381c0e47e0af02eb116376422c3e48295c2854c6ad8c03d4c13e662f3cc1fdddf25923f7b3ef358c5cf670ed67d75e2197162434a81d5f9499e6e0e2d1054
 DIST rust-1.19.0-i686-unknown-linux-gnu.tar.gz 143010900 BLAKE2B fd47fc710f151d76d5421377c1bd571c635e42ed812af34bbde368cdbc1c4927efa2c63dce0c7e2a8e160d463b6e3812aa1e5e4ca87f1ef632d7be0e0ff2c8bb SHA512 a41bc6b576e04e4ced66c69524eedca6528b8a559c4877408be590d48ce4c77f6157f9adbc9e87e209f3e2d21ae105305195dbbfbf519f8df88a1615b49b3b0e
 DIST rust-1.19.0-x86_64-unknown-linux-gnu.tar.gz 151087058 BLAKE2B 796bd295393669cd55cf0a0b25f28a85b2d86394cb637b4de468c1095c5757212dda52f7d5d5ca30cfb69c0b5719d6bdce71c0ad7ed8f9ed7a40f7705f8ba550 SHA512 fc98ad7728a72c9bc93505458f7558405cc6a608eb19aa6c609e0155e7c081123f116cf023d19af2f0cd9cb81b8e1bbe69efd88f7bb61cca2d258d5fa2ed6bba
+DIST rust-1.23.0-i686-unknown-linux-gnu.tar.gz 180646185 BLAKE2B 1f4653141722baffdfc9114979ac7b3abd01a8d3bf879c1e57e26daef28af39d2d64f2eea1bfadfee37f7ec9d91be06251a0dccdac1bf817f850b60bb6a1eec4 SHA512 b4b5a26b6416ceb81cbb7202c42481bfa10ef2afabfa46c2eefc89d58f87b1b4785c1f65e2f58ea863ae3d3e794aa06e101f9097d5aa757e6749d891006a7542
+DIST rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz 187313088 BLAKE2B eaef537506106b4cdb4c26652cc322ca7cc5f47fe15bd8551c07334bdaccdd98b14c1f91153e96ca79c22c88dfb69d2a7823fc3ac90e27b0a2c36c6559cda04b SHA512 71c0a893b25f6498bfd73104f006b79b5d6a31e4a4bcc6dcbe1b48183120afca28c12404b436417e010e3c449845c98e27e76d2b0f33498bcb35d2434b1fa821
 EBUILD rust-bin-1.12.1.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
 EBUILD rust-bin-1.13.0.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
 EBUILD rust-bin-1.14.0.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
@@ -19,4 +21,5 @@ EBUILD rust-bin-1.15.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e
 EBUILD rust-bin-1.15.1.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
 EBUILD rust-bin-1.16.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
 EBUILD rust-bin-1.19.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
+EBUILD rust-bin-1.23.0.ebuild 2695 BLAKE2B 6200ecac0f8d1327cb4a12fcc5e5f1ac0c1b4375f9a91d115a390c056994045bca5d2e5a4fdbea97034c0fee42437ae3a9f56ca22e4830f1f46753130552fe56 SHA512 c9846fcf8a5be0ddf5b950039b5c25d5c1379e72e32156d692644bfe4e7143425c2389ff8b6b774e78338c035c8c9b45e86d8c96508d5d48ce763307ade927fe
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/dev-lang/rust-bin/rust-bin-1.23.0.ebuild b/dev-lang/rust-bin/rust-bin-1.23.0.ebuild
new file mode 100644
index 000000000000..9e2dadd1a193
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.23.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
+	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+	opt/${P}/bin/rustc-bin-${PV}
+	opt/${P}/bin/rustdoc-bin-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 6d3e8ef3a10a..687e38caa169 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,5 +1,7 @@
 DIST cargo-0.19.0-i686-unknown-linux-gnu.tar.gz 5068212 BLAKE2B 4fd16e33b220ae496603cd5a16055557d96cbbf04943040c36f6121eb3b7e53d5644a6e0cd8794d3485bb323f0a719e921be8a944f466cd4dc317d82b1b8deea SHA512 bfe5df682eb566c91995b8c00b5e8edb5d2c3410d1baa5be2ede2e39260b653d34b7723c6c3e8f07d8102ffab50b13e62f9f2d816dad8fba9f39b7bec984181e
 DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 BLAKE2B 39eed4905b06a9f28340b1ca0362dd9d592b5ab6a11ceb8a749069827b65b25c34b8020ca434b3174733dcdda2c38b460c7c0d9b877ff2fed1a790f5f70d9c5a SHA512 6fedb8f83d70dc4fb93a29d400577a5578ceed1448f4e85e8a9509b98b037a125532ebfb6a7e6bc9411501ea74774d2c47ac7e2bcb7ac82baeb925abc46609e8
+DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 BLAKE2B cf2f30fdc01cbcf45de427b5a5a226b8482f3fc13e122cc4f021a75f648678b23a789706b54b6425346bdba57224898809102d97bfee8b143f90763ea985b6c3 SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0
+DIST rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz 160427151 BLAKE2B f56a8205023ec39a5569e443f1c7954c55c9b2fe94126c03bcf9eadf4d26cb60d8ae9e8c6638550e79acc5906d865bdaaa5e0e61a63c9b23383afef673018638 SHA512 30206d5ccec432a6a92aeffb34170290109d65973a6d1cd91e7e1aa82781a0da00023275b5a3a3effad79d539d2f4829d1eea5fc3d0c1c58a7f3a4855a84785c
 DIST rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz 66316236 BLAKE2B 64712595bd979b7eadb626198df1c43951cf040dd94e9b18821d5cc9807d6b3135c62129d89b8cbebe2aabb28e7fcbe22454cc7c4a66ef1a16db899f30e91671 SHA512 0649743437f15d80f7fe08ae32177b36e2a89e87db8062433cfa6d0f62fe7e8fdbc109a025c02dc110d8abdf4b74ddfe80ba8fb895992b0f5ac6a880bbbdf051
 DIST rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz 75723132 BLAKE2B 1a0407be9f65db914dd5573daf4ca47804bd3254a3ef51b244c1952e91b5f1395f712dd2c82eb73623ad7da79bffcc8ac9b5e6e0404b3ffa300fe0292189caec SHA512 98f50016cf6f7c89f90830e1c9f41b5413adf2eaa5e2874ca117ffe84ee59fe77cb461ca3601ee65c5c5c884eb42e22509a94c00544527c727f2e3d6d0adb530
 DIST rustc-1.14.0-i686-unknown-linux-gnu.tar.gz 51391277 BLAKE2B 3c9c9f6567bc03c03dd45516b137a9ac19ee05adf32440a720941c9edc9c3158dd003a37f54694919ac5efd559383f8c893e86651aa5e5bd30cdd74f7d81e6cc SHA512 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb
@@ -11,7 +13,9 @@ DIST rustc-1.16.0-src.tar.gz 28470372 BLAKE2B 0b1f5156e97d8b6ecca086a818a9a15b66
 DIST rustc-1.18.0-i686-unknown-linux-gnu.tar.gz 47281118 BLAKE2B 96dbd061a048d74a4054356bc4073dc538aa0799dae362885909fc9fbd30e25ebe7da8215231a049ff83b6696d0e76a5741bc337c86a4b8d34fd0d4abc4e6170 SHA512 e270a314fb326fb226226741a5a15f237846ffb7ae6e0ab349f56328f5b3557d8b3dfdcfbc168f3ed4d9875806434537ce7bd5fb97b2c3078f7d03fd6ce65d2d
 DIST rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz 45281645 BLAKE2B 3034a693aa808d1d489ce36db5a00ce7d239bef8265f322c6fe4f1f5a9d77cf8f9e447e2ca539f6d3e758214dd01224957d8c662eeedd76ffccad3ad4f341f3c SHA512 7d8865a43b979150c3dc3abaa852921f46bebb54659bb0f14bc9b82b367f94ec031da4d03242cb6aae8bd11167402b9e166a14aa3c4a141413be54e9a685af31
 DIST rustc-1.19.0-src.tar.gz 50108626 BLAKE2B ae6016f816f2c41b81668764e2892d7846226ff944be9f173d9d8818c22aeb21cc7457e346bd4c985f41d3d22df1dad009d1977a733bbf40ff6fb8a6f0854254 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24
+DIST rustc-1.23.0-src.tar.gz 60010149 BLAKE2B 64bba97fd1a16d3162b65b0d8dd2024ca07166a4fb3d541a96216a27a392baac5f5addd9b3b223ce935df9437a0789cd5c3d8328957f983cc3317a63f13a4dcd SHA512 a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e
 EBUILD rust-1.15.1.ebuild 3984 BLAKE2B 282c07c0a78dcac9e862dc2c8788c3231d93a64e6276569ef4a609b155e30917d0412b9603a245fa818807d1726941a11ee335e15f17fbfe1e8f1d94e8d0d8de SHA512 a6b14e295a562308f5d9bfa2e5087c5ede31c93a99cc41b37fcabca42042ed958384660e51486372127d2262feb1071e3ffd386c974d86ad7647eb9c0ef8648d
 EBUILD rust-1.16.0.ebuild 3840 BLAKE2B 163ebba85b39e44406fd8b7dc9e5c1f9e929702a167f8ccb00605dd7e97f3e57101bc04ceb13887c3bfe1a79bd80f52f26f9f98727b1b2ceddb7a69bfd0c7924 SHA512 8c661074f6a53f6d8397d712c8236dfc34f18c386e699a1ab1db9a9eceba9e776c09c733ad615a1897916f1268c46e58a56c5f80cd2efe787fca5f8fdc8591e4
 EBUILD rust-1.19.0.ebuild 4145 BLAKE2B 0a8abe73955900466c432df65d77d18bc7d01fa570f5b3c7876f4cf465f2c1cc5821d554352343a62fd0e1330cb97735665821ed8cc8223d98667292e05a00d0 SHA512 0da72a60a704d7215a3dea336e780c81473253ea3ccbfc41c1cef4cf2b2f86a791a41f42356a8958088d6522e6c3a917cfa196d14556feef5f56667b92012739
-MISC metadata.xml 578 BLAKE2B 6d22eb2b5926f60491696ea194b4239d2abf5c075087e972c5b807399fbd2c6a0abc5ef2f22d0397498e6c03842b2b4d61ecb5c9a6870cf3239bc21552c9d2b8 SHA512 c2e4e7f1bbb0227493875a1ff9e55f870313b615a7234f716984366760dccc5b5186a2a03591533769958c3a70f8a973d5d22111cfe29849e835f5b0a400c26d
+EBUILD rust-1.23.0.ebuild 4494 BLAKE2B 10bb2d2bf83471ef0e78887265ec8fed165decf68034a1760d8ae6400dc93c8eb02d7e5cd36c096e1b11ee63eeca672fe4d609f49941fe42e4e8a72e0a549b8e SHA512 07dddcee213e0c655e4308f7702b9e8f447ae91fa9dfc5e2ecbaa0cd5c9dc2ebe9ec8406d553f33940ad09fb7bc7a122e385916e273e25b170ce6a11e419fb0c
+MISC metadata.xml 681 BLAKE2B 7d0307b56ec14694217b342794496b44a8b74cde85b710c7dddaa157d6553764b46d1c090921d25a62fc45adac8ee20042d423e24a575ac5771d695e6db5cec3 SHA512 c9afbd24ea1d2f1d68ef15d7fa1443b71bc396691bcd3e724ef74a84bb346145d236e7021e9beb9df512c859cae9bf741bfd6e7582b0a7df273ba05a8774d999
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 6d0b35dc8f72..050e235f7195 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -11,5 +11,7 @@
     library when building with <pkg>sys-devel/clang</pkg></flag>
     <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
     place of the bundled one</flag>
+    <flag name="jemalloc">Use <pkg>sys-libs/jemalloc</pkg> as the
+    standard memory allocator</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
new file mode 100644
index 000000000000..eb5a124a96e1
--- /dev/null
+++ b/dev-lang/rust/rust-1.23.0.ebuild
@@ -0,0 +1,175 @@
+# 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 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="debug doc +jemalloc"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_target_name="CHOST_${ARCH}"
+	local rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = ["${rust_target}"]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		verbose = 2
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		[target.${rust_target}]
+		cc = "$(tc-getBUILD_CC)"
+		cxx = "$(tc-getBUILD_CXX)"
+		linker = "$(tc-getCC)"
+		ar = "$(tc-getAR)"
+	EOF
+}
+
+src_compile() {
+	./x.py build --verbose --config="${S}"/config.toml || die
+}
+
+src_install() {
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+
+	dodoc COPYRIGHT
+
+	if use doc ; then
+		dodir "/usr/share/doc/rust-${PV}/"
+		mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
+		rmdir "${D}/usr/share/doc/rust/" || die
+	fi
+
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 6beeb8402b50..51f55be2e7bb 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -5,9 +5,9 @@ DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e7
 DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c
 DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
-EBUILD tcl-8.5.17-r100.ebuild 2802 BLAKE2B ac01b70f616eca1cc4a644effa67281ff17e38d8afc632ebda7b2c7b7bac85a88c2ecc7e4a1c6082aa17ab29f0dc7dcaeab01175ff405de55e3e2f8af6540f3b SHA512 420ec85568751542f09c87021d32860e604befa8f61ede6c65643c4e4470405a354c7710b5712fea05107855ffc39d79809094285d421264a6bea70041060e47
-EBUILD tcl-8.5.17.ebuild 3718 BLAKE2B feefc6d7bbcb9db5f12ccdd48b8a9720eb90dad0312ed0af6f0bfe5366f6e279febb06e32009edb756c69cb85984ea9b70b11cc1dce4412b0d8cb12e562782d3 SHA512 56f53ac9a88f74d4662c8f12d0e7ab3339db67445a2475787945de042b8c60524961c8c1abaee9e49e4071cda1d547c2409f2862c23aa04924bc9694aa4b9efa
-EBUILD tcl-8.6.5.ebuild 3973 BLAKE2B 12c5faacd9b157d60a331f04f5b32506ed1827cef98620a9921d85ebb445bdf6c68cc70fc7bfe6216f01b000759ab8d4e553159f99e2b74b2eafaf3e1073e6e4 SHA512 5340248208cb6b2def5fd1f39293b074656a138ceb95be8e21f3add6e21db4f866c9eff506cf05f8bee40a61a0f6bc984950ec487af79b679f4910b660c8d8e2
-EBUILD tcl-8.6.6.ebuild 4064 BLAKE2B 5cf68bea9ef88bc5a57a6991d419dd1bcf149581192ab0754e17f4aad11aba0c9cd10bd8669937d963b93ca2be7ed05770a8db7786478c49915407ab0b7e1cd6 SHA512 6469f0b9bbb5d4a6e5cf4751b0e2e4ac022c7e66a258098ae330089a991264171c8e454cb1b48e8d103b47991acdc6d4177ed32b05e38a83e1a25ff3c1f56bab
-EBUILD tcl-8.6.7.ebuild 3973 BLAKE2B 12c5faacd9b157d60a331f04f5b32506ed1827cef98620a9921d85ebb445bdf6c68cc70fc7bfe6216f01b000759ab8d4e553159f99e2b74b2eafaf3e1073e6e4 SHA512 5340248208cb6b2def5fd1f39293b074656a138ceb95be8e21f3add6e21db4f866c9eff506cf05f8bee40a61a0f6bc984950ec487af79b679f4910b660c8d8e2
+EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7
+EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800
+EBUILD tcl-8.6.5.ebuild 3961 BLAKE2B ee6b3a012eb7fad781ab7593801eea77039940eae7fb8c0cf8d6a28721ee67df92fc1f311158fee2c87f1098a5f08d327d5492c124a67cb71ede902afaed17d5 SHA512 51e845aa8a42f73b00c428a63d07b37562305fe9fc915c0c507cce08141176353c6de00d802ec10a170b443df7e52054e33fc292ce3583140edd08b441bc3269
+EBUILD tcl-8.6.6.ebuild 4052 BLAKE2B a615b722d9f3be08355e62fe47aa8c2376903295c059dd54ad238fbc30eb2ecccb757448787fc292b74773cb49f650f35c4fd38a605655466ff9131f0d4f75e9 SHA512 d2c75226e5175cbf2f81c32065ca01d195bedb58dd61bacb63e8b10538e8c2f00d2711e048f725255137ea70b8f84e1f0fcd970f0f9194efa3e5b52e402b47f4
+EBUILD tcl-8.6.7.ebuild 3961 BLAKE2B ee6b3a012eb7fad781ab7593801eea77039940eae7fb8c0cf8d6a28721ee67df92fc1f311158fee2c87f1098a5f08d327d5492c124a67cb71ede902afaed17d5 SHA512 51e845aa8a42f73b00c428a63d07b37562305fe9fc915c0c507cce08141176353c6de00d802ec10a170b443df7e52054e33fc292ce3583140edd08b441bc3269
 MISC metadata.xml 332 BLAKE2B 0ee39e35cb4fff0f8c872ade189193b40e2e6df04e859f6b8edc19c1e1047b970ff8bd37ad18621df27c1a8d4cfba34203eb8814efb344c98a0a977e7379d01f SHA512 ed76dd850b8ead57d5a3ad7dedba2a1cf79482c188919eb13321b90e5a635b233aec30408a4df741ceb1aa9d68a00065e05a80589ff8c82f2577637d7cd721a6
diff --git a/dev-lang/tcl/tcl-8.5.17-r100.ebuild b/dev-lang/tcl/tcl-8.5.17-r100.ebuild
index c72da88c4c70..0121fee4715a 100644
--- a/dev-lang/tcl/tcl-8.5.17-r100.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r100.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
 
 # this ebuild is only for the libtcl8.5.so SONAME for ABI compat
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="8.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-lang/tcl/tcl-8.5.17.ebuild b/dev-lang/tcl/tcl-8.5.17.ebuild
index 25fa0a2a349c..f7d5ca3fd4bf 100644
--- a/dev-lang/tcl/tcl-8.5.17.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.6.5.ebuild
index cb2f7e308894..714a452ad868 100644
--- a/dev-lang/tcl/tcl-8.6.5.ebuild
+++ b/dev-lang/tcl/tcl-8.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="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.6.6.ebuild
index 9ff899c98ac4..2af53744e1a2 100644
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.6.6.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="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild
index cb2f7e308894..714a452ad868 100644
--- a/dev-lang/tcl/tcl-8.6.7.ebuild
+++ b/dev-lang/tcl/tcl-8.6.7.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="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 737d383c176e..94cb9679222f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index d836527f113e..acdacc417412 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,7 +1,7 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.5.4-r3.ebuild 3707 BLAKE2B d8518d0ca77753ddd33da8494020da2bae21b8bacd9c6ee68ded04b63b1214959c1b47c3b6c09d2c1dac61b88a93caa166e8dfc69dd09f3ca5283c284cca0303 SHA512 81538bae99e2ae48345d90e31aef32ccd89e0494e8e5db610f6ae80627c23f60e50662e375fd0a6177cf6f9637493f3423324985ad391a80f7d903c243925c69
-EBUILD apr-util-1.5.4.ebuild 3238 BLAKE2B 17fb78415e2e1ee0f46308edcfb09b9429dcc9d91746cc929119d2d675301364b93bcf40c08c2464a45522606f5110f8790c4100271b8f9066a20ec15becc08b SHA512 c018c7088ffac68d91aa0c8e8089dd7a0dd9219b21cbd95db63c8a9980067e1f841a64bb4a1de6fbd3438b4a95edaca838284b85c20095e138fc92f6fbd9d664
-EBUILD apr-util-1.6.1.ebuild 3613 BLAKE2B ce9b8afe1bbc703fbc98b38a09c7de33fa9d03386ce201214a87898c9968340cf73dcefd1ad78a69b6e5954c6ef113e4543edbe3e0075b4092832d16083c0270 SHA512 2b8acdc0e1773cefb930e1ab785224505d6a553d6f271a906d97e85cb948d737f3ad48fb81d4177ebbbe787c6577f4c7b345ee8a472d2856956382803182b447
+EBUILD apr-util-1.5.4-r3.ebuild 3695 BLAKE2B a632159ffc439439c3fffb985b2707ca46067ecc78ab089e0046a5605dcd82d4c7422aaef96e2bd8daa0424d9b1591ea00610fc5d10862c1dac92c4eb079c962 SHA512 a413717449f06e966fecd096805eaf9e3026785e3d253a4a077557a529e7abda1718fea8cc521a415d0cd882e0d8abd0944eaff0efd9fcc377df1c808507ede1
+EBUILD apr-util-1.5.4.ebuild 3226 BLAKE2B af898360f8c4bf407d32c728b947e81caa11fad30ed3c7ee78e8c376a53b404708bd2f9b66b21d206e4628ff697aa2302ae51e56c5b591995aeafee9f4cf1316 SHA512 0240c037252088a9c1317b4092384730b041ff024e456a2f7c86860545447510be4614e97bf9845d4ef93a251aed346f4700159310611af08f67b74248bf45e6
+EBUILD apr-util-1.6.1.ebuild 3601 BLAKE2B 70f28f2871d3aa96bdd18cd22fe3c43ed04922665031120da6be8031503f186893e66f5778090a9d96256d7b265bd9e9a17600cc19e895002b0edc95d4ad311c SHA512 c31ce9e3affbccb2390d7b8d8e0b74bab8bb9972a7e71c6cd1deb2fd12400b9a762ea39ae17bc0c761035c02ca04cb2115d51524ed965a0ba5a52e865a529ef5
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
index 0902526be9a9..904bb0f90807 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
index f9d3cc97354a..4cfbc7403195 100644
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~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="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild b/dev-libs/apr-util/apr-util-1.6.1.ebuild
index 97a0e1ac54cb..d7e67e82423a 100644
--- a/dev-libs/apr-util/apr-util-1.6.1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 2e539178dd3a..818a1706c2ce 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -6,7 +6,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446 SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
-EBUILD apr-1.5.2.ebuild 4100 BLAKE2B 3bd0df4fd0f9a2090a01283d2fabdcd06b9fcfc6e25f681b05dd9d447b4c6d4bdffb08b3d7a34bdf807060b6c9a515bf512378289f164db91db37323d30849ec SHA512 c57fe4d819a172fa9a528d75eabfbd1ce129d71cec30f79c8870f3e9dbc5a08772de5a91af9497cf8b33492439196b36b5f3b3b9dcd4a347d8a1380b5e5a5192
-EBUILD apr-1.6.2.ebuild 4091 BLAKE2B 9c12ed01c4c85191fa40954a5cb4670a79375e7d76d815f588d97d5e3df58b3aa4dc9672c3fbef3ce3711ccebc9b0b03ad300531c31e5e4c729237fcc5235f76 SHA512 7e16c2e12137ad6fd8b88e84a3c6c364aaa4396b53b1c9905fcc6eb7a1713e90fc9006d900235742d003ea59708f278720ed3487ddebdc2fb2d2b59ea502e1be
-EBUILD apr-1.6.3.ebuild 4091 BLAKE2B 9c12ed01c4c85191fa40954a5cb4670a79375e7d76d815f588d97d5e3df58b3aa4dc9672c3fbef3ce3711ccebc9b0b03ad300531c31e5e4c729237fcc5235f76 SHA512 7e16c2e12137ad6fd8b88e84a3c6c364aaa4396b53b1c9905fcc6eb7a1713e90fc9006d900235742d003ea59708f278720ed3487ddebdc2fb2d2b59ea502e1be
+EBUILD apr-1.5.2.ebuild 4088 BLAKE2B 42d181fe7480bffff9577aff115731ac62e70513ee49fe459db6d82ac62431ac2323c698d139285449defe377c7fd90c586342773fb05722003cd4075807f165 SHA512 1675f275f3c37a3141f73434ec17ba6841f153c6a12edc20997f9cf5da462126cdc77d5ff7a625b0a3c9ef8e08480163c6b004ccd374d8e96f6a2a19df1fc775
+EBUILD apr-1.6.2.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
+EBUILD apr-1.6.3.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 5be730d5fb71..2c9101846cca 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
index cc08f2934308..0c823dc89014 100644
--- a/dev-libs/apr/apr-1.6.2.ebuild
+++ b/dev-libs/apr/apr-1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
index cc08f2934308..0c823dc89014 100644
--- a/dev-libs/apr/apr-1.6.3.ebuild
+++ b/dev-libs/apr/apr-1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest
new file mode 100644
index 000000000000..882316d71b9e
--- /dev/null
+++ b/dev-libs/atcore/Manifest
@@ -0,0 +1,3 @@
+DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
+EBUILD atcore-1.0.0.ebuild 1094 BLAKE2B 00f588e7cc4871159776d18261bf267c62ceae46c06ef13f2cf5ac77d9a5d4a643270989c1f5c698670809fd5269ee7fe3c09a017cc52535167102cb66d89ef5 SHA512 d7d99f65c15c9ebbe4973ad4d240255e79aa1c3851552d499cf99b38bf0fc1aa18d2e46ae866a47ae7979265f4146605f5b1d601d7a7e050cccef711e19965cc
+MISC metadata.xml 305 BLAKE2B 75067008e2b19ae5f79db1eaac07e5e01b9f0139d8e18c1b31edc0298bc2ce688f8115c6ae0a8d5a9a1d496338a57837fcfc60c2e97e75e370c1e195715bcdec SHA512 f266cc30e4f6a4cbc4e61c44a83450b714dc88a9873de30957d0ba34b5b923757676f581e49251f6ea06841d85095e9695b4938ba9174cd0dad937dbcef16e19
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
new file mode 100644
index 000000000000..bf0f54ae861b
--- /dev/null
+++ b/dev-libs/atcore/atcore-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kde5-functions
+
+DESCRIPTION="API to manage the serial connection between the computer and 3D Printers"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+HOMEPAGE="https://atelier.kde.org/"
+
+LICENSE="|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc gui test"
+
+RDEPEND="
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtserialport)
+	gui? (
+		$(add_qt_dep qtcharts)
+		$(add_qt_dep qtgui)
+		$(add_qt_dep qtwidgets)
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep linguist-tools)
+	doc? ( app-doc/doxygen[dot] )
+	test? ( $(add_qt_dep qttest) )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die
+
+	use gui || punt_bogus_dep Qt5 Charts
+	if ! use test; then
+		cmake_comment_add_subdirectory unittests
+		punt_bogus_dep Qt5 Test
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_TEST_GUI=$(usex gui)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/atcore/metadata.xml b/dev-libs/atcore/metadata.xml
new file mode 100644
index 000000000000..8ded8878afc4
--- /dev/null
+++ b/dev-libs/atcore/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="gui">Build test GUI</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 4cd17e9fadde..b8866bf660a1 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
-EBUILD check-0.10.0-r1.ebuild 1797 BLAKE2B c9b32128d72949401929cbc304025f3aeeb6ddcca7c5674f757dc53c5c90c99cf0729976db4df4c64341ee8b71d4511298e648897c761dd6bc3c9ada0bdb2adb SHA512 b178160a81d6df74c7ef10f8d4658c6e12759a2b7b416d7c7e724d83a83212b67dfebcf41b15942dc7dc6f1e5b6270463b2088825a84c6c945b8c535151f1881
-EBUILD check-0.12.0.ebuild 1689 BLAKE2B 6646676ea73259dc48f183abebf75265605c251f859a6a2d5140f43176e70d06593cbf9131e7d7d3f628cb6a458e84491d73369976a52083d4741e24196fb3b4 SHA512 fa218ab9cd4958c00dae5755a56ab12e4d285461427bd684880a7e047cfda247fb5cf2ee8916d6b8d760fab105bfd52089605ca9f42c236a5674253ed7f321a7
+EBUILD check-0.10.0-r1.ebuild 1814 BLAKE2B e28733e0697de60412d040c06c6b3e6ceb649d4221774859dbe328ded67215980b3de770b705e098f3ee529c0c2bcc5bc5bcf937ca0de6d1726038ea5eefe0a9 SHA512 4c90aa710e4c5605b76ccd4f5ffb6048225fee346d6e9b7097fb5c20fe098dc214feae702381b2bb3a2d1b92c87601950c4f8a3bd43ef851ff5cba7d66e304c0
+EBUILD check-0.12.0.ebuild 1706 BLAKE2B 72d9518956b23df84abf16fb72c86e7bd6015005ef60f859c76ea7f7e5d767c8cc6c44e823ef31ca1457b4523334e04863abc2915864366e51263806d65872fc SHA512 c940bdecfc5a9aaa01d70136929b790205af4959af8ad92c4b17c7151f8e51715e24267dda58b011b7aefc658c6f90ad027ac10d3510202419a00191813f63a1
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index 35f15fde8006..58b13fb046bb 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.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
@@ -13,11 +13,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE="static-libs subunit"
 
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
+
+DEPEND="
+	${RDEPEND}
 	sys-apps/texinfo
 	virtual/pkgconfig"
 
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index b959e47a7fad..61fb128be13b 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.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,11 +11,14 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE="static-libs subunit"
 
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
+
+DEPEND="
+	${RDEPEND}
 	sys-apps/texinfo
 	virtual/pkgconfig"
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 1288199ddb4c..8af575fc928e 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.1.tar.xz 470260 BLAKE2B 5327f7e71379b50620a6c44f1a9f88a0833d4b648874129a1d4eae6ec97a9ca748e80e902b74ba4c7669e2fda0d0bcd603ff95b5f096ca77b3ec7fe67263f0c6 SHA512 738bacf6a3abb9c64666fec103eb18c8456b994e7ba3562bdb090ef4eb33f0330da844de14d658ef44e74f90104f67ceaf408d21ddf0d251f4c6ddd80e0b387c
-EBUILD confuse-3.0.ebuild 1159 BLAKE2B 75361c8901241e31d61a0fbfc0cf87337ed2e799d3a3f545e3fd92f3f4df8c82c90f66c7082d230d10ac43298d0b1b90089ebf14e174516eff6c8419b8382172 SHA512 909e03efaaeff4009f95a772087368d2775fe89077ecefe9fe927b9668b79ab0b09e1f0e92463af7e1e01b7cbed465412f39b2df6bb4dda34626eb338e6f21f8
-EBUILD confuse-3.2.1.ebuild 1150 BLAKE2B be1ce837163361a2a9fad127115d40f2a7587931f7cc23bae1453922e627bf45f112279ea7cd0a7677476c5e40bcb016132438f0498192bc0076009fefeeaa34 SHA512 440f7f52d321bec8b64a2adaaa30a6aef5be4fd83e6ede2bded998ab4ca5216fa29d9de31c6a3c7fd650cce66bb530770952a772cb3bd6b5a556f151b12bf0ce
+EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
+EBUILD confuse-3.2.1.ebuild 1138 BLAKE2B f1adc2966681c85ba997ea7d05ac34204fa22b0a6df5e23a59558fcb22f6ae7ced3aa668a3512642208add199ad449894648c8b14cb2f45e868139db56129950 SHA512 52c1aaa4f261dbaa2d9898cba7ab553dc3b4ebbfabaa6562931283775b51ba7b5a63ae6a62d0e0c0709952300005b784ab67646d80f44ef0fdde9c100ef938cf
 MISC metadata.xml 330 BLAKE2B 91be3657843f0a430fe8002a9496e3831c4f6d3d9ac0a04a549835403f01c216ecc95802e023695158ed60a0f194baac91cb75c0f856978aad97e31d2ef5eb12 SHA512 240e353d9f2dc60b40eab3def6e661a9a40e22bf9cdb3e3d0bdc351cc26f45a8104dd5ab487d0248087b6be702640bafc8851c6dddaa315a6260fb61858d790c
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
index 646fb29613d5..516a677978e3 100644
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.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/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/confuse/confuse-3.2.1.ebuild b/dev-libs/confuse/confuse-3.2.1.ebuild
index 958f49730e87..576798947c01 100644
--- a/dev-libs/confuse/confuse-3.2.1.ebuild
+++ b/dev-libs/confuse/confuse-3.2.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="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/2.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 47a24e4da9dd..29cf0fda87d7 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7761 BLAKE2B 3c9c6633942dbe670ae0146478e2e29bf6bf53edcd42d17db0cc49e6556af67217a82f20b3007c5e090559021050be5f1192f0d2966e188120cd18110b56bca9 SHA512 4c04c188ff2eb00f700a195776be6a142b1408d74cebb111ba628f7aafd11a848b8a172d32b20ec2eb719842c490a2ecbbf018a9c8bc70f602750fd609b60818
-EBUILD cyrus-sasl-2.1.26-r11.ebuild 8408 BLAKE2B 8fb3ebbd5c05e5e4dfcbf14dc9b6f958b03eda0ff49cbbef02afc5659937ea8f1a0838578c2421c9eb360917f4d786246c09a9fd74099fca17612ff3ca013eb2 SHA512 9f7c2ae0eff769bba534555ff3bc742be548fcf0738e76178d3071107a08f5d3c05df4302b0417ba4ffb5e477248187265408a0d4704d6ab7260ecef774f9b59
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7667 BLAKE2B 525ba84b9dfcbc06ed5986597a0cce28b2a77e8742edd6fe3a3ecac0a77b180abd0e07c7e94fdf5639f206ea8caea259cbf1044bd2fe56e0d1358eb1b8653985 SHA512 4c794d4309adb644c81e9945b1f7f95d805c9ddb43f8abf369f7d2442ed88e479c37c49a17a1448e461759091ff0bd1d576691185c5835040c9ccc930df89d3d
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7749 BLAKE2B 160eb1322871153af3d6cad1439f978f08ed5d39f536b759c0744559c64736d44d517968e75c3b0d610b76604e1db977902b6f205ac5a014f6a02b40f1984bb7 SHA512 59e6cc85b7556fd361a3fc2b4c2b8694296a0550f1d5e1a02d69bc95fe95e2a713958145fddc77423b72a8693fe07290401dd4b68457964449e43e531f65b3ae
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8396 BLAKE2B 65825008f1e4716dd5ba1326368460d9140413cd49fe4686f897e81dd95f071146dacf337a68f0e6fb85378c7a8ef59a30dd9e905b08b0abd82bb30a7d3e1e93 SHA512 844c7b5dd20fb1784bbce69daeb8c795e6e13195afd944cf10a795457cf2d2b7482ad53b4e54d7a0cad19d9eef73ca12e855a263d0392a1da26b7474b27dba08
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7655 BLAKE2B 1a5e6fc14b7b983d78d91f2846cc38bef0ad6e37dbd2f5659a3a3f1fc8b321024454a6e0de6dd2f4e5a0fcdc9ca18eff9b7fedd663c15da08cb293ee571caa23 SHA512 8026e9e7b2d58892a4405b1965a7080cbef7eb95e4fd57642197a625dc27bc04b9c41f01145f89c0fb82e999cef49897596cacc52194f1ff27dbc02987b9e5d3
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 95c9d5337c8c..15bbac302ccd 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index 6b8bab4c1d94..4d0f5e31e81d 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.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
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
index 7b7f169635bf..e62db2b188e1 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index b73153aace98..418230c8aebd 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,9 +1,4 @@
-AUX 2.1-cmake-install.patch 556 BLAKE2B 55e74449f1c5eb1e124104b9b65e43af87d114140101c8868a9b07e6e73630cf8cd33152a6bcfc2f6464bd7784e328d85a36f89386683822fc14f88d8814b09a SHA512 79909d2f50143082e3b04d63ea51364f9f5edea5802087f07d7857d0756bf04328d4d827d6d9cf228319cf48b3dcb2d0166b36598a3d1654a88323dbac895c76
-AUX 2.1.2-src-cmakelists.patch 657 BLAKE2B fc1ab65adc1360163532106d5eb3b903c85aaf55cb28f3c82adbe06629b76f03a763d25f53a848f4d9c1cb5896f0ab9d39f282abf85efd956a6dabbb0f2d6653 SHA512 d9f67fc26df12532a5c636d24f1373addb853fa51b45f734a3803f1fc19a3d1d88cdf2b501bb38c2dedf03f256b158cc31c8ada72559eae584348c6afee1d8f3
-DIST deviceatlas-enterprise-c-2.1.2_1.tgz 184432 SHA256 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372 SHA512 4ff269c55e74688dc1c954a1d9b0fc28aa135eccd20089f4da390522644bd1c08e2bc38e4ad15a64308a0e91b007a820dcdc3998c262fa5a7cfe1038e9f0e969 WHIRLPOOL 73c1c7eec0daed7632e8a5a7ceda956ec91cc603fe45df2fdbf2b54ecc950bd72ff59fdd85ff6a0ee70d54b2099ecc3219ef55f4aecb308f254851f93fe57738
-DIST deviceatlas-enterprise-c-2.1.2_2.tgz 184368 SHA256 feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce SHA512 46c021b3430c6900f9172c13cdeb26931634345485c2fe0fe7b6911f7c6f6bee46ab3551e4fe11ef5b5caabe66c786c72b51db6875aa9d44aab673056b9debee WHIRLPOOL d85161010cf195eab5ef9c4e83404ad08cc10d607ace5bc6424ffb170ca09a26d5410534279eab1d721615db943f3a447ff908f62f76311ec80c3d95abbb49d4
-DIST deviceatlas-enterprise-c-2.1.zip 504286 SHA256 a02fc29486d245b1c8d946c663b71ba981e88fee8d037f5bc1bf255deb287974 SHA512 99a8e89f3d1c084a93b184685108ea65d1fd925e0c8b52599a42dbe70af3126103da0a9fd284b14ddf59b996204334d360a12651025413bc4d7f76054779275b WHIRLPOOL 939733a58f352cbeee852ccfea3f2f022310ceb7363a15889d9a6366532102ee700271b6008e0a57ae4d86cafe6354409f9520105e46eaabb5c41f1a7827f1b4
-EBUILD device-atlas-api-c-2.1.2_p1.ebuild 1071 BLAKE2B 0a26f7000c7908d2a84dcdb79fc6b325afd2dcdc157fb9a324d12a212a3e679cf016ec23f5ebbe48453f46929b06a554234bb7ea91156de0a64dda095d39bcd9 SHA512 45764ebfe8274a94c08bdcf277caf7b8247c0507492dd193f32491f21a23a0caafb5a0944d97feaa2e5501d100ae64163893ed4347780becebb782e14b08cfdc
-EBUILD device-atlas-api-c-2.1.2_p2.ebuild 1072 BLAKE2B 036b7caf5464ebcf7ef804cffec91727b95030181042b02ddcbbb66f9d93c5f7778ef3873cc92d93e40cac36d784ec9973a021b1cf12da2e7b3689a98537a9d7 SHA512 201fff3cfffa7c1491b29f86f46a9cbb06de65f01f1241e8474cab7e063311fe41346b8263ea1d03a4d7a2ececbbb677f4d129fcd3ca4836f3450de56581a2be
-EBUILD device-atlas-api-c-2.1.ebuild 1087 BLAKE2B 27e407431fe33bf5171ddf1b5ef77dc00608634c7621da9d74e425afc3802d1b2f62952d736a0235d80eab50e42fcac55532498fa7cb90bd10890900b333375a SHA512 be97dbacbf2fcffd7338c12e3355aa28e0ac2c1d58bc26a6ccd7cc5189c12d337081cb0957f695c2c376928eaf0b6940a3ae3e804825ec5f599139dbaf585f69
+AUX 2.1.3-src-cmakelists.patch 629 BLAKE2B f3bb4160bbbe58a92e33216f11b52f25b3fc80d58efd11830575b819a41165df51f3c7e8c1a4c431157296d34f179c95c596b2d37b22b5211ff3e7e05989e671 SHA512 08b5f1156341b91911adbba7d527f11f385642a8afcd0ad0e833f83e6c799dd85bb6195dddf9cde13672ec9f52b5b7094f57a09c85866c3c42e627495b45e9bb
+DIST deviceatlas-enterprise-c-2.1.3.tgz 183663 BLAKE2B e190aa8e9a4b9bc90af76e21eb425c0f040ef70e605c8f9e588bd0c859520a82807aaafddd24402d3365e94bcf3b7a875a65804f2b1b3bed6f0703f28a841440 SHA512 364811d42b2c0d937a12f2bbfee760701a1dee4e93bcc84423c8b236d59257a3440111ffc6072a7822b9694ea65986572550f67d0b1e5d68a784d1339b2b70aa
+EBUILD device-atlas-api-c-2.1.3.ebuild 1054 BLAKE2B 77f2191b854b8364939e6a41e18802d8f7df0d51102d90bf2504e10e3e47d11eecc6f3f2bb3a32f205baa0065bd5c7d68990164233177e139d7b98b7d6cd9ebc SHA512 d0f153771e46878c47ea4887799f703d3d9cbcc6fb2fc5ce96f31ded933ba9982f6de4e7ef881377f5e72cf652b2b8ebdd2b85360ceb7d8772e4c178def2f560
 MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild
deleted file mode 100644
index bc28a136dd90..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-src-cmakelists.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.zip"
-}
-
-multilib_src_install_all() {
-	if use doc ; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p2.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p2.ebuild
deleted file mode 100644
index 2923dead8a25..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-src-cmakelists.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.tgz"
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
new file mode 100644
index 000000000000..4679d064f462
--- /dev/null
+++ b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
+
+DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
+HOMEPAGE="https://deviceatlas.com"
+SRC_URI="${MY_P}.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
+DEPEND="
+	${RDEPEND}"
+
+RESTRICT="fetch mirror bindist"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-src-cmakelists.patch"
+)
+
+pkg_nofetch() {
+	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
+	eerror "And download DeviceAtlas C API"
+	eerror "Then place the file in ${DISTDIR}/${MY_P}.tgz"
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local -a HTML_DOCS=( Documentation )
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc Examples/daexutil.h
+		dodoc Examples/example{0,1,2,3,4}.c
+		dodoc Examples/util.c
+		dodoc Examples/EXAMPLES.USAGE
+	fi
+
+	einstalldocs
+}
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild
deleted file mode 100644
index c08e69401d96..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit unpacker cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-cmake-install.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.zip"
-}
-
-multilib_src_install_all() {
-	if use doc ; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch b/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch
deleted file mode 100644
index 9f518629e5a1..000000000000
--- a/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./CMakeLists.txt	2016-11-08 22:54:33.351677837 +0000
-+++ ./CMakeLists.txt	2016-11-08 23:04:26.737184360 +0000
-@@ -16,6 +16,7 @@
-     set(MODEL 64)
- endif()
-
-+include(GNUInstallDirs)
- message(STATUS "${CMAKE_BUILD_TYPE} version")
-
- include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -31,6 +32,9 @@
-
- add_subdirectory(examples)
-
-+install(TARGETS da DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES dac.h dac_json.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+
- if (EXISTS "${PROJECT_SOURCE_DIR}/tests")
-     subdirs(tests)
- endif()
diff --git a/dev-libs/device-atlas-api-c/files/2.1.2-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.2-src-cmakelists.patch
deleted file mode 100644
index b81768aba648..000000000000
--- a/dev-libs/device-atlas-api-c/files/2.1.2-src-cmakelists.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Src/CMakeLists.txt.orig	2017-05-20 22:56:14.138401705 +0100
-+++ b/Src/CMakeLists.txt	2017-05-20 22:58:11.376354697 +0100
-@@ -18,6 +18,7 @@
-     set(MODEL 64)
- endif()
- 
-+include(GNUInstallDirs)
- message(STATUS "${CMAKE_BUILD_TYPE} version")
- 
- include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -37,5 +38,5 @@
- set (CMAKE_SHARED_LINKER_FLAGS -m32)
- endif()
-  
--install(FILES libda.so libda.so.${API_VERSION} DESTINATION /usr/local/lib)
--install(FILES dac.h dac_json.h DESTINATION /usr/local/include)
-+install(TARGETS da DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES dac.h dac_json.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
new file mode 100644
index 000000000000..6d1f9ff5586b
--- /dev/null
+++ b/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
@@ -0,0 +1,18 @@
+--- a/Src/CMakeLists.txt
++++ b/Src/CMakeLists.txt
+@@ -18,6 +18,7 @@ if (NOT MODEL)
+     set(MODEL 64)
+ endif()
+ 
++include(GNUInstallDirs)
+ message(STATUS "${CMAKE_BUILD_TYPE} version")
+ 
+ include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -37,5 +38,5 @@ set (CMAKE_EXE_LINKER_FLAGS -m32)
+ set (CMAKE_SHARED_LINKER_FLAGS -m32)
+ endif()
+  
+-install(FILES libda.so libda.so.${API_VERSION} DESTINATION /usr/local/lib)
+-install(FILES dac.h dac_json.h DESTINATION /usr/local/include)
++install(TARGETS da DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES dac.h dac_json.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index e1a6dbe65cc8..ee2186977d2b 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -4,7 +4,7 @@ AUX expat-2.2.1-posix-shell.patch 1039 BLAKE2B 7f3eefc1a81def006063e4ddc299638a4
 DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
 DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
-EBUILD expat-2.2.1.ebuild 2358 BLAKE2B ac9a4ce125ec0509dfce91d24fa29c377d2a0ed72a33c6ab92adaacb5fd9a95abf08e77a9b1a139d2ede4d82050b6076ad0ca3fab8080ec752aeba2483264ad6 SHA512 9a11bb9de0a53bdb4ceed3331814f0b0490ce5db950c75a3a3b80584ba74b46cc2b5e411cd90c53d74e4d78da5bbc74c3c5d9c06aeb7033bb0932c52ee6eeb95
-EBUILD expat-2.2.4.ebuild 2550 BLAKE2B 938595d83eb39f238a05defcefab9c70a13d58d0466d52b9abb5737303581de84b584242cd7064a1bd87233728044cbbf1b99803642eb5e75aa6a61339f05f74 SHA512 4cf005511f819146e0276b9f0df9b6c7d3261d38010a369c4b56b005c02115dff894d6c86ff2fb2e66bb1c4cbefed40e6ab862f5f17c3c0a60e5b6ed30735d4d
-EBUILD expat-2.2.5.ebuild 2611 BLAKE2B 982e4cf33da922605301179de94c978b8707a61c3aa61c0ea0f086c4c3629b3251718dd57ffc3ea8c585d311b4cef1b0996d5493bc715b16fbd204baaab01685 SHA512 5524026bd14a0ce2c971353f788b268e335de2a1a76ebacfaa4ae049753cf9824e9a292ed4f192eb2a7e47b0c06e23746307de7c96d2cc2a73bdef4c63beec16
+EBUILD expat-2.2.1.ebuild 2346 BLAKE2B 7a343c52553b838d76536142f7e67b78b02668c3a2efca8515f63ed6e9df5ce6f748228be4c6a3145487bbb2f7574df84bd3e374881169bdeba734a54e1c6195 SHA512 535d45f523a083cf3c3099ae912d3508a301a098239473add3ea6834e08fe386098346db810672038f361bab63b62bbc310a0710b9946546c154bc4dcd683be1
+EBUILD expat-2.2.4.ebuild 2538 BLAKE2B 9a758011bc642c6ef1c51661b0fe5289509e6e65fa19bbe337bf0758c6f00fc3b35191330477a4b2d69b828298cb796b754cb2c2a66729a902390b018a7933b5 SHA512 d5a54082586a67a06de13d5693ee1e2b9c604df4e021f9bb4fb936e6a413d6583f7ec16f1f9b4086cffbe29260e3acf968d376020ddbeb5a0a632312dfb7cb54
+EBUILD expat-2.2.5.ebuild 2599 BLAKE2B 8489521884ce616c2651c071c02c379a469bb65ef70f607026e62a4bbf6f6fd22be19dbe9ab1e8ab20c871becfa6a55837fd1250c3d1671a101b75174be5711b SHA512 b9417d95b2388b88ea42c91c4ddd34a016c59a736b9cd4d52d4eb1b82523d3c7b9067f120e521775df98ecb1c93267eb12732f90f05bc90dff01d8f5979d33cd
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild
index 8048d1b573f6..ac705fc827fa 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="elibc_FreeBSD examples static-libs unicode"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild
index 54b4485b3fc8..36b9284d2a6b 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.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 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index 73227b617ce5..89481cd1dad5 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index efd03883985e..05ea552ff3c3 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,6 +3,6 @@ AUX glib-2.50.3-fix-gdatetime-tests.patch 2052 BLAKE2B 198e6215f6466065ee171e0a7
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.50.3-r1.ebuild 9657 BLAKE2B 06c6a853452de29191c26a1c829b85226035baff514402fc343d31ef348a7c8677dc3cb74ce118cc7ab4457918b4f238e2ba4776c500a8165d7bf65bbc12cea6 SHA512 9e53494a817602c1c23117b9dbbd9365436540b331a258a705414699434b168635f14ad8d9eb08144f7989c72789593d55958c430adaaa8a384c36e02bc812ee
-EBUILD glib-2.52.3.ebuild 9568 BLAKE2B 290e2468e490ff74968d6ca1c6c08c95bfd7d43a0e580c395b93bb6358a44c903a5184e79d3668c893d7784d577bdb4f857ab4b0c918dc4f75005b67c291a0d6 SHA512 2cf7b01f33ddcbdd4894c5cdc0ec63ab2180027fcccfb4681b9c49f18da2eab4bac5dd456df423e433ff18d6af47cb80dde2d475160f28632d55dc46fddcd2de
+EBUILD glib-2.50.3-r1.ebuild 9645 BLAKE2B 14c0111687ec100a63f69ccca1f3e09da4e5bdd19ecf28382dd754cb199bf71cb798858b14f21e1ecbbd720a8682de42df0903f1feab3ba920bff76d40ae8137 SHA512 867357f01c61921249afe92cbf868f457fcf5e29fcf6e7667ad7390dc9456a5d558d5fab46acc0bcf66c7d13d4a0895ac127eb37068ab32011b4b1048703ac3b
+EBUILD glib-2.52.3.ebuild 9556 BLAKE2B 1ffea920d71e5bcd5047eeffc1ef611774befce3832864a3a0d0b19e544e1dd6e2a83383e7fa7ac5a33fc7d74abd9cfe9d26066c935518454c5f60d10825ed74 SHA512 a3c54c848b5e2fac4737ae00fc0c57a5bf2bf5aa56ed1d9ab906a639fdfa84ccc43724e0fedeae291671e720cc92b6ab1dba46d3d4a3c734aa409939edb83005
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.50.3-r1.ebuild b/dev-libs/glib/glib-2.50.3-r1.ebuild
index 2d5918587b74..b7ab8d4b96b9 100644
--- a/dev-libs/glib/glib-2.50.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.50.3-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
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index 3d9ca8f31d5d..02b2415fb4d4 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 5be5fc2d9651..d63e38afb108 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -15,9 +15,9 @@ DIST gmp-man-6.0.0a.pdf 1187496 BLAKE2B 6d10b139cc9d54a5c5a3264393623dc0d8efa561
 DIST gmp-man-6.1.0.pdf 825716 BLAKE2B aec5a26abaae4451aad621ee8594f67caf705e6fd730b225ee25dbdd7f4f9fb2447f9234c8763b6f8b2cbd9522b9e1bd6c0c486cf6209bd119884d39178863c1 SHA512 cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0
 DIST gmp-man-6.1.1.pdf 825669 BLAKE2B c33e5c77069a39f96d1fb27885adf4851ef4bff806f9709f9cc75161d0c00bfe0cda907471e908e9db76ab4c3d5fdcf42e42ef6da93b906d57ab469eecfd5cb3 SHA512 18e6aca87f5ff8848f82456d86233f127328bfbe309e67902c8dd6f25228db344bd3e6cc3a55e48f2c3f19d0a57358bc4ada7cd623799b273030a5119fb1257b
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
-EBUILD gmp-4.3.2-r1.ebuild 1709 BLAKE2B bb324827b9adfae3ee2487c750f6c719c4c17fbf65857b2a8cf947fb6cbb06db192cba622d8e1ac76ec99684dbebf1e184f89fbc4a6c86bc6c5317321a651378 SHA512 40364ab78077f0465fb261d84cad48d82ec88c632c8443aa53950862fa6aba0414202557745bbc49d4595db442704ac5f0879a42feeefd20ff7d9d20fc689a48
-EBUILD gmp-6.0.0a.ebuild 2898 BLAKE2B 686c7a179e4c99ad6d16102fe099f0cbe5e9b0eb332e78f2bab0af3bd2655b54164b923ecb2ef3b29271b2ee40906549226f56a0d8ad1478561a959e2a011e41 SHA512 ed70ec49d63d4f8ac3af1d36c197eaa5022e368018dc1516d771a94e0248d81192e49bdf4f78c80f1571683b8a00b4be63c4cbb76f883e8aebac7f2d8bcc766f
-EBUILD gmp-6.1.0.ebuild 3024 BLAKE2B 620c9736cff9449cb6c5797403c87ada6050958d7a87402569189c5d8a3b68704083c782634117d7612ecb603eb7c4845f3c2524f9df12f5c6fc801b6dfa5f1a SHA512 6b2aee7149e8fb461d9477f13a7377f14130c63bd28205f05862926aaa8925b6b229fcdd4a1de83c48b09f4b54fb2afd760503e990aab4e217bd3b745b6d7943
-EBUILD gmp-6.1.1.ebuild 3037 BLAKE2B 8cfc4baa641684d7924f28f63eb59d44e5b01e0fb554fde4712209a7edbc512dae2c87bc5deccc0f2a899b39ffb91f70f2b8058a362320ee234426a0bf3ff79c SHA512 6b5dc4ef6ca38c816274f104ce6a55e5bb938ab396ca9b98ce7d3263e51f78cad321a81ca7af166b0284c94d77c0b588ff75cad0f1e9a6d5069ded4971dd57e5
-EBUILD gmp-6.1.2.ebuild 3289 BLAKE2B ae46e1e5667b78a2dba22da77d7142e1c83d84bd6a90ce3c0c1223a146537574c59abc0a3ed70d0b0c07b98c146db174da72eb1250583e6bb9248b2cc3b80e40 SHA512 4ad67c318ec5bb9180cb96ec52a28346a7e4518c62bfe03812a06308de01c4d3ef92021f4691dc9bd592748d1bcefac38f09e7d436227b92e00b21f73b3abd1b
+EBUILD gmp-4.3.2-r1.ebuild 1697 BLAKE2B 2485e688b5d75b96c5cc97e819b8aea9297c217d746ea14ad62120f0d928e7120207c100a20c18f0bba0d971cac7ddee58c70f13e9afa2ca051d132c50907ca0 SHA512 353025a9406d061eb5e8c54b037e4dc34d8d5639502b573f3d7434cb4994c1eaf8497110e7dae7245f8cfba880eae86ea2803a038f84026c15724df13135a931
+EBUILD gmp-6.0.0a.ebuild 2886 BLAKE2B 7ec35c00eea809640936ba484b676330c812f2b9a34f5d868c84e1403db20d76d1f914af2fde7e4815fd096bc9a1a9bf75c4f8ac9af720f918ba0ec0acfb5fde SHA512 d177ddccd7e211779a30b1020f5358137314beb44e0712750e8ac1f690adef02007627cc7ae744340b79c9939bbf134f30c582bd00329106f1c6c926ba2b3127
+EBUILD gmp-6.1.0.ebuild 3012 BLAKE2B ced6929c84e0718d3f46fe434d372f0e1ef929a11fd2bc3e219378809d96d6ae4d8f9cca1e542be516c127d652a7741604f84578eee6cbfbc84104ce592dff73 SHA512 4d74dfbd2a3ec15ea87644bc142ed472ed1b9ae60c382cbec9a1a1f06de742cc5a492d775fbfcb720eb0f28301b195c631db99decb83b5f05fd1bccdb2818b97
+EBUILD gmp-6.1.1.ebuild 3025 BLAKE2B fd8b00e769787bd092e34f21a4c06c9f52c26d2acd2ceb1e7622514371337e70a088cd8578e78d0f86c70a602b52a01cff9b963b881df9461f198e6dfbbf9113 SHA512 8a042992fa08f825b9c8b715677ba1a55e1be2aaced085b3776fd82eb8a97097eb8ca389f3b184c245ed2b6c28d1df63d235bd2feee72cc36277c753fe4454e6
+EBUILD gmp-6.1.2.ebuild 3277 BLAKE2B a05108385e65f57492ee257c77db16dbd43bc53f87d7d311c8e285d1c991ef3f665b69cfba8631d90dbf56f852586f73cfa2ef6ec31c905d505c0f64957fe4e8 SHA512 8ecc349abc523fb6914160c7ffae905b14605f130942fa7092acf3bef170f7d09b38fa8c16e1cb47b27ef1bca0e16fcde413609e56a329ed70c7b415ac1b6ad1
 MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
diff --git a/dev-libs/gmp/gmp-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index cc456682bf9e..deeb2652409f 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.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
 
 # this ebuild is only for the libgmp.so.3 ABI SONAME
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index fc249da86609..6bbf335105ef 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.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="mirror://gnu/${PN}/${MY_P}.tar.xz
 
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
index 264cb648b1d3..5f06f13d2e9c 100644
--- a/dev-libs/gmp/gmp-6.1.0.ebuild
+++ b/dev-libs/gmp/gmp-6.1.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"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.1.1.ebuild b/dev-libs/gmp/gmp-6.1.1.ebuild
index f84f858f4425..d2e8cc6dc926 100644
--- a/dev-libs/gmp/gmp-6.1.1.ebuild
+++ b/dev-libs/gmp/gmp-6.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="5"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 1b8a6200d992..bdee22559239 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index c3a4d074435c..972285b496b6 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,9 +3,9 @@ DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37
 DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
 DIST leatherman-1.2.2.tar.gz 434088 BLAKE2B 40ba4903f7bf0b9e07237291364b664ca84c74d8289a9065cd86833fd30e7f8309b1ef4d36514b5c2abfff45b287ca8d3eb60bae5ecb7e1579ca4d60eb866517 SHA512 1142a9be30efc8b1d52c9e38347dc39250c00c97c0cd7a299b63d6abb7140ec75c1fff0dc166b436ca6f4f82d7699869ea6988d807e8be8058a689841ac73b2a
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-EBUILD leatherman-0.10.1.ebuild 1007 BLAKE2B 664fced4a31f5c7f7bff0c0fb4556b3e8f598d0adc151c213e245796f5f44b1e481d9103c25f06cf9e27862e98ccf4aa4ffc9a861a271d3fccf290dbf9b1fd5e SHA512 4bcac58d0f9d5ba70e007596803b2b3529a72caab24cdfd0a7fab8135fc3753809d35eaf91eeb0c955fa203ce3e4b9af4c0732f0384444c26c46375303834df4
-EBUILD leatherman-1.2.1.ebuild 1094 BLAKE2B da357bf393c442aeafc56ccaa2c63cda632ae004168350f7137722303792cacdcc030be77984f96704408a06ec2dfc6829c5431adecaa92bb8e358676a12f3e9 SHA512 9919bb0911a0fb9c4dd2ed589e960f915d3ff91697561088fc166ca56fb9a17c3c10cc187b1d5180c378be39e607bb08551eb49607b336f22acf91e8a33f1800
-EBUILD leatherman-1.2.2.ebuild 1098 BLAKE2B d90bdc12f1743a83e9262de83c8fb9e73630d140015ecf22af1db383fa271ed828f3b8f31609d21d697790ae67fb0e751b8c4077ccf2e57617e32eba0191ba75 SHA512 5aced8fdeb84970c8997e786b6176344104fddae30adff7ba9c31e1c095da0a89a5a661dd017ed9bacf79fe5ac2b14db12f236fed034afff4e37edbb121a0dae
-EBUILD leatherman-1.3.0-r1.ebuild 1243 BLAKE2B b825493813af9b62f1392c1bf5a4825d69547fb35b86365a16f47394d4039c04c8ac0e0d8b41901445ebc0acd3f230058edd95789dc7d48c97a01470b8f149b5 SHA512 cbc019964195df0b9f53039690774e01d0f79ea8b65b4ec77b37bf265a37a1510092338f794cb1832bf44b13b7cbfb83b50c39a1c2de19fbfceca0822589f1b0
-EBUILD leatherman-1.3.0.ebuild 1093 BLAKE2B 6b7de817e1e1dab787581e6738229e6adf880271138d8c5db46d2642d510671a8a1ac7b4a1ecff6c6674768f8df922bf7525a5195522de2dcdde8542f21539f3 SHA512 aad78284994d816b46106f54b070e91dfbc595004612082678733e989335f4180ef7f32efc5a4325bdb0d1ab03cc6d5029e408ed28d0f460a8742f837ea541ce
+EBUILD leatherman-0.10.1.ebuild 982 BLAKE2B b466df4a82635b6b1721dcf8f041eae2f4136f6a8492211f7182aab7b25c11a3f8525d2cafe9498876dae19bc1c4174e327ceb63bc7a07981c3ad0a8054535bc SHA512 6269d0a42926f8e105a0c488cbb7221ca69ea67eb6212db5f73639bbedbf4ae3e5bb4b6f3acd9f440821eb6e7a9e226222b625585765715b18749885e97347c8
+EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
+EBUILD leatherman-1.2.2.ebuild 1073 BLAKE2B 6e46f69dec2e46fbf4ca43a94376d00650c368dfca841b65ab7de9561fd71a4534a84186651920db1acb289fbe637a959813f6773ba23d6deb32844bbbbaab9a SHA512 046b94798a40ae31b7b95dc49b1d1502c4b86b0b6057455c25fffa191db120c980557972e3d1c8479a25b9284aa686564bb287e039ba42027916c79e239b4f8a
+EBUILD leatherman-1.3.0-r1.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
+EBUILD leatherman-1.3.0.ebuild 1068 BLAKE2B b047ac3b7df905b283042f33d2a33424095d53f8b6b7b735c063347fef484e270f4551e1cd63e086e4f4c360283fbd48be6234641891ba515272e8c9613a5fe8 SHA512 6cc6184d37bf0ef95a170caf4c41c557e61306f3e5ca1be5802b9af26e2d4be76cf7743b9b0f99eff5eac58ea04ee702f085058ebe4061b30416977add9644d2
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-0.10.1.ebuild b/dev-libs/leatherman/leatherman-0.10.1.ebuild
index 0e0d397509cb..a195f2e99708 100644
--- a/dev-libs/leatherman/leatherman-0.10.1.ebuild
+++ b/dev-libs/leatherman/leatherman-0.10.1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
 
 inherit cmake-utils multilib
 
diff --git a/dev-libs/leatherman/leatherman-1.2.1.ebuild b/dev-libs/leatherman/leatherman-1.2.1.ebuild
index 3447ad21eb30..2b3ec0032cfd 100644
--- a/dev-libs/leatherman/leatherman-1.2.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.2.1.ebuild
@@ -1,8 +1,7 @@
-# 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="ruby21 ruby22"
 
 inherit cmake-utils multilib
 
diff --git a/dev-libs/leatherman/leatherman-1.2.2.ebuild b/dev-libs/leatherman/leatherman-1.2.2.ebuild
index 71062c83c1c4..c166cb33d18e 100644
--- a/dev-libs/leatherman/leatherman-1.2.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.2.2.ebuild
@@ -1,8 +1,7 @@
-# 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="ruby21 ruby22"
 
 inherit cmake-utils multilib
 
diff --git a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
index a38cf2698c5a..dd10169b1741 100644
--- a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
@@ -1,8 +1,7 @@
-# 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="ruby21 ruby22"
 
 inherit cmake-utils multilib
 
diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild
index aeb7a947daad..c1a8c29ae1c1 100644
--- a/dev-libs/leatherman/leatherman-1.3.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22"
 
 inherit cmake-utils multilib
 
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index ffacdaadc0e9..5c9fcd994b4f 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +1,5 @@
 DIST libburn-1.4.6.tar.gz 975088 BLAKE2B c4ece3700ab98b1e0d075a5f6d0f52c5b0653d177cd6074dd2d47c064569db17281cd43b468c8c563bf7d475e8586eb5c251a72e3a03e4d66855e0ffe9816095 SHA512 2bdbe832168ed430a66d8f733e9f28bf0c2fc8180673da383c4aa014448569614b9f0680d9f0ea5d61b2ed76bd8b9ecc38bd5a63788fc6b32ba0f4bdac2cee78
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
 EBUILD libburn-1.4.6.ebuild 975 BLAKE2B 5ab413d4a71e5d7ada1216b8d4c84968e872b3819e3ebb1ca4e6c1721b052cd624eb1ef16185b3dd9bed79563262187344afc31423427fbc75e5c28bdbcba2e0 SHA512 1615f45043102505df42f4d92fdd4a2b3aa0b88e3e0f94b022ee4441051171680c8cb38f0a8d802d3ef5f72b352f008c5a81160fb2c0a458e12fa55dc9a2fc9b
-EBUILD libburn-1.4.8-r1.ebuild 878 BLAKE2B 7426af82917e78e5d881caa0025f40b5fb212648aa922f28bff7e79761f4f352106d97e77754ca16b0cc044d6e1cc2ca0a6da3dfe0ba539e69c28760cfa71ba0 SHA512 33f68686388a53dbf1eef72bc4bb4e62d0870a7bad7e8f4bcf1d0fa10d699600d43cb58f4b783664a1902c468e8bc1ba72586d1ab2ec9c056563720a57dc7ce8
+EBUILD libburn-1.4.8-r1.ebuild 877 BLAKE2B 2dadba49cdc0664d4b0b684f8e4165724d7cc5e5f6a2cc002b33823723078c3be55a7f178740e3244675416635c0cf93f3f6148997fc92cf48a44bbc16485895 SHA512 85be1316d0f4d7a291b8eef085e17396ee2b94c5cfaec0b0b982865ad473f2d2cecfdd73ddb86dd4f734f77ddf2a887076ca14bb12e9cceb29f74eca1e956ba0
 MISC metadata.xml 616 BLAKE2B 65583cef1967a8a02a18738c01c8f69bde64a06681a6b849215f6e6d9360082483cf1cda154539f42e215da83dbc362e9869c99b2c6a414745a71defac82c77a SHA512 c46af3cbfbecbe5303a3a1c6f3c98e5c7a1dfc6aae2f6873360bd1704f58f1368592d9b5a4d8698059ef8954a7994fcd5902280d4a44cf390c7d5242fa112101
diff --git a/dev-libs/libburn/libburn-1.4.8-r1.ebuild b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
index dad5a0e49ace..48b875561534 100644
--- a/dev-libs/libburn/libburn-1.4.8-r1.ebuild
+++ b/dev-libs/libburn/libburn-1.4.8-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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs track-src-odirect"
 
 RDEPEND=""
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 6756128ed925..f46e6b535ec5 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,3 +1,3 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-EBUILD libbytesize-1.2-r1.ebuild 1118 BLAKE2B 63ae607fc633cb6d927e94d0d7eb40bef00ae5c7f4ee8bc9ea9d81bfea2a8ed54a3ce765378d390d4ff44275cdac5d545956852255094fb008747767e86ced69 SHA512 ea004e2d09518b02b3f1e451cbb750b011eac93ef56f1ed4f3256b5451a55902ad488396c8ed022613789e7ddf975aa570650dd9b2f204844ac4e8c2d40e8750
+EBUILD libbytesize-1.2-r1.ebuild 1115 BLAKE2B d53db77dd32110a833cc0ca81c150ab6b07cffba30de8b03ab4e35927a9765711e5f72d2a3c052fecb97b3fc308dfef005f94e6a790dc8e924c052904a9c959d SHA512 b8bd081b008c696825955ab9aeb55878c69a4c7e2e1a53de7924b48666f00f70622b0c32a3a14e754649cb7500798b865231f90306e632cb59c8593b29e37830
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index 2fb837e77696..b467900f3531 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rhinstaller/libbytesize"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 7eee21776c25..165e0e118faa 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -4,9 +4,9 @@ DIST libcdio-paranoia-10.2+0.90+1.tar.gz 634050 BLAKE2B 10a7f8b2a45e5605afa69611
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
 DIST libcdio-paranoia-10.2+0.94+1.tar.gz 703424 BLAKE2B 592ac7704f60e7701cff4edb7e4dc532cb35603ef47c159c84c6aa8bfa69bdc41e435ac566fd0483cee2a2fd1d03a31202382fc1ccaf179c9183f324d5605d80 SHA512 9b2381491271090bac08594cb1d84de98e9f0a5afc6a2c98e9ffcf4b95addc3adcd0f0b9adeb928dfbf8178356ad6a7ccfeb048685c823d138b2af232f0b4c93
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
-EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1714 BLAKE2B c521f3ebdc3bb37bf317be1e712c2f3542dcd2cb84a4d67c6277f051d0cdcc6c3a836b3a6fc59617c9106936a11756e81f84e18f7b48a06039aed4797aa76bdb SHA512 85e0f6b5a549c4abc16dc28d6e1bdc706b9022cbfd51f10356ab08ec7446bb97539de9ced1c1b94c7ac36d74d757bbee2b51afb4754facbd0d32c5715aca76a1
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1905 BLAKE2B ff8651fd71270ffe2d156a41a25d9cbb32c28a4f6eb76a7a51518e8930bd5b02ecb5d6dee00ce07f79975574a9f0900742551fb7227b69a8af54ed62a58ac0db SHA512 7ed831258b915d8917dc68542bec319eb1bd064bca672d703cc97405203837fe7da9e5dbed582e578840c46626fc84bc3b6ad70e747d09b2e3711da5075c8903
-EBUILD libcdio-paranoia-0.93_p1.ebuild 1897 BLAKE2B 626dd3f865e9ac813aa85379b392d0cc910f25a21c17dabcb4310840c1bbba037f0886d1af7886579e67b8fb34a96fb05eb03d42045b5b0c3af1a5de49df604c SHA512 d59f0c483e0f8927bc4c5c34d07f10082179ccfcbd5f4a189e84364d5eadadb87e4f2e728b74ead0d2c1efff7bb872dc5ca611daa1612547cae09d019ce56624
-EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 2135 BLAKE2B a4affc424cf1ecda32958e148dd28685acddd8e9ee6f5a2e8e765912f3b7dc4503e9c031fb75de7e1d1dc639bae97e45b009783d94813bb0cbb9f321c4541e66 SHA512 2772108ff7ec344c9c29884e175d7036ab96fc0d1f510ae0b2920b59d0a832526ce6c73f79f7d692af1ebcc8c7de5500050a61d5ffc3bacc6114c933f29e5661
-EBUILD libcdio-paranoia-0.94_p2.ebuild 2135 BLAKE2B a4affc424cf1ecda32958e148dd28685acddd8e9ee6f5a2e8e765912f3b7dc4503e9c031fb75de7e1d1dc639bae97e45b009783d94813bb0cbb9f321c4541e66 SHA512 2772108ff7ec344c9c29884e175d7036ab96fc0d1f510ae0b2920b59d0a832526ce6c73f79f7d692af1ebcc8c7de5500050a61d5ffc3bacc6114c933f29e5661
+EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1702 BLAKE2B e1305e468fe590361606354b45c857da37e0f7b44900aae6dd5684d94d1754f8b807469cc4ed7f6223b5deafa8dc972877cbcb46b5f7a5655af4eec7a3419d2a SHA512 9358b774e68d05c0cbdbae873f743c4f3554a682942f9134efbe786dedab56c6276fbfcae167596039c5c9b3b883af2acf7f0f48acf5faa35eb16b5eb2b16c6e
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1893 BLAKE2B a830913389151a96dd54bdfc78eb607de385a27cd558907587603e6b5d021fa2df47059ecba12e086f3606458f8dc7a278d362b389c4f6c2edf55a5a7f02f86c SHA512 ca43bd5f23182901c07a1c983b590ceadcc586868cc054e0eb3fadbd27f3f0673a76b777b7d516211baacb8f6e6938c15bd0b9b98b1f85403157bcfa15d36909
+EBUILD libcdio-paranoia-0.93_p1.ebuild 1885 BLAKE2B 803e95974d186365a3118fba1a7a4a3a51149fc204f6d311cfa077e18d422b7b2781d7192fc7eab30b4151f1592f74be34c6f3466c82ef9725203e14eb0a1d0b SHA512 4cbaa73ba622294f4d71b4bfb8e3bf9c6beb754e0457a6bb5da79f1abd449b8272c1608ffacbdcf057c829a43560c843f9f91d3b4d9b0073c74ae6ad63986aab
+EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 2123 BLAKE2B f82293063ff4875e8edb53a275453594ffe3bf24281b824087c3153fdeb9aaaa4ff616724a7049b868d5e68e1c4d8910b11e64dd6a482eae39eff5a62819f369 SHA512 ae5caaa1c0e5010eced719455b36d5b750b32aadedd34f2b6bd627d3a87fcf71310d4ac29af042cffc2b00d15dc837714753e8d1cbe09ff3340ff167955ad2a8
+EBUILD libcdio-paranoia-0.94_p2.ebuild 2123 BLAKE2B f82293063ff4875e8edb53a275453594ffe3bf24281b824087c3153fdeb9aaaa4ff616724a7049b868d5e68e1c4d8910b11e64dd6a482eae39eff5a62819f369 SHA512 ae5caaa1c0e5010eced719455b36d5b750b32aadedd34f2b6bd627d3a87fcf71310d4ac29af042cffc2b00d15dc837714753e8d1cbe09ff3340ff167955ad2a8
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
index c42085936eaf..2b1cbc194716 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-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
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index 080c36095a31..9aaba4991576 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
index 80cd5caae9e7..70d769becf4c 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.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,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild
index e144afa35ec9..2ff7a7f56e5d 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index e144afa35ec9..2ff7a7f56e5d 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index a97dabe66095..57b9ea4dddcf 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -5,9 +5,9 @@ DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d7
 DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
-EBUILD libcdio-0.93.ebuild 1870 BLAKE2B 30953f0973dc5656e26312606ad557ced8aa9a7a0672bee7e9fead2c002360c5ac233dbabc64c2232043c201ea41d9626ac86feaf8af743ed7267d4fa75a8edc SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945
-EBUILD libcdio-0.94-r1.ebuild 1888 BLAKE2B 20ef4b8bdc055c406864b2bd91022a5938f469b20be26c48e888d8d1b58886296989fcb784a07898c1f663d3cbc7fb89bb097c2885983a59f8327a28fe03d529 SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a
-EBUILD libcdio-1.0.0-r1.ebuild 1866 BLAKE2B 602b38ccbbd247f100bbc28eb0bece2132d280b9c6723f9f296e2e9906d441435c0c2f82ab0603fd8b80d47ce8f8bc28539377fa88c2a4aa950678aa65ccae41 SHA512 25b0989c158e152eddb589941dd16b9aee4b3e2783f2ddefd0939d9245a904829ec348c5337c84ddeafb7dfd4eef9b7298976fec3bc665fb8abbd87774dd6514
-EBUILD libcdio-1.1.0.ebuild 1788 BLAKE2B f3d6344d71d636aa3adb6e602fe43b8780125ea034c2509eb9482b71c76957f9671c977aba92f54130f770a3b9c2d8d452bc2fa473378348436fcfb10f01dc00 SHA512 532216f99f928150d76cda3be770a2565c2bb08533dfa809c7979052701098e70ea36db1d4db494ed567a433e5466b692b00f9d95436a93e24abd68e3aadfb94
-EBUILD libcdio-2.0.0.ebuild 1788 BLAKE2B 0f786de8168c8e703fec35636f4cbfd62a06c5e6fc78676d2070c650519fc744e46a53ea18208c40ffb9a449a894e9a962f4759b6a242c9bae9a389a78767e22 SHA512 aff73b81eb022c1971c58412eb5724e28440be857d42f11109e45bef25518697a770c0cd80ca704d5ff82496f8842a4d429c6797062e149607b8cbc21c6223ba
+EBUILD libcdio-0.93.ebuild 1858 BLAKE2B 522e84217ec320417221586649a82881d7a3d6f9250264470a51c023237dbb7dcc590c74fd3763dc7d4233027394f541de7d6bc370a5f43d5f2624a20212834e SHA512 74b5662c08674ee2f837b3648546428d30ba96a9995c2e6b66915ccb1547df06ff767a7b9bd584b4dee67bb4aee3273016b1e437cdeb67a9793d0cf6e34ce9a3
+EBUILD libcdio-0.94-r1.ebuild 1876 BLAKE2B a673433cb8f17b5d1a0a3f7c3aef86d8826aa6821b377f235f49598a6ace1e1224aada8883c1bbba344bb1e4453a575e5f64ca403357f9ede2462e8f76a62c68 SHA512 aa070eaaa077d75007f63d187fc6e433f6129fd29d91e4dfaa9cc7c73cb5d731f249cbac418e1829e2ad7ba00bf8d01fce1213d7b84e857e42508ef45a9dd887
+EBUILD libcdio-1.0.0-r1.ebuild 1854 BLAKE2B 73212575a6b33ea13958f38cec55f360dc6a4d4f8e289dfe7ce8d1e250c0a70cce9a9671c43828f6bd8064c01b7c483864a75d4b96c9e0c2c649635f772d4cfc SHA512 d36d0f899bdde4f5e962ce8ddcd56aab60ea8b67dad068910e2947f93eedc04c8ca0376a7850db6fa7c909b1391c02787e92504169959140c1298ae5f1c2eea6
+EBUILD libcdio-1.1.0.ebuild 1776 BLAKE2B f3474ac6bb1f240f2460ded72f713a7c3a30068a9019103f375051d46c83fa2d6700914f410e62cfa80d4730ef790cc22e0ef58934df112ce33ed2ee8b31176a SHA512 41d22cbadf18cea8719118fa1b96b59ce7084a69bb7a66d137b0cd1ef739f9c43a4ff34b45b0157614aad675fad92004da6107f9f7314932f78c262a9f8f1360
+EBUILD libcdio-2.0.0.ebuild 1776 BLAKE2B f4deb1500127ab04377bc36e3be4c1377e3952cbe2f72d108e412ee275729eba3b8fee209aae64050c6e2c41df591ff0d50aed615b6a2c062862f19699baa6ce SHA512 1f2ef514ecdfe39541a9d691d05f4788070400bc7fe6e173a4f434e60677f50430fdebdb4a946afb143395d7281b6feaac0ac9edd3f318d19217bebff10c51bf
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild
index cac5ebf6391c..7272a7dbdef3 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.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 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/15" # subslot is based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index c415c99f8383..7f63c92ba246 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-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 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/16" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index f640893a0e69..c4bdf2c7bd99 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/17" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index b8ba3e226653..1342280b6ce1 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.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="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/17" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index 8e37d8d2b7a8..f50f17d50c97 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index a351b8c08e24..7cc15933df4f 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,5 +1,5 @@
 AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
-EBUILD libcroco-0.6.12-r1.ebuild 1467 BLAKE2B 9b451a36f84d81913a6318d551a695d87d63b88cbe7b2ef57b77deb46e16102a889c4caed6dd5b12bd7469979d6e3b5e9653a6d4acb03db6c52b6dd82d2854b1 SHA512 ccccc41f71b1a3aef0d43d9f9dc60d313f17ac7a0be6b60eb7ad408074b24bec466232314ed10e216f95c92731c72159dd16b78e75827e9cf9809b83c9523a10
+EBUILD libcroco-0.6.12-r1.ebuild 1455 BLAKE2B 56bb96545667e3042376100065507ea68a5198fd0466459e557163cbf990ff972800d068a7c789d6a63074b24f46b19f028558f630bfe2e697cea33d782bcb5c SHA512 92fe3b34b066f3289a36dda1e3ecdf1f76ea5c351f60dec5c7485f91e0dc7846f1940a1a61448d5c8980ee19f37cd7fbe5dcf5293c8d14e7328b0e899f71f8db
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index 67c3539760fc..18f7c7c21f6a 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-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
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index e88f0a48bc1e..dfc344dfd028 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -7,6 +7,6 @@ AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b5
 AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893edc8cef17c0825d4aa6046da2456b5429f48de056211d050c77fa40689baa1f0eb56259dfaf2f93a778f10720d7006a SHA512 41175b20f7b925e347db008d5e8a535b8326cd2c010a67b9db3a59131fce77a7791b7940e7eea9d68e82dbd3731efaa503d4bd218d78b29f946152dd56bd9b14
 DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
-EBUILD libedit-20130712.3.1.ebuild 1279 BLAKE2B 892593e9be9a70bde10792b548ad9c0747cb716516ba2dad864ad4a26e3decb1c1e231696835b294ae7ff9b86f4a76159e9dcca8034ad09eef77d850ec070cc8 SHA512 8367e733991a2c31573c6b207930ed95c58210f598e0be19910051bc386c148db00bbc41830084fb9eab878dc0413fef738c2399896b4f62e09fa153cddcf3a8
-EBUILD libedit-20170329.3.1.ebuild 1297 BLAKE2B 0b7b1782a6bdb92b6d9221483a3c71bebcab562a231018c746610717eccf4d196fdbdee8883efae63dd2a3d8e4c7fd569c6b211480a1a83f62a5827d49c41804 SHA512 db81cf30017908a452131fe432890a3481177d2d0b90064c367aaa30919d974254ccb7115034c28f3d231cd27c88fce38958adadba211547e18d9d0546da3ad2
+EBUILD libedit-20130712.3.1.ebuild 1267 BLAKE2B 8f8fab305aabb4d9587190b45e6c829d55a82bfa3de503eeab6f0dec5ff67b61c9c221c89a906fa88c751b56db24b04f63208693b89b63c8f494331a857f9925 SHA512 5b5bd20d31d2948fe6235491357769ef5d386b61fb1859f4ae0846259132cfb15cba15ea97e68d006807301d8a86d64dd44b6a60f8b033138a515b6c1cbb3e96
+EBUILD libedit-20170329.3.1.ebuild 1285 BLAKE2B f31762219b5e7278297e54f0f1aa1300f33b8567fba868b44a9e9e14bce0905999d3acb530f3e2de297fee533129cbeb4564bb0a20443b7b8957db73f20f337b SHA512 dc4bf1f4f33306a3026c162567d0c1067c5592d4bd981d32ab3309bbfa7d3958b5b43d410a128f068de860595276a8531abd487d4f73b2403c516517aa540192
 MISC metadata.xml 636 BLAKE2B 22880383d39383e11fad886d88db603fe58db1e52f36528f71db2bdec95c74dd50fe7c76bce52f5f3eea47fe61d1dfd0cb7264cfd9458fd8b5db40d38a1adb86 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389
diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
index 8f62738565c4..b7684094719c 100644
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130712.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=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/libedit-20170329.3.1.ebuild b/dev-libs/libedit/libedit-20170329.3.1.ebuild
index bb9cfbd59ae9..5cd63e9cf415 100644
--- a/dev-libs/libedit/libedit-20170329.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20170329.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"
@@ -13,7 +13,7 @@ SRC_URI="http://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index 46f60de6cc1a..d13d6804d0a0 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,4 +1,4 @@
 AUX libelf-0.8.13-build.patch 1358 BLAKE2B b0a6ea3d29cc508da873b9dcb9c99c171e01d47df4f6c753434f9da04f18aa56314df089fd2dfebca320645a99fa474359f731d315d51989041ccdc4eb997460 SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c
 DIST libelf-0.8.13.tar.gz 148529 BLAKE2B c0364d6a155ec1590c8ef0754ff0989144d2331e99eb2a5208d80259229904a72328733460675e334ce6b26123f1c92d28d5fb9aea1acdff3ea7a16f4b572a09 SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe
-EBUILD libelf-0.8.13-r2.ebuild 1451 BLAKE2B 9d5f1c7704eef3a9ccb9ed321de155b43417134410e07db1ea83b0ce0239d0c67db80afe7c7e62eb102c098c33648229607932b7ec73ef97d843bcdb3707f0da SHA512 a99347713b4f8b865dfcc5ded8cf70101320477a124ef7db6126dc2250bbba362869cf1d94f2440725761219f13a64ddfa5de30a451ec2c577788cf8fab26891
+EBUILD libelf-0.8.13-r2.ebuild 1439 BLAKE2B 71f17cc4c5d8cb1bbb513bfe847d63ddc66be77af09cba54e580f97d2771c8e8c56d76212363735f7fdddadd83c7f7884797ed2d1419f94a310799c5505416a6 SHA512 46e83dead57b4eaa692744a8f9477c995c7bdab5e28cf8971f4d7f8726e603f5f3eb37dfecffa07c7eba841b9625d03dfa9012f20410f25891305fedd2c2f33a
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index 824e777d1270..11f2def1ef08 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 18227ecd9e56..bd352338b1e9 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,4 +1,4 @@
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.8.ebuild 1714 BLAKE2B a7246d2cadc590b1661e415e9df9b84da9ee2931f7425c44b18d8dc19a3e42601727cfab9351fd0a1f532900e879fff300e2eecbdb9f8e8411618a551b444f82 SHA512 9e7f51eba32da9729ac1e8bdd81f00937fb4589b25afedee3ca72eff5427edb60842a34eaf85ab86266a48b9ecf72d21e9feea1e7f07087466aacff9b16acdad
+EBUILD libevent-2.1.8.ebuild 1702 BLAKE2B ae0008bebd1c156bf718eb1983a46a3ba0f9e3ec72d1d71da46454b89e7b8de02253ce11d5905986b9548250f8afb2ba0e9657dba18729a8a219e1646dd99c91 SHA512 3369117b19423a719fc063f58896cfaa1944796607c2abe12ac663b521d07f7cba6c3400dda0e881925e3ff57c84dcbde6d92a741970711a2c92a3e51b3a1473
 EBUILD libevent-9999.ebuild 1205 BLAKE2B caab3f55b9ad0f1d9dae12bed8799ce42aa13f26da2dfd2de128821a753645820eb0303ba4bc1a907e16489c93a8092ed6c74b70b7dea07876956ffb387a1fb5 SHA512 ecb96696ecccaf8fffbdf147d3d75c8521cf746498bae305280adc4849f9e0dc740b5e364057a1299a196410fe0204d98edfa6058bd9c0a1c821b8f590264931
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index f37ba5b8ab4d..455964b38ff9 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/$
 LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="debug libressl +ssl static-libs test +threads"
 
 DEPEND="
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 8ba6568511c8..2675c9c12199 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -5,6 +5,6 @@ AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e96979
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-3.2.1-r1.ebuild 2417 BLAKE2B e36f4348b79be67ee641f275e93e133c54729d3878c66cdde71c0d840f4c7b4984c425adfc3969ab662c0f3964c114cae2a6688ec14bc27a63b2810af1ded4b2 SHA512 6de380334852f5b340918d288fd96f8b0818a08c9d8ebbb6bfc8e521de5184f4d1152c12c6c5f9ca6fce26f1c510afcc085107b0b6559acf7d09ee96459e2e78
-EBUILD libffi-3.2.1.ebuild 2116 BLAKE2B 960a9fe4fd5459b09c2b83e8c43fedb02ed0a8d7b7090a19d233a3df1e645783276ffaf66238ed83a705e236a677cdd6d2b5b60810ec52858798c2e562f37d10 SHA512 e7dc5fe20f4fb45aafa3bff908c17f72c597b25d4a08d88a899821cd0d9e9fd5a592fbd234820924b2cf22915c96d09e4887430f80f64b3a5b1c8e9c0ded4546
+EBUILD libffi-3.2.1-r1.ebuild 2405 BLAKE2B 09d43e6a73ce68afa1e86c166dd46a75887fe8ccf68b40fde42839ba9845a2bc305f2cdfa05570bddd3e47364435b1055b101da8ac6f56fbb8d5de2275cd4ca1 SHA512 777f38391afb930d42ccd56a7fcfad57c684b3359f43ed80d179cf1a9ef125cfc73b64208f5072323460368a71561fd94c3c03d31ed64955d5dfc40409af9fc3
+EBUILD libffi-3.2.1.ebuild 2104 BLAKE2B e14f781ba993954032bb80464efe262c46e419b5d8b97c2f9f125cca0ab3d3acf5479413226e00422791bc238a93ed4f35411f02004dcef2cb62d69ed64e75c3 SHA512 98e9e34ed8312ca0a4bbf3cded47c135558b35a821a6ef26dfa14621fd965ebb7bb30c97c3cd39e0663fe9ae85fc79455c88bd472bd7f410ef8386a879f3fa13
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 134d518b54b9..576885b268aa 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="debug pax_kernel static-libs test"
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index e2d64022d815..8c52b8375f3e 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.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=5
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="debug pax_kernel static-libs test"
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 489a1a15675a..9aaa623c6774 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -9,5 +9,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r5.ebuild 4054 BLAKE2B a636dd333b7edb2aaaa3b1e1782c2dfe80098f069ed4dea117f965a3824262a79c81ae74c30c7e41d4cf15a3ad5b4c75bb2e066d74ed0e154a158a70fd6d5cf6 SHA512 e7aa0f71009e19c6cdb6bef2af2b6d8f4a02732ff93b50e8a11835ab11ad2e19e9773ea64c69bcae2dfe87a9a7d053310cadc5072f2059502850e61a1340eff0
+EBUILD libgamin-0.1.10-r5.ebuild 4042 BLAKE2B 7422d4f2111861a4f023da426deb968c1d62dc9fb56ce2ffe4f013ef55c0cd69faa53d30be0401285f65fb6734819d63576445c37f63d18f212d5f293f3fc4e8 SHA512 baf40876d9af784cd793a14ab496057051d6e620af1d72d274b22dac4ed710e71297d0cbbd44ee88bc9e897df71a975782cb7950e9751a4f8c38bb75de405265
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index 929fe2d28439..47206c41151e 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-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="5"
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 08c6ff339cbb..0fd045c6ae25 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -5,8 +5,8 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
 DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
 DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
-EBUILD libgcrypt-1.5.6-r101.ebuild 1819 BLAKE2B d8c7173947450abfd72f78cedd5b0f0575d1a0395e12009cae295ffacfa1198fd2600cdd9251e7c7c4c92fc1ab01966899d15e64136278f293e374077728fe05 SHA512 c6f34489fa52dd333fcbcbb3ece2c0256e59653a7461e0531802ac477a19ef1cbe69266349e18ccbbe6b1cf98bff792c40e47594a644c26ce2360d29e251356c
-EBUILD libgcrypt-1.8.1.ebuild 2238 BLAKE2B a6a1e54c878ecf18df7ce4c056c51a16ce333ce5cc4433dfb1e2054a3d70a2d8cc75d7a582473e84aad89cb2850118d8752cb223823f685803ba5140c82bc110 SHA512 8dcaaa3df574949a55f0c33d853d95f393ee856dabc0ccf4ba0fffeffc120cf7a96ba94f3a8cfb4d40654fabfd2f67f551515754c7bf348c25c4e16d80e73bbf
-EBUILD libgcrypt-1.8.2-r1.ebuild 2285 BLAKE2B 46f8f6f3841033464d5e09a2b7bfcc41769f89ba16d97a494c327db33187d96262a1a67d7be4cb5ac0d08d37fb43adbcdaa60988ea719a11108c808e39c10127 SHA512 d08951c1cc5656ef775ac5c34a78422131b9cf8f53f5787a96828356ffd9916927a9ab4cc7f6463be250af946444ded929f8077bee460e306d1ffde12e5eef44
-EBUILD libgcrypt-1.8.2.ebuild 2251 BLAKE2B b6b3e62d0d7038aefbd4ea52842b1ba02009f9fa129887963e2e7b044740f21e89d0b3099a3f1cc1c7bd6ca471a70dd7aa55139747d2403b64eb4af65fbfb40b SHA512 5e456df4f4466967b2f638d8c870134e85ddeca04e5a8b4186959b2cebb236454997ca881c4e009288e18cf544bb50a155d473e3b588b22b035d1b2f394b4a24
+EBUILD libgcrypt-1.5.6-r101.ebuild 1807 BLAKE2B b10e164b82bf2de4b8e97ae52f0cfcc80063ae93351a4619cc19b5f9e1fb54555ea8fb2af7694c911f403ab5f26a996253ecf8567a2817e77eb840a5dfcebb50 SHA512 81b461a531bde86040279627605780b28b006d753731a75257f2990b410cdcd61f0073724f9736bc2a52bc293fc740b5184fa0f031209940b539e2b5fd778d10
+EBUILD libgcrypt-1.8.1.ebuild 2226 BLAKE2B 1c592b509848471639c8f02c274bbe7463efc6b9891b210473522ed1e4963668143cdbfeb313d76b780f72e5a13206015ab468904140ffd37ca1ea3c00301499 SHA512 eb0d3be414ecc5585c37ba6e3b3de483224ce6eaf337504c124f492b86d9283f7a8079f61bf41780cfbe7cb96f0900a5afd397495deeecaf0b1b681e5178f9a9
+EBUILD libgcrypt-1.8.2-r1.ebuild 2273 BLAKE2B 7878583f1653512167c16eab8fcb89fed8f5834aed72278d85b02cbcd03fe63561e857aec7b720199526caf6b1ac17749db4c71d24e7702fc49de0be3b957a7e SHA512 8f2cda06efef6e1595f3a526a0b70b079c407c9ff3504ce900f8ab9f657626f142ac29fefe448d48545b863d6c5b42d3ec7dec19e1c5d61d1b6979b682c2d669
+EBUILD libgcrypt-1.8.2.ebuild 2239 BLAKE2B e2796a1f88a4407527f0326e886aa699a9243c0dd4d3914f82cee6f2053b20e8637be1488c5b2ce8dc8231247b22041ae2bbf97b1a3223efbc432471503afa75 SHA512 ad2122ed2c1a68bea96b99c2397fe297c3c5afd3b86fe0732badbf767e6de677b90591d9acac84c8de8a4cd3379ebc72e77f9fedb3b87dca043b7a397f3146b5
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
index c4e5f08cc2d4..686e8788fa4e 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.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="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="11/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
index 9ce34df34e87..2f0aed6ee170 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.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="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
index 1fada65b5173..d11865ef41c2 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
index 4760de5bcf60..fea45ce9d9eb 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index c4830675adb2..077e941ad7cb 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,3 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
-EBUILD libgpg-error-1.27-r1.ebuild 1441 BLAKE2B e799c847614a34eb545f389821adf9080c42694bc300d182a60bd1fc0654cd9f5d981b79f368aed58d599ca953a3e161c7d555c4d57be08c195303e8ff01cc76 SHA512 ba37aef5352b369a2dfd119f7b17ebe8bc505c6af1ec4880768f14bc7d3a9f98c5cf704cd7696f10218cec48a4b859fa77d6a0e2ba1badc554279fc04d133988
+EBUILD libgpg-error-1.27-r1.ebuild 1429 BLAKE2B e8b64e4cf269abe2879393db06cd569719b9dc8f1dc84f2137811111e550b1a2ac8747f87cf33e5daed2a789bac7ef011e5c6f901a497ee0ee0d974498cdc825 SHA512 56cdcf73c28d15a79a55b7016c88e0112b6be319baa67f3e4920af23e5527127e2043bb5323954334d37986b9ef2d329e87108141c9c96e97b6385fa545f8c33
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
index f074e8a58cad..438569792a3e 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.27-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 11035a002ceb..cdd8f7346e4d 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -10,6 +10,6 @@ DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7
 DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
 EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
 EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
-EBUILD libical-2.0.0-r3.ebuild 1712 BLAKE2B bc3cff5793cc021bb63abab29727c80bfc3f8663e7a5b42c4934cf65a75564ebc6aa803a019205820654eb9ee78acb8455cfbbb5ee46be080d5d8172f5efb5ea SHA512 7a1c381dd40bfb18e8f4472774c62b01e26a22fb0c5349129c123162abf4e25846eb0d733650f8b9b54ef77810ef5d678a02b72fc3e8609a0e777ed8fad92e06
+EBUILD libical-2.0.0-r3.ebuild 1711 BLAKE2B 584078e51c208ed6a8eb40b9ea56cb7d5f75cdc1f0940018fc0283a4a0b2e08b28ce1a7698743c2187dc3bc0b6fb8c0f1636b5c5f4e032028fe9c1da6a5ae008 SHA512 b694e2ea6b883b05803c9190304e3e3d49c081aa57e72b90f157cd8a2d3a522213fb53e19fb9f4c627decf0486a12f45f3eba3a2c2bdab5478a6c5b50415c2ec
 EBUILD libical-3.0.1.ebuild 1988 BLAKE2B ed29518f1db3fb3b12eb648c167e70e0a992f6f28a6edf55cf4cc5b54e1ad42d1448d22a33b64e2e252d656745bfa27b2cf8fbc15dea80fee15a9de3315c73c3 SHA512 1ec6ac8c38e99e1609e88337a4b4a4c9b60a1670abd0cf72dd08d0de06340e083a36b1361c05b281834886ca0ea25119dcedf03d8ad21de23b7f4d2bc83b7350
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index da3b08aa3c72..cf29f803fd10 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples static-libs"
 
 # The GOBJECT_INTROSPECTION build is broken, and upstream has given up
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 583b2958bc62..b58a67f6e9c1 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -2,8 +2,8 @@ AUX libiconv-1.14-no-gets.patch 836 BLAKE2B 9385fdfb2c924ae30ddef79a40bd8778a09f
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.14-r1.ebuild 1385 BLAKE2B 017f078570316b33bd10311775a47684e782be192d1bfd48e000fa5b394a6ed56a1d25852a66f9e68ac9194f291151dd68f686f89b771a86ced24c7cdf4702e1 SHA512 73fe8e4bd0f1bc966d5bf15c0c1409078cf652397c47223cbca210127ed86759337abf7c7bf296268f9f75dda25d41808ca1af3edea50a7029344f0cbc21f744
-EBUILD libiconv-1.14-r2.ebuild 1515 BLAKE2B dc804a4fb71868fb781326eedc30229694139e6fbd0f1be8f55104068ab2405bb1f0931090d0da4e1e81568afd3f5bf7a97530c4760111b5c434518789e8e640 SHA512 b1cd99126fdb3365b228f386792ad94e6e8ddb6567e7a1d2552c89d40766f304893c30e231dfb57b23a35ed5b3101a8f7065410b3147c70d77ae4abc861f6c52
-EBUILD libiconv-1.14.ebuild 986 BLAKE2B 9e4c25900844445196a55149536908f4b0f1c647255638382cb696fd33e8610bf1c2e0b16abd295bfd00a743eea62a71fbfdf9818076d42af4c982ff64e67288 SHA512 4a3bee9887d6a39f4e96684548f71e5a494d21b3fec6b0b413ba4e34b7894799bf9114f72072a449a4925856b28b4c9c001e2b9ceceb55eb75677c2327ee7bf1
-EBUILD libiconv-1.15.ebuild 1891 BLAKE2B 9b09db29d5b989f6280cb4cb06ad3e19bf12fe18b4d8d9790e1bc5a3675f5cf163262a5e874ecfd0f6716e73aa1b232b896a12c970ec3c6b42fe31af8a5cefea SHA512 e19b29a2c8bfdd50419074c25f131cc6eb5b9184586d7d5e1b4e1e358f42cdcaed3d7c6942b20fefc81275681c2bd9c262f4675677608ab61ddd0b57ce86a677
+EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 629f36e0d54ec3afb2b64d4924b76ee2ccf28b8f0b7c55f657c394af02ff03e7e6335a703c1ad4ac9e2c7bb9e624fcd8f0cf6a43b95aa6b1b8148d621fd4485c SHA512 3cdaf12a9b67cf10de8aaae1b3bbc238b7f3e218d44832b1317cf9b1ded10996fa44b2bba9a7ea5b655b07afced1db3e85c42a5794baacbe91cb96ebc05c7112
+EBUILD libiconv-1.14-r2.ebuild 1503 BLAKE2B 63e874be4500aee2da3d4ebb087f7eef6d706a53a4a34041a5e1bbb0b2402a5b136f6cdfae916449f05d8d9cd42b3c432429f574cc591a8f03305d772560c56f SHA512 1d2d8226fec24e201dbeb7490b2ddbc602e1824ca77b18d058b16e013690e321852060e2e4908b0145dfe159c3f9fc54da416ccbb8a6f3ecbd3c1968aca1d16b
+EBUILD libiconv-1.14.ebuild 974 BLAKE2B f84a1b7666c247ac4a85f0ae05a1dbe5202175023ac9308b7d7af5f3083382af8df7c81d0d6d7c1e0ded4c209eec6a267eaef6092e4ee56b7628ed405e4441e2 SHA512 3d6fa4773eeab09c7c01fc0dc4bc5239556657818d9f77baaf7436c9c6746d044dd3e2131d498f5b436aeb26b997807ddf76efe320ab454a0555d6fc24e6e38b
+EBUILD libiconv-1.15.ebuild 1879 BLAKE2B d5bc9cb340f1ad46a7cd0f5f6c926b78a3e865df9a15e1f5dab0312863ef78832a04241843eece22e7aaf5b62c7e9ae744d3871f28d660e8b155c944195f68cd SHA512 6e65f1d48fd0b5afc71794c0a957f32d61fafe19ab207ed763fe0c3525c0339cf068c15eea9af96ccdad0695da381bfebaafe99d01c0eb374f243704ce4cb52c
 MISC metadata.xml 564 BLAKE2B 465a39f6ee306925d4eb3f616cba7e08604aff5e94024659df611d45ea96245205a6f257175e862ae63e5a6d31fc549e2104d56a3e970157d25cf315dc820ffa SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index de94f2fb8d3b..059bc00d97ff 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.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="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
index fe0546e55b5f..54709b52977d 100644
--- a/dev-libs/libiconv/libiconv-1.14-r2.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-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 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
index f90d8ae1af5a..fc464c4b6e93 100644
--- a/dev-libs/libiconv/libiconv-1.14.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14.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="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 5b0db6586609..8dc2125675ea 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.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="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index a5021c07aa97..53c64c611e08 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -2,7 +2,7 @@ AUX libintl-0.19.5-langinfo.patch 1108 BLAKE2B d45afdc7cfa1c5b1f1a0186d381ecc4eb
 DIST gettext-0.19.6.tar.gz 18619659 BLAKE2B fb5e518cef2048c89d2c637d3551d6d7debff2fcdeb35b60f0ae9943733bf5cd8ec46f0a4cccd9f1806a6af4b16eef372a0621af611d3706356af6ae82d0d5bf SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD libintl-0.19.6.ebuild 2096 BLAKE2B 8964a547c914fb1425ecbc5d7617c5989716c9f4083864aa531a8053c77bb5a00169350b74d3dea4db6796a99c8f247b19d8830aa5bf09aadcc895ce5983a783 SHA512 bfff57c95ecb0a5edc21cb3e4cef127b9ef45372c762dfa712f3967b93c04a90e34129a76a202f97a0a598d5cbd3ab7a8a715c4ee758d788c275cc581741dcba
-EBUILD libintl-0.19.7.ebuild 2112 BLAKE2B d3615c96089bc0e3c5be93252a1d69059ddac1ddd06dc2fad2f9e9539a1f6e12fe4ff252d1614c4d160efd3004af097f2f2ec99ed55265fe541964e2a8688b50 SHA512 ca932ed11246d86f6888ec8a54481283bd3cb77c430efe9ce1549f533dc7758f9730e3e390d318056cb49808c45f602e56b439fb5edf990d38d6e68641686cb3
-EBUILD libintl-0.19.8.1.ebuild 2125 BLAKE2B a67f123386f35807db7b646de9725a3649fb0faa551f5ab3c621acfe5752d03b180cd9ca1d62f51f9816fcd0caa43219355de0d16a601969dc275cd3b167dad0 SHA512 8a1a367f673f2f1ee473b0fb4feb55ea6a7f9718a5f767cd966c7282214e72bd0183e2868e2024c0894732eaa77d8d3ca799dae0b12cde93eb2fbc243d302ddb
+EBUILD libintl-0.19.6.ebuild 2084 BLAKE2B 4c44824e49423705d8845f220b6d688c0f78f3cd31d08235c8141906370ad66856a0e0790952f47b65262d84ac075e2acec4c3ecdddf1e087b94bed4cde64bec SHA512 ff31e398c5f9c74a2fa1bde5f5d7c67ef6b3ea62de0868bc8e0ff419b3f337869b504b3b8631cc5525913fe1892c128ea87119ca83cdcb7329d99b0d236e4ab0
+EBUILD libintl-0.19.7.ebuild 2100 BLAKE2B 9b655e464aeac02ab8310be730489c98cedfa880d7afe8a8df71b28e81cfe068248052137f77eb28dbb2a2435ea4e5698b6786b08e71443a1c51dc500fc94b94 SHA512 9fc279db2f3a42d087572e8bb3bad92794bb7ece576ed1fa97160250264de2a586e7b3f2b0d68893456458cdd45cb4b8decb7b1f8bf020898ff7a5affa71c7be
+EBUILD libintl-0.19.8.1.ebuild 2113 BLAKE2B a7fe97df7720b623e7d9fe6cbe84e8a23b06c3701e20739f9cd20219d902fe990e594af8462efb08636216ca105f015fe2b00271d871ffa27cad5202112960c6 SHA512 1d4255c1c0e4270f2845bb3478008724b047984499a3bb629906da4653509a9cc52fbcbf3562f5ea364126255e9e94968f747deefe4cfe81b48fe9169f62477d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
index 4425db08a6a3..a63240d5db93 100644
--- a/dev-libs/libintl/libintl-0.19.6.ebuild
+++ b/dev-libs/libintl/libintl-0.19.6.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
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index c4f1b63af408..611831825144 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.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
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 7a0dc4cc62b3..45621c1ce25e 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.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
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index c0a7c8a259a6..f6b16e9ef657 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.4.6.tar.gz 1528141 BLAKE2B f13ede88e31d0f11cbc8833c1e276a43b0e53375ec674c05d34d11bdb7b1dba965ddf0c549b6bdc0ffbb3ce5ef3e1847e7170ef95a3fbbca8b6593214fbbec1e SHA512 329d3234e8ae31abcab8d8a61a6531ab7ccdd8340148f84a6c77a23bbe16b303bf1dc95cafc751bf13f83e855f158b59ddd9e93c3dd1fe6046c1b5ea27eefb69
 DIST libisoburn-1.4.8.tar.gz 1537097 BLAKE2B 569684a115ac09506aa2fe6439f4dd80424ba7a5fb539b587e618a2a618c18512099117892ed0abc7268bb258c80a1ce8c2e4535f4eef963a14a5f8285806e23 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46
 EBUILD libisoburn-1.4.6.ebuild 1887 BLAKE2B ebd675dc43185e99fc094176f37a679695f0da127adacca665223812df3f397da9a97054b0f6a32518fb9949a216735f9add36bfd24331154be7300e5f8ba911 SHA512 d1e70e25a18ca89b4cf5b767c2129a77e91a02a1eb0bc51078c3a80670c9be6dadaabbd2d579ebb18770c0194789e0e091b2baec4fb58d4ae849de34ee0b6a4c
-EBUILD libisoburn-1.4.8-r1.ebuild 1817 BLAKE2B f2bb1de578d74d513fb6c884542369d610069e945152a599972d8d66af8edf624de0e90f0fae755c5c9d23bbcd8e3009f7b9264f3f2627135c4dd7053b00ba3b SHA512 e62adea613cbca35750ff4cf854487fda65f069017c43d7c2e041e1630f796006844817d35283642e6a2cb81cfd03e5690d1a41f7a11c0f293b9dc451759903d
+EBUILD libisoburn-1.4.8-r1.ebuild 1816 BLAKE2B 61a5f767137fb65a53bbd9780153c71b024886a204649d1a9345d2caf8a7e559c09c4cb6d09e570f9ad356ec828ae4330a704b4b86d79b04ecb630675fcc6a16 SHA512 2124db392eefc46dc9e88f0784270b2955ee96df145282cfc790c7cf0c023dcd78a12c249b83de9743b1bcd97f7065ca9969ed6d2b47c5507a12d3b47c298729
 MISC metadata.xml 907 BLAKE2B 0ff4958d3e0a0cda251d3b22f8e439fc3dce1a41c7a7dac3ecb6cdf46e99dcd1810c505b8d15d7d02af75604f3fac9da26c9378b530e02fa2763f1c5d2e1824d SHA512 a1ef1aaf1bb3f0250a3a73bd9420a24ad1f34ad0ff4fbf2a075284eed10430c8b3c989b932b5061439212001b76b483b7b5de7ed1e708e1c6fe14a0d80dd5166
diff --git a/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
index 67a1002dea6f..1d0474b8cde9 100644
--- a/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.4.8-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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 4304dfea021d..b5eb5b59be9d 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.4.6.tar.gz 826874 BLAKE2B f158a10826349f4ca3a90f6a5c116a85b80e65c72b289eac697d37829adfc72476f532c8acaf902564e698ab47cf1e81bcf2ce996898de717f279ea0d849c2b9 SHA512 7eed78a4194f96a019465e8f80bed0cd9f75a803eb11e31e60815b94712c7aa3ac218c6c6f39202a35cbe27b323f94f6d87502395975aa86805116cfbaf2b13e
 DIST libisofs-1.4.8.tar.gz 829979 BLAKE2B 78275a8a1c2ed3824d25dcd2eb02675059d102f2f0b93ae469ea18c342bd6c72e79655eb9f3c700539f87ad46bb97b6a3e28950f84a03bf3d9f1fd982c4fc479 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc
 EBUILD libisofs-1.4.6.ebuild 959 BLAKE2B 95437ad73470aa5c977b40f366e8452e9f10e869db82a8dd3635eb05e206e177d724b1c47a8d8000334b2a68d87fdd4418e3676ca028d56a3f29c0f437e57822 SHA512 f57e293c4f04ae2107b4967c0324dc92a80b430ef46b606c9f3188865ac3595b0b301727db29e3eaeda1b49ec9b0dc0a45c0ee62ac35335e76e43392e42f54ee
-EBUILD libisofs-1.4.8.ebuild 944 BLAKE2B 758326830a2786a98c9e7632d9afb46cf7625bc46787a54eecf596a8159e738fd51470cbf140bd78507206fa40c237e58fc7527af7ad739ed2028c5f00c8ef83 SHA512 339fb385a3334639db66bdeea63a247128ad07ffc8955a32238248fc6e9e8e2a01a61b6e3e923921e8d5c887eb19e35502aa4ced49c777ff7a8888f67821bb1d
+EBUILD libisofs-1.4.8.ebuild 943 BLAKE2B 09cf690c8c32b58001b18f2d09931c1beca88841dcb8ad9cbedb1f402b705bfe20eef27bbe5a5756fc71587c9eb24325cf9869c0c745e6e45f5f7e48699f7bea SHA512 1ac774332041b72c4decbf1c6e58aae3e1d7eac9be9f341289da5db72c66a76a03fc782bc9799f4adf8ee07d3858ad0a3429ab1cc34b320a1d6f379212c88e45
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.4.8.ebuild b/dev-libs/libisofs/libisofs-1.4.8.ebuild
index 344fad5c5cd9..7747207a43d7 100644
--- a/dev-libs/libisofs/libisofs-1.4.8.ebuild
+++ b/dev-libs/libisofs/libisofs-1.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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index deb1357dd2fc..b8ac97d82e56 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -2,6 +2,6 @@ DIST libtool-1.3.5.tar.gz 538884 BLAKE2B 769c0ab679d5665bb729f97dc5c02b6e8921532
 DIST libtool-1.5.26.tar.gz 2961939 BLAKE2B c12ea59cc828ee7aa85ef445e3b0586ddfa8629824e308f46c74ac64dd8b73f0e4675d6673c09d76714c841f29b33000318eebfca3c5d28657327017e30b2372 SHA512 fcd39856c8cd457c97f176d5f6ce97fd93108808ce24315d179a7c9ca85bb90e799afaa83bc283ec627d73cfe0e0710d36a1ee8f39c9963cf2e806e64a0e0bcf
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 EBUILD libltdl-1.3.5.ebuild 905 BLAKE2B 17a29c9938412946e98535f381d2b52356066803ae38807a2c7291a7bfb5b2c295d245753bd1c90f0404946e33fac288b939d65fe83317a369be8ef8aeb8dce9 SHA512 046ee53a680c7632700f78af5cb917cd8c9e284677020f36d342f88654f2253d47a3ca1ad01ec7b06797b9d8f5f64340618490f68699c23bdf124ccec503027c
-EBUILD libltdl-1.5.26.ebuild 878 BLAKE2B a0ec72f103b6f65fe16aab9c4c7cd371076dbaf5c013af07eb57a3827ec8b231d8a2cbf26d283dfe5a2c287a5b8248167178e11a9b4e73b7fedafb1ee7b9f80f SHA512 fabd9c27f4a6eaa68c7e8344ee33189402fab8b69e1ebb56e0e909925d88c6f4f67f718e28568411181c692613af69c4ac7b66fbeab2ba3deae5f9c20354065b
-EBUILD libltdl-2.4.6.ebuild 1280 BLAKE2B 985f7a95c69e343aa10002f230114725d386394596573221482018ddc0e55cf2048df2ade4c84ebdab20ea8f77eaf243360c13a97db572f4ecdc2e09ce325671 SHA512 ecbffc27145a5685c0a25f9413c24f48bc838b68a151b4c374e4572ce46bcd298015326436b1c1661a4529c97af670f8e8657640cb0b02f2fb2e83cf3b4a4787
+EBUILD libltdl-1.5.26.ebuild 866 BLAKE2B b67843df8ba4070f31ef8924b38a4a8c0607617b08b087dee35be01d2581fc04b6b35f5c81035fb43ed804e4424c38be69460b9c5243a0d1cf6a3206d920933a SHA512 8f5d1ba52a19df56d5efdd1a3dc9cc1085cab22b69badad778f6a10cdc5e9a1771216dfece334cb48d29b713881760a170770d58b66a6ac182a5e58714b94c71
+EBUILD libltdl-2.4.6.ebuild 1268 BLAKE2B 05f9e17309318a4c80fdf4d825d2bfd52daae49ed404b5c05beeb72ea3a17b616e0460c111f4d388057a4c2ebcc090753f0923c551094e303bbd3ce96dbe737b SHA512 b95b5278c26181bd75aad261f60cabb1f8df7f7e5f87e17a83435fd22f52bfc415ce36eb6a8938b9f92749075d65138755378822850e679d1615c1e52f116873
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libltdl/libltdl-1.5.26.ebuild b/dev-libs/libltdl/libltdl-1.5.26.ebuild
index 96f5287229fc..7e35734843d8 100644
--- a/dev-libs/libltdl/libltdl-1.5.26.ebuild
+++ b/dev-libs/libltdl/libltdl-1.5.26.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
 
 # This ebuild provides libltdl.so.3.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index ec7ffc45483a..7179425cbe86 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libmemcache/Manifest b/dev-libs/libmemcache/Manifest
index 9b59a54936b4..bf93a2abd9cc 100644
--- a/dev-libs/libmemcache/Manifest
+++ b/dev-libs/libmemcache/Manifest
@@ -2,6 +2,6 @@ AUX libmemcache-1.4.0_rc2-implicit_pointer.patch 385 BLAKE2B af014156d4168b9216d
 AUX libmemcache-1.4.0_rc2-inline.patch 2051 BLAKE2B 80b6b6afdb818f8f27d574f30aa2b8f32d627a94d3d92c31879328f0f0d1ecf1a6afa6c445a04efc1a8bea966de936c33ff1b13729c4651d7467b15c7080df97 SHA512 f5f817ffffeaccd930e83f099c0786302748afd13946b408ca63fd89c5d77d0fe7a6190ef9db7ea9da3882c00ef6ebeeed109c527bbc1ebeadef193e193a0cc6
 AUX libmemcache-1.4.0_rc2-ppc_ftbfs.patch 983 BLAKE2B 15a7b9e02216ed68375d7aba2b5b0b65d9da522db74d6ccb200ceaaf1cc1ff61872db6f657cf832894a02cf0c59448bed52795496d0edd9a86d3366348c052c4 SHA512 4ae7d6b99982934e7a28f7e0dd103341e9f4b7eb514e20cef3c02e428ee8c555c71c8bfdc06f0771ff0b73827251fa5eb4e7bce8014cd5cf2f5148d18b1f56b1
 DIST libmemcache-1.4.0.rc2.tar.bz2 301136 BLAKE2B bd30932811012e0d6e383c42fc3e61096d3a4d38f111bb70f04313119aaa1ea65c8709198b3edcad5dd136a809656dcad58603715115cc44affab333bf750302 SHA512 4b8c09c425d48d0ad040d3f01ec3c0d88babefb702b666d5cb3d10eac9993be88d00120b57b6224f7d55ae979d3136de10d5ddc793d9aa7f8b9531b5d79449d0
-EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1042 BLAKE2B 96a1ceb60a04859cb09a1f9eae486538888396b4f8ed26d4607f54ffb795d06475be415e4efa930cc2c650ec29329ea3fcac0dfbf33e647c551031ca9c745a6e SHA512 232afae4296e1362764ea1ed0ce568eb0efd9396c921b99d0e8b71c8ea437b12f32ae677bc02a5b3d3bc7ba90d96af83087b1a4241f0705aa84928931ad5f4de
-EBUILD libmemcache-1.4.0_rc2-r2.ebuild 1061 BLAKE2B 7fcee048d7c601c3ba3436c336dd808f348d0ffd895cbfe840fdefce9b4d6139330d61a3dfdbefa14b5a14d9f88fdb1944943a8a7677689588f821b5f16330dc SHA512 db99d49c555e6bb364fedef4450ced5bea0e30fbc9abdb91b68d08ad349ab1abdc182120b4810d10234d0006581f92fc0ddde7a2674b6424ca46715a0ce6a6b2
+EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1030 BLAKE2B 7e038a0f30317fb2132f4a6a749e54de01cda756a1dae538a36c8766373c17b693f4b4622171d7d8ff6a2d8dd1b63f8011301a685ac35714e568913b752d0a2e SHA512 a1b47e5493075a59e482e43a32978c9412e3e015a0b999c20fd4ecbec897a14fe70488db918c30e5792ae1c70c46762bc297db9f15e51004770b58270ade357c
+EBUILD libmemcache-1.4.0_rc2-r2.ebuild 1049 BLAKE2B 5ed7c99d2660abd11eaaa687789c9acd4985c2c7686d08a87153ebdcbbd6a24028a9019823ba023ab2f1bb3704de91c822800e697dc8352581050f7a1da87045 SHA512 cb342ba5a13ab8a980739c8bdfba0061a2278cc7c6bcbf230e6f23331e15e482e20a8e312ecf26e5235994194ef7b645d6d3ddf1a6deb3c05453452ce05caa41
 MISC metadata.xml 304 BLAKE2B cf6f26fa6563aa19ef922e08b525d5f70af1e8df8ad6396a67ac6f956b75879ab0af1f7d65d2306518f56d52480bb27a7936fc32e31b858eb4cdb4db9ed19fdc SHA512 de92a462028eebdb520fd2a745eeffd845615fbace7691bc954997113a2b0f273f5b9fdcaebc299ae510d3fafa611397ac468b8b13fd44c00488fbc210b3358c
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
index cef85c7e1c23..f8bd1277e504 100644
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
+++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
index 30154cf19961..b3b5eb44e9a0 100644
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
+++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 6418bf10ff5f..d27cade1aad5 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -3,9 +3,9 @@ AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.14.ebuild 1141 BLAKE2B b0d6b34378e4232b176499157a38c4054c0bcd7e2de8381a590b2623e631a8766490ae487f103720ee8fddcdc8c069b8a05ddb957a36b4a686ba6c187ac9a7e8 SHA512 3ae6c31505deca27858613d40168012e8ced46262f41ce8fab7ff822b2255944e1bee8646800fb54325aeacbbc6227e05879ae6448f5d4527aa4e6bb1c8a6257
-EBUILD libmemcached-1.0.18-r1.ebuild 1528 BLAKE2B fc33e62cd363d2d87f97078fe57f1f5085782428201db29b952babaa2899e330fd8d7b14727de0c1fb5077e2dc11a077a4e06ebaaa4c217b41690156eb320fd3 SHA512 e5043ffabbe07b7d9b98c1bf2411d705f99046fb8c1133eaa80a65e2e51cc97274b6568b167e4f720e983977f703daf067faad0fcf94f5a79f120bb8fc560b84
-EBUILD libmemcached-1.0.18-r2.ebuild 1548 BLAKE2B c4092143293265b13b66a4ff6905df79b889f418551eb62b5dea92a4f9666c4ac31b563ec7355cb374d5a798b2e3a6bf3b91e4088dee006c414a3a53071cd2ae SHA512 d335f33d1d7137283c10a39d9913fcfa5cb3e69c264ceba527fa54863adc680561406c69c3b29173bac42aad4d7d9e1971aed7f9890d698c75746a8f8fb99a49
-EBUILD libmemcached-1.0.18-r3.ebuild 1622 BLAKE2B 4df5c628025f721bc447a9059972218e924ad83d18e3bf4f606e8ebbd681eb06e142c33795cb8a864e69d3d06161cd492d3ecb6d222882e1d0e2117c59a51b0e SHA512 440fb952134caaf031e12252991c8fed6595b2a4dca158a94253a0075558251b3bc6ad0f2db42317418b3d4071f46357b35cd516a7d0c47c59609ae477d3c072
-EBUILD libmemcached-1.0.18.ebuild 1464 BLAKE2B 46c50155c6ee2167bc3433858762e098665ab54110ac61e30a43180b0eb175e72251f14c06ca3fbe5d869fe2d502a37cdd48cda97aa84c68b21c86d636ea8035 SHA512 8a05fda51b53e3d3a6d9d2b695c592425817972f721618b79562f05d0e59eb50fcb38faf4153c0996c45c25f152031b32a1d6047112d701b84c93f080db306eb
+EBUILD libmemcached-1.0.14.ebuild 1129 BLAKE2B 52871bd77e5f913ccd7d703d21187bdf165245ce30018aa7e3e825aa4fd68614fad5e7648428c2c6fc0f75e0bdda381d6914c2c81f221689790ad092fe93c0eb SHA512 52429bbb7c05fc095f7c9c90ef2e42dae52eecded96e60c3dfe91a86c6eed43b077123ce5a5e3519aca12219986a8f12032cb865be01f7d9aa8bede8b215019d
+EBUILD libmemcached-1.0.18-r1.ebuild 1516 BLAKE2B 3cc6f403c3f161fbb8cf24c5af5932eda7497447a9fa5590b581e345537c6ce5658516631fd90c6a6e02b3046817683423e9ffb42e13f61fc9ad75ba0782d112 SHA512 f604fd2df67d929f13b2a1813b881b96844f9bc97d2ae8324f52646d5a52abd3aa6647a76c7f7d2fa5d72652ca2ae0008da19257d7e26c9cd437fe044b9b2722
+EBUILD libmemcached-1.0.18-r2.ebuild 1536 BLAKE2B 2f5cc8f43e879896d16950028a76e91091bb370aa2ba889566caa3afaec127f49b5d618e62ebe94693f51782f6b7ad0e23e7d9ff4431d5b3fa00d31cc08a5a88 SHA512 ad63b8c6f385cb8660586b9fa4169b55a318af9b9f659f618917188d0b33672844937d2e79bc4c01d9a6c59a0d69abb0f7d3a3a906a369f56a5a2de5ad493879
+EBUILD libmemcached-1.0.18-r3.ebuild 1610 BLAKE2B d2080c57255f7d6527f5799a97e729adba6cedfa7f91156b883b1af0a6a89febbafc941e9124acb67da777c1cb0c94e69574781f3b8ab4d4b0097947296b7c5d SHA512 33ba4f396c80db7eac9a15b5b866ed4db844eb94b02bad995a1d772990d6f3f8b4cc465f4bfbbfd409a43ea6fe04bb649b1c7a3ec95da343e0bbf17a861c1276
+EBUILD libmemcached-1.0.18.ebuild 1452 BLAKE2B 2eae8ce042b00d87704e300c9773359555514e96104c6dd182b239c56024b10422f9c67f7e6f323defa3c688af1d59b6d2997ece4df9b3922c56a4811c71abff SHA512 16a92236938f4b9ccb6f2a7bfc75801f66e21a44c68789ebd9b28477d9b5ddc817745753608f9fd0649541a401c3efb71d7f5a5675ec4f16b9d3ada1108b1eee
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild b/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
index 41511d243252..e80ecae12f28 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 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="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
index 347d256267ad..573767f416c1 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r1.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
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
index 6f825c8b7c44..f5676b7b2a8d 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index ee91b8ccdf37..46765994581a 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-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
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
index 45e2bd14c2c4..0bb1960dc4eb 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index d2acd6d925bf..7fce389da7ea 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -5,7 +5,7 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 628 BLAKE2B e6851603e6a26deac9ff
 AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f1689ddb79631e31e134d6de844dfc4b3e63a15aea4f0737773ff0a8e4fbf3e9e80ea920d1da751ba2165a7b3b459dfbe0d8673c9a9da95f63c SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9
 DIST pcre-8.40.tar.bz2 1560119 BLAKE2B 121d2c9f8c403a663fe27a68030faf09a06dec5e6a25ae8d62e06887850e219e87c71a14f6ded084fa25b719067acb71c89c66c81f6f09f55dcc51feaf41e737 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
-EBUILD libpcre-8.40-r1.ebuild 2849 BLAKE2B 7bce89892b62a713618fd329b757c38ed542cf6689012949c06e973e975ae9d1bb83c891861b8469f861368e0f431f1563b2dada6a8263fe7597d943cf2f13dc SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f
-EBUILD libpcre-8.41-r1.ebuild 2903 BLAKE2B 421b0879eb21e386ab25e9f40beeb55563569a1be6604f4f19d899a4df9ff03518e891743660d2a67b486ac8c0e8d560bce778ce2684bad500ea2e8577e74353 SHA512 1f794ba8485372a0b496c5b0f4b15f6df1e23c725c313cc1ced71b99e0868237b939756ae49e74cb59a57a319d3e3592f92168f85b5da799cc8e5a1bac970e4f
-EBUILD libpcre-8.41.ebuild 2845 BLAKE2B 446911be253d61cd920160627bfa803333382958fc33398154756be8f7fb29c8e461eb7cd456831aa169882b6f9873e4ca8d9d9303f9bcb80e53fdf915b7b6c6 SHA512 7b12d7fa5da2b152a3ba581cebe3d2f5535f3bd810887b17acff16271441d0d5350853fb0e8f3b407019c7d2e0910dab01b7b9dab0f16426a909b73f6f6b49cf
+EBUILD libpcre-8.40-r1.ebuild 2837 BLAKE2B 448c4ac719d4eab9bc73794f6d5c37a803af0371637b7b165155dc5a1d7cb0aba8b32d11b8f3c4c634fa3f2adafc0c42e4bad1a36e8e70173f2d42ec42401f2d SHA512 ad81f5f1e5636d86c853b0534001923712d4a9903e464bfff8216a106c29915c3b1e1d1cbd961a34d078c744aa4b0727a5f085fb75c6e0ee1ecd2e35b618417e
+EBUILD libpcre-8.41-r1.ebuild 2891 BLAKE2B 473ef0a5ebb5bfeaec79af342712adbfeb4c6d72fc11d552e1f48452af0628bdcfec0f88bac79683181eefde5cb5bbc7eb56fcc67e4d10095771342494558dae SHA512 67d54dbfcc3c79ad893727b06eb7ea1029da53fb2cf059e9be5aca9aff4d4e28f6b16a857512cee6e56670c2eb00c7d8848c14492f4068d7e588f8c575387701
+EBUILD libpcre-8.41.ebuild 2833 BLAKE2B 1fc1d6613c48e6ee528ff5ba7fee27803b96107992cc560d841328cdad88f59831ad8bb9ea5f8c18a69398dd0b54bca6b902df9bd1072eed9248c2bf6772ae65 SHA512 9bfc4346d2f0b98cedaa8bbde79c8baf3bdf1e5922d697fba39def8178af0deb7622edb1eebffd948eb1da8e8cba9f4b055836dcdc7a3e73b88708747804293e
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.40-r1.ebuild b/dev-libs/libpcre/libpcre-8.40-r1.ebuild
index 3b1c5c161f05..0f6e7c38bcb2 100644
--- a/dev-libs/libpcre/libpcre-8.40-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.40-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"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index 26af9240884f..5d5edcea7b15 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.41.ebuild b/dev-libs/libpcre/libpcre-8.41.ebuild
index c62f7c4cccae..e167ae0e6ea7 100644
--- a/dev-libs/libpcre/libpcre-8.41.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41.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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 8b6b97be6ea7..062ea8d4e136 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,7 @@
 DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
 DIST pcre2-10.23.tar.bz2 1515314 BLAKE2B f5900bbd3dae401180299092751700840b628b6e1e766885436dd8bda1e22279a179e280994ef6c6c98bb2af1ec5002c283b2c2ad3ee0420c3acca814ca1742a SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-EBUILD libpcre2-10.22.ebuild 2332 BLAKE2B 9836c5f234ce946d68c4e72cfdd2af039a9bf3664c8bab49a11a69dd3fdf337966cdeb2fb621f4493ddd0afa1ab42e56b21e3b0858ab84314a67069eb3448a1d SHA512 2dde1a17abd2795e57aa006a4b7f2a2e33c8d64d03ef1b9f106fad617f3b72ee0f897fe6e1263fa6244fb3e8c9a2ed18318fcd209232bed7825ef4cb71a46061
-EBUILD libpcre2-10.23.ebuild 2341 BLAKE2B 60d9fa579e14a2384c49d559ef6efe4ed1f62655c61fdc0b839f219bbe161bd8499251a67a84b1a726d0679fa29d828b3a667346a080b3b0a685194b376e78a6 SHA512 f6e07b46cebc6ea2a5414a1a023124a1078fe1a2f11b3e31b95758c7f77e95b6b455e86e89385811d6b5787584cbe3a0564d2aaf8e39f4112c9cb255641c79c1
-EBUILD libpcre2-10.30.ebuild 2351 BLAKE2B e9c44ebe6e2d100a1cf700a143f0e6c455bcffe8b8688e8bc1defcaf0777f3ab89a2ef44431bcff773332a7ec8b5c62d6ec4f7a4511fdfde2527437f6cd1fbb6 SHA512 9d4067bf15e51df5df51f991e7812ee61a202321c1a69bc5fe2b22dbb56e57945bafd592f24e5c90d6a38366d440f207ba64e65ba8ec37190371fd432f9a8450
+EBUILD libpcre2-10.22.ebuild 2320 BLAKE2B 21a1d2dee729733bb618c8febe31df823cc8058c2ee09dcb1bf79c82b332c6a9cd7051dff4586bf2f5f7cf9f94f051a6b988bdda2bd80051fcba6306052b2d98 SHA512 4763d6daea9bdd4bb8dff8f24e3b051366eb728cf9019097a344ecb3a497d6950f7e352c7fcfe240d6f596c8114f001d562f01f2da953b975b2f805f59c30a23
+EBUILD libpcre2-10.23.ebuild 2329 BLAKE2B af4214bdab9d05107951eee2f5ab079b08b7667ce492c534ed6e0b8b75d36418a64ff40f31b3af499994f0ab7ed58bcade42b48d610cb7f5a215df141793663c SHA512 9ac3202801afb4b8889c4ab8b767d283771caa77be01ffd3741918ee618107c37742ee3b4cd9abf4944b70cb8d1b459db6920abac55c18dcd4f3539a01ac8b31
+EBUILD libpcre2-10.30.ebuild 2339 BLAKE2B 5fd326ec1dc0c4a5d54db90621ae6b9f07c91c4fbb9bf956e446705166d52de87c695fdcffde61e7e8233b538593558ee11ed9db79f1cd7263203aec647def76 SHA512 47979b06fed1350f34305eddfe073a791f91da379a0f05dfd21338bd9131911106dcb0bc899d5a572ad15ee1ddff1aac772216dd6ce87e1f2738ffc79bcf9c34
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.22.ebuild b/dev-libs/libpcre2/libpcre2-10.22.ebuild
index 9b304c598688..f4650a2dbfb8 100644
--- a/dev-libs/libpcre2/libpcre2-10.22.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.22.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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.23.ebuild b/dev-libs/libpcre2/libpcre2-10.23.ebuild
index e0aeaa588742..226ebc4fece6 100644
--- a/dev-libs/libpcre2/libpcre2-10.23.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.23.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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index 0cb030245022..835bdd9807fb 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 507d2983e836..550281573e8b 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -4,6 +4,6 @@ DIST libpipeline-1.4.0.tar.gz 805155 BLAKE2B c0e1c774a0e165b6eb7639246324a2945b0
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 EBUILD libpipeline-1.4.0.ebuild 506 BLAKE2B 7d1beda92f086bd19b4f286955fbe71aa868e3148a8cbacfc0d2fa7513832f08ab02e07a61cac700a62a7ab988426e0422aecbdb261348be011e65fff9230da1 SHA512 9215eda7625f54b82d9efc9c4aeb1246f333d4bc9297939fc6d325c933d919c8c0bc5b570669e0c3b16e74f20883dcb37c96925f4350fe5a49fb435c8e500107
-EBUILD libpipeline-1.4.2.ebuild 681 BLAKE2B 4a39a2a6d7c9d2c8acf8274a180150b5e2d9865a34e636072bc18c8c26e5ba78dd8186fe6b66010f49fda5b101c1dbbe692d45dba94fedb3948e163a4714a1a2 SHA512 3d686d87b6ed7de6ea2a1ef2743a2e96dc3bd6849865af556dbf3758dd0215473f3afccdd0106e50902d50481c322e6701430e86414f018ec4151da9421777b5
+EBUILD libpipeline-1.4.2.ebuild 680 BLAKE2B 501225479d5caca976fb41a7c84c1b096b38b4762d68a29d62b797dbcd7098a88fa4864f9642cde0a0e625c42b92b1961c8ca519c1afd09cece34d185823cb95 SHA512 a8155eeb8f021d8936c26d1932e4cf3e3aae3402fa85c2cf4bfdaccd130ae2d5dd987512c3addc86ad5b5cf47058aa44faac07f7fb6e7f162737ed5adcfe620b
 EBUILD libpipeline-1.5.0.ebuild 785 BLAKE2B e65b17fa1e305e51d0cd87e8e0e4d45d9e36deb4d59c8d7865a6faa6611d620e3d6a050bf11a8b3e855c1c98afb8186ec5bc6ab5928dcdeaef1266ed64ffee80 SHA512 22a844d139bbcb2bc729fcd7c9e75450d5ae2444d99b2a2a7177ab66dc1a49ac89da6a900baedb576d9edc78c639086086491e47bffae6830e5d8cb77c7a5f64
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index 768ef83c240f..4763b1ffedb0 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index e3cb40eae7f9..772e39a6c3de 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -4,5 +4,5 @@ AUX libreport-2.0.13-json-c-0.11-pc.patch 1780 BLAKE2B bce31a7535097d11d26a36afb
 AUX libreport-2.0.13-json-c-0.11.patch 1145 BLAKE2B 2e4bd653b4c378875ffe846f8cfb84f6feabb9e571079fee873c064a092a97a89b4cc7a82e53c57a34a8a9b7510ddac24f907f4dc92cbc3cb6563247dbbad46a SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67
 AUX libreport-2.0.7-uploader_event-syntax.patch 610 BLAKE2B 5bdd1835310125c3adddef9e338928505e204668ef5448d4991fb67cb9742740dd802caf67d3be3616bcc17c1022f48a4f3d1db9989e171ba30054985b53d0a6 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0
 DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296baf9c40f12f3ecfefe68c82281f62299887511a096196b4fdcdc9245ab268592dace4e728c2c34af47581e52f5132 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181
-EBUILD libreport-2.0.13-r1.ebuild 2166 BLAKE2B 1e21bab1b69462a70d49bd59b56b1d9b0f508947c767bc755b0b54ae1ce3b8421949b58985f95a579243109da9b44558c7a75da6a530a9e61cc0df776997344a SHA512 ba7fe4dbef24205529dc647e868ac369963abfded775e6b39bf715ae8fea6f91a436b324d545601e0ea7224b939dce58e36e9d5417b7c034806fc360966c5d35
+EBUILD libreport-2.0.13-r1.ebuild 2141 BLAKE2B b49f76f03adeaefd952003d1e7bb561b10d7af1b7b399748f0209cd33ea9a40f49e3861e95500a781eaa940735b6d387cb6d168411672d234173e15edd4b8979 SHA512 c0666dd82fcec73ef563886376a6d1449e505239308417e8145e2ce5b394dcc9b4811e9cc3f166a61898b6c7877831b66a1c0d8ef8c76d39e4b5024a54ac4ce7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.0.13-r1.ebuild b/dev-libs/libreport/libreport-2.0.13-r1.ebuild
index 0fde323e9f36..13ec36a6da4a 100644
--- a/dev-libs/libreport/libreport-2.0.13-r1.ebuild
+++ b/dev-libs/libreport/libreport-2.0.13-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"
@@ -33,7 +33,7 @@ COMMON_DEPEND=">=dev-libs/btparser-0.18:=
 	${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( gnome-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1  >=kde-apps/kwalletd-4.8 )
+	|| ( gnome-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index bda242d8e998..d78a015ab24b 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,5 +1,5 @@
 DIST libsigsegv-2.10.tar.gz 402279 BLAKE2B 26c6549682828e89808b2fb062e4e6610d555ad9f190231c5cbc4a1707fb67b4747702e0a57b761a6da4bb9c7c95cf0d5278e7c3150922dfe3c4218780bdc483 SHA512 9464b3343af5042169f208781ffa9d1f7e5e1ee8654c1e6aca5581157b43eedc5ee504a56eb905c61443273bcfc8da6822ecc6499c5f589570ad0ba02d8d8cc2
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 EBUILD libsigsegv-2.10.ebuild 792 BLAKE2B 70d6295f4df6e61a8062fbe213160a3953cb501412e46b03901ed94de46c1c38be11e4502f54da8b94df085ea6d3a396948acb5050c945108131c89a262140e2 SHA512 14029239ce20b64f0cbb174fcf92929b034fb555a6398fed37847f9f8c5fe8868d0d20bfb4e40ad7edac20a5f0a7aaff5f64d9ba449b96f2282a0c9d8e63281c
-EBUILD libsigsegv-2.11.ebuild 874 BLAKE2B f988318984817214d0c46db392377ccbfd9fef73d5d6f32ef1b6c964fe6baf2cbe297f84742a17af17179af2e85c069f455c9909308c2eb7e31de7f6ccc7986e SHA512 e6b8942eaea3ebfe7f31bd17b830893984284c3f414fcfcc42532977549d121a9a5413f40a6358f1e1a254e30bc4f23a92866045fabc52868e81cf6daae8763d
+EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index 605dde9f3784..5ab74d80c3a5 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.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="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 40beced80547..aac53b9cfe37 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -7,6 +7,6 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
 EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
 EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.15.ebuild 1046 BLAKE2B ad606013290b6c0850427a969e3824ad5dd218f96ab5a5ccdf8738f1c372626f19903ca752c2620f003674f0e3c2e69eaeb613a71f4ed37e4ea336c28fa117d8 SHA512 3dc47d37b700843c5f0f0c731338087f3dc1f2a7e9afb7fe9fb5543ec6efc16fcd49f35b86aa64bb23c4869f817dcbcef3416ae89c6dc5f9ea232e9eb18feca9
+EBUILD libsodium-1.0.15.ebuild 1045 BLAKE2B 7e4e7cf862c8a36d00b8793d4cd1674d44d3f2a57eadfcbc58152bdcdbfe3ac06804c35dc5194ae590c8398787f453fff959f812ab7b5dd478d20465b6ea6177 SHA512 7e491d1837ff290b080b731e62ab87a69e80f14fc4c9cd25736a78759ea6c9221a56129c29fc6a3df67e973b0dba5f8959ead02c2dca410be0a736dffacd8271
 EBUILD libsodium-1.0.16.ebuild 1052 BLAKE2B 21aa9d136171cfde5a9106a35da055ed49e64c0003199fb227c6ef2e84c81f52aaef410d7e4f87d437a2fe2405db9a22cae678a21f559cab15e73c421da6243c SHA512 2b8fa23e372b705de59318fca3f4e06eb66a95ae2105da8d05c180f8d083f702c180b4b328191eb1d720ef05ec886b73c88cfb4f9882faf7cd61fa7a92be2113
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15.ebuild
index 9200cc73c31c..f21ed3884527 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.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="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 1b08719fe923..f747000597c8 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,6 +1,6 @@
 AUX libtasn1-4.12-CVE-2017-10790.patch 2268 BLAKE2B d3261e687f14596ae091951de1b70ab9e29f870b12470e2edc5d8d4b7206042ab6f9a39a1ad47bcc0226220e63b159b638a30f53bbd921868e192422d2ffcfe8 SHA512 8e9dad0a1ee7cb7a8ed3d2a60c1c1bcb3e1ef689dbd2879992d4098f36edbae3bb962b9c87a0a9a77335e83abf10fd72bd78bde99989421c35f4434a9e1d08cc
 DIST libtasn1-4.12.tar.gz 1888450 BLAKE2B ccd3d5c7bbc9d00fd5be125a60b1705833bee4dff8bd0147cc6a7ed67ed679210984dedcf5d76f701ab53b8d7c127580ddb3162876aea9e1142f518271d12252 SHA512 6c551670949881193e39122f72948e4999ff1ba377f9ee5963d0a4ad1b84256e4fe42e9f6d6a2aa9f7d4ef7acc0e5174fb5cc3df5298524cdeda92f4b8c104f7
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-EBUILD libtasn1-4.12-r1.ebuild 1374 BLAKE2B 267d9282657a0e520f666a4771f128805e8c8646609e8bdb027add6baaaf74e1415fddb6b4ddc3089f6b90f8ec735d9cb95e84c56d5e7b7e123a7f4cf8e4ec42 SHA512 05777e5bf82b964530eba729f7cda139899143c5174c47a33c8bc0414f661d4ba5c27c088845aeb091d1d8e8fdbd9208be9f2ab363c461950477c7d629a2e12a
-EBUILD libtasn1-4.13.ebuild 1329 BLAKE2B 80ab028025a33ce8f38b4b4529bbc9e49797813a88202c0c8397bef827985f360642460eb340c089ff16871b55abc83b02b1391046d3b2df7bebfa9dea6386e2 SHA512 714d1322727cf67d812605cfb424921426781fdbfff800832adba9ec7937dcd1012c485b50acdbaf8be7d2fc95197eccd00090d53b4a380593f732b6f8fe2a2b
+EBUILD libtasn1-4.12-r1.ebuild 1362 BLAKE2B 6958998af93067f94703aa334880531383277b4e01bb0cc4155b6d50138480a28a27765b004d6977efca447e079d7d2dfe5972a694ad286dc1e266a034b1defe SHA512 5bc3551d870ecc6606bde39bb9429356ccc831af143a9fbe3e6fa7d20d16e62250ac8f04f065cd91ecefea6003d16bb0a986c3c76cae3446336bbc3b57bf6d97
+EBUILD libtasn1-4.13.ebuild 1317 BLAKE2B f83aa0a4960c57fe1ac2adf802eca21912bcd24f192ed0e91de26e6eb2bfcc1c5043ebe5fbcfb8a1e3f86d0c96982f025b03da4cf3ed5de2cdcee8bf131956b2 SHA512 8d075909eb223252fe0065864eb458b8cf1e0820ff1db964cb4d7eb445ca4c0229e31cd49c651c0eec2bfb50ed29fe93af1618bdd96ad03613e0491eff12f383
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
index 581fad028802..e352bd2de69c 100644
--- a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.12-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 8aea7314e58e..fe8a2e521c01 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 7d6c4ae0acb6..e2a5db03fd71 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -6,7 +6,7 @@ DIST libuv-1.15.0.tar.gz 1158746 BLAKE2B 7ae636fd04419a423ffc6cd1b5f888b136de716
 DIST libuv-1.16.1.tar.gz 1165502 BLAKE2B 07f77f0f9f53caf44962c7ca5e107e6c71c7f656ea22c423e2af1ca56b9b6de56f0afd597a490e22f78a2459f8f2eb0b3418411040ef2bbceae7e55cca4710c0 SHA512 e75c735467c5fc1681bee2b4f4ffae63116644309016d0f507b37643697ae8c85b3be7309288b1aca8fa11c6cb1dc1873962d1dc18fa3ed8cb66c8d2514c95e6
 DIST libuv-1.17.0.tar.gz 1167930 BLAKE2B 2e38e400d312005f94ad671203b82794f96e5802117fe6577d04951687310a95098ad8d352add67fd356479fa6c63b7b7027f109a77987e7626d3f77a34b19e7 SHA512 274615dd67808a7b7481184aa9c1650f7646ffe714c5304ea123e287eb09cad2a4c677ac06ae68b7d0e70071545954aa6a80414cd7e37c242a2533563094870c
 DIST libuv-1.18.0.tar.gz 1167950 BLAKE2B 2c40adbc2c98ffdd3a8a9c30f90eb90e6b0ad16b23935e43d1e19c53238f1a57e422f6f9a3e00374283c4187faa65e13c3e1546ead3ff1fd8e30d98340947078 SHA512 d1ef70b0f060f40cf57b282279d1d63d6dd019b4b811211b2252db32633a80af46290d201b4a4338f84b3efdfe9754a11b29bfa4a7636b06540b1a65e1fd4fbc
-DIST libuv-1.19.0.tar.gz 1174555 BLAKE2B 714bcb8fa747d4c4400750333d30fc53c4999f51a9f979433e2feabff66aae8e2008782f07b10eeff8e43fa1d59d1e51cefb5625c112f382d4f02dea504a0b4e SHA512 b9dfe1df09b67dae27a9aa3a3eb8f3ef31aedf9c95c1361034defab21a017e3978a2e2db502847a0c372a34bffe176acd96616096aa692ef2f35cc854ac8e211
+DIST libuv-1.19.1.tar.gz 1174572 BLAKE2B 097a8702420ab2536aedd8df95d01a9a3dbff447252f28ced474314506b717589828fd6c86f0e90234c3ebafded95e01b2dd8a422cf690d37354cb5efe95ba40 SHA512 b903dd460c4bbb11011821d1e1f6c92474462cb6ff0dd8185604eb7726cc61c545dc3f59f5b418e9b31d6512beacdf4fcbdb868dd0004e688a6e34f3feb17eb2
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
 EBUILD libuv-1.11.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
 EBUILD libuv-1.14.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
@@ -15,5 +15,5 @@ EBUILD libuv-1.15.0.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109c
 EBUILD libuv-1.16.1.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
 EBUILD libuv-1.17.0.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
 EBUILD libuv-1.18.0.ebuild 1172 BLAKE2B e56d2dc284bb3941a78f528551b0285c25e2334a0d267f5cdacd8afebb8a67b1a6239b07e1f5c5b2d01dcbd80f9554ece094cb6860b23e137af78f59e25f61a2 SHA512 7c74b1645d499581c928b2c36d13c53449accb6a068b44a76bf7868c2a88176671a319f60e28242e0a7b5128a4e7536e0cdeabb2fb5474cbc27bf8e3c4abc01d
-EBUILD libuv-1.19.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
+EBUILD libuv-1.19.1.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.19.0.ebuild b/dev-libs/libuv/libuv-1.19.1.ebuild
index 1edbef416b0b..1edbef416b0b 100644
--- a/dev-libs/libuv/libuv-1.19.0.ebuild
+++ b/dev-libs/libuv/libuv-1.19.1.ebuild
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 77a643637579..4618f58e4da6 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -23,6 +23,6 @@ DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.4-r1.ebuild 6633 BLAKE2B 50f83c85bfafdbb20cd5831ad5152b2aaebcbdd8151a0aa796f6ca533f77dcb0ca3b892133ad111e9f9e55113dd47be6ea081220c10632968a186a5ff3bb4a9d SHA512 a125ae03d58a0ca08c4493e22b50d337fcb5ff9c015d6051adb3aac78d71e2bdf6e1bc0e2138675365af224dd147a6de1c88880da42f715ae6c04f913edf5a9b
-EBUILD libxml2-2.9.6.ebuild 6378 BLAKE2B 189a86bd8a949429e0908b46c8f9f2262a8ac33986b4134c61353edf3f5aad5f536ae34d1482db68917564ac944eec1184df134af3254df9ad20d1ab848ce348 SHA512 52dc4ecb3fe1c468273b7170f310275a27edbeca1a32b5eb9d37f181be08d2643fff0dc75682a8f6c71d6ab88a7650c7170b6c268dfb19818f8c8a41f4f4a732
-EBUILD libxml2-2.9.7.ebuild 6376 BLAKE2B d1083d8d940d2a60e2ca4c461c456e6469a4ef2446fd3a976025b094f0d9e1eecf1432291cbe7872c048c98a27f451d44b99df7880f78588c63b57a6940a8fd8 SHA512 5614c5b6b2361abdcb953e18eb778752cc6ae27e2fc685ae34087fb5ae64ce9107b0f1fab73efbbd7987cf6c0f47ae1aca6207d6e184d663cc5e84ddf6867106
+EBUILD libxml2-2.9.6.ebuild 6366 BLAKE2B 30e0fc36c5ef4383cc69af26fdd8a087e058485cae8e51d4fa66ef01b0b0a635137710931396121c7dca8141e272a5dda8f5328023b4aa74f7b76b40f2348e45 SHA512 01e661ff5ce990d43f45d5ed1b0d5090f1de474bc009daa00bd43c8487b3348016a0e81fbd14f02cdcdaa395199aef9aba335682edb2ac6e03f07c3f085201c4
+EBUILD libxml2-2.9.7.ebuild 6364 BLAKE2B 0c1bcf8c26f9b865a968c98297c25cb6200727ef997444e7811eb7478dd290d6e0ecbd2dcd16628b18348ab1d8ebd277700970826869d71bba1d289b31fe47ec SHA512 9723a5d83bab7fd76a4b825ef462463f151b97f6607b7145c76e4e010c5bb546e950b3a84ccc3b70e778fa91333d9a10f90be0049f9f2ff8527d4b47e90c3306
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
index e051d48f6e72..e1b36acddb4f 100644
--- a/dev-libs/libxml2/libxml2-2.9.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.6.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 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
index 153199727e6a..d6f152f66952 100644
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 7070488f86c5..d6d5e100e18d 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -8,5 +8,5 @@ AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485
 DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
 EBUILD libxslt-1.1.29-r1.ebuild 3252 BLAKE2B 46ca2f9ebfda27d0795ad4f041028eac85fc456733d1e91e8bb3b57999fbad4d7e6e12b12584eaeb0db9d48c5d0bf9dc23f038d3fc8ca8e4823aa7f2beeb1b91 SHA512 719a10deac3cbb09b7b2ac407f80cabbdb44457d8308d9760a253322244a96f4f8af048037875df7da87357ae3cf00576c8dac292eef47f5c009f7bd13463c68
-EBUILD libxslt-1.1.30-r2.ebuild 3713 BLAKE2B 6f1d15a8364518229b8aef49defa08d94e5d2ffd66a156e9c855377380365c53499ad7e822b39b83ae814d136cb2ce06fcc699aff6c1c48da43eaa33eb1cc499 SHA512 db83c94a6f60b9ca077c1beef507b83395c4b8f2f18fd6729480f12beb255f17357c0ec86dc201cfb0030bea8fbdde7438e6b7a2e4c936696d4d5cc87f021b3a
+EBUILD libxslt-1.1.30-r2.ebuild 3701 BLAKE2B cffe1a9a2e207d172525a51abea907873f1466b39a732b853f43c1f82c0f7815c5325f5f7ef081bce13449a7b53f2a8d42514d920b0f18696b50e3264174b7d7 SHA512 75b1d752952b606b4b6a87fe430b8ab26ecc2a4e0fa38483edcd2557fca9414b6fbf5ea3fee4ed9cf2616f253938f35dfef8fccd0d9e77eee84b4bbaed22e0b2
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index f303699289ba..efcf07da26d3 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-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="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 61ee164ccabd..0f7d742b28dc 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 1277 BLAKE2B 69f028a714472f958db2e9b5f433d3bcc1744a6e5c0150f18896a2bd39256962185dcb1e15703f0dd3e1e35dd68098485063bb0207a5cac7c468e829604b9cf0 SHA512 915f1ba12d3ab72df84cecfd6ad0d264d6b93ac63f8f5bcbec2f13e7aed5eadc86ec9720b3b71e73497fee4e3d8c32e5d3f4cc1337a16905801b10c438b506b1
-EBUILD lzo-2.10.ebuild 1064 BLAKE2B b1fb003ac261a8b758b6cf682f4c105c9a68ba82f1e6e5051597a2f226e9da4b311a5ca83724702ccfb095257e02b9b2566893a06c058b2e864d63a237c4a52e SHA512 ce233fba8d1eebabf506a75cf7ad98661befc057220c0d5951466f7f51df05bf8705cbe13b1bf4a31a14bb971e2f1afd88abf5f2cb419d441e946ab1a9413753
+EBUILD lzo-2.09.ebuild 1265 BLAKE2B 839965c53282f70e78047e154f98e95eb2b52f38b754f8e52b86ac4362533c21fa14f84b0580cdcb2550de2d9a7c6a46a015824b4a825a91aa8c172ec9eecff2 SHA512 91bf42b3703b4750525a19eeed8d9a0e5b3622eab3563b8d8cb2279ade7c90561a715488dfcb4184b98e80060972c45914ef53d326bf4a42801ced509b8e49c9
+EBUILD lzo-2.10.ebuild 1052 BLAKE2B 391d889a02b1ec71011478d63d2adc5f4d0b1751f499b1c2373af024ae765a4dda8394a88bc3704b8023247bca1efe945ed7808a2fb1be3d6e53ed6f0d7bee28 SHA512 6b91e8adb2db7909b8396925af2ad95d143e1e47add4971d9a61e0b9917300f191731c75cdca003b80e1168c90b7e6fa4fd9cca02cab0a37408aa19f781faa1c
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild
index d1161fb20e72..fc7c306866d4 100644
--- a/dev-libs/lzo/lzo-2.09.ebuild
+++ b/dev-libs/lzo/lzo-2.09.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
@@ -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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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"
 
 RDEPEND="abi_x86_32? (
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index a8dd8d64aef4..46bddf38642c 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.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="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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/mpc/Manifest b/dev-libs/mpc/Manifest
index 32e86542301c..8f6745dec488 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -3,8 +3,8 @@ AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8ee
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
-EBUILD mpc-1.0.2-r1.ebuild 993 BLAKE2B e079992e59b38bcfb8d1c24653d525b33830499ba76aa6d464fc844060de1393a09931fa8404d5b4a9aff077865bfad24200868852731dde8d3e9e5e9f94a659 SHA512 43c6c7cd7c33293b3539eab725f245da896516bb447b5e750549b9bf7f63b65477d2bc72ed5ab6fef015556a59cf7b606240253472079376cde92818d8fffff6
-EBUILD mpc-1.0.3-r2.ebuild 1117 BLAKE2B df2cb9956c46f6d1ec89787b83c4b44fb701f55b9e37d3b90a1478e827f6e10aa72d799bfada27ce20925f8572ca666a159d05b323bb66e0d2ec17d2f1dd933e SHA512 91fa1174924b6fd6cb8e7a3e3f3255bfa3d44b39c61973ab647f23c6509a3356b8b7d34f572cdd17d01516ef5fd39e00eada1192d761a96d7cd609289abb2e10
-EBUILD mpc-1.0.3.ebuild 1005 BLAKE2B c7282174e4d3b5efe19725581d0b6070551be9a1c401aa2aeada18e73c2b6222bc5c24696eecaa0181e5b2b3765c520247f5be87add1e263a975229ff81a9f9c SHA512 c9186aa7715afb1404f193c7aa6e5852dd655bdf1a8b5b267530d81019378232e23f481cc326af000e16dd06162f167d55e2a5c4ed2176150a8e124113af09ae
-EBUILD mpc-1.1.0-r1.ebuild 974 BLAKE2B 9e5ac0b8b2f1c202e74178895f1e1304e9a6096213bb53a4af6b72df78a8572756c645014c475dc183e39c12f1e5b104afb5a400a0ae3a0fe8c0b268d901c9d5 SHA512 5fe4bec5e049c1e1c71d8797a2d96c09f88dcd47b2449d06535e1b63e96d35f70403412adc536302611fbce362dbff734de2aab9beeb55ae1d9d35c45bb0ab65
+EBUILD mpc-1.0.2-r1.ebuild 981 BLAKE2B 71d7b022a3c84d93e7ef8b11aab30f12958275f3e32ca64023318f4d30a24827062571a85e010a39584fb757f8bb6f9e794efd83267b6052ec80049bb1e4610f SHA512 3e2b2b5b6e6d7656fd1a93ee177ac8f1c893f7dd5ba358b7c503a21c8f2160e5d28fe21d12dbb6550e11024454e2f346276a23a073871c6581daaa488fd24ce2
+EBUILD mpc-1.0.3-r2.ebuild 1105 BLAKE2B dc62c597630b6de0c870eff40e6322b75af258926185a296f55353976c3cfa2ff3f4d189f97001de02c1e4b1665f808c1d3944846abe5839775a0aac7bc0f72e SHA512 73fc04828fdf561b94d830a3b2604bccd53e8ef0669a4af28ca8402e797c8eff2e851074874142f1ea23aebbd7def75b4b03b26ff75456d84d368922b7386ec7
+EBUILD mpc-1.0.3.ebuild 993 BLAKE2B 352678502aadd1658d1daf2cf03bc8f8c5cea4675c67cbddb5279a966650b7ca2b6af774d8a99ee24b1040b2d7371fd7c36581521a939db237f90fdfbc9226ce SHA512 62b330fdd8a1dcf0fb94b3638dea88db73a72b36b31c59ac40d67cc56a7ad382799c5fa16ea4b33963acbdb2cb68f464198c4f42f3cb9f0c281420aca599d15e
+EBUILD mpc-1.1.0-r1.ebuild 962 BLAKE2B 5f1682385882d2355e0c7e0046e3466c27516c67aefdf0485b66e5fd3350126c75a2ec5a92ea4d0fb43c6cd1018679aa730e982d30547945f48e99f6fb322199 SHA512 04b2b9ca031d7db8d9b5515c09396574259d8bbf1552db12a3f03126f6857c9a2224c3628f6f37f57d918f513e014ad503ef61b292ee4eaea96068854a022dc2
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.2-r1.ebuild b/dev-libs/mpc/mpc-1.0.2-r1.ebuild
index d61204aa6b51..ff52574def90 100644
--- a/dev-libs/mpc/mpc-1.0.2-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.0.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="4"
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
index d4f00b4f5f78..341a5f65ce14 100644
--- a/dev-libs/mpc/mpc-1.0.3-r2.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 415e8304f4ed..10ab5b199b70 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.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="4"
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index dbbfae8d3a7f..e0916f5d95dd 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.gnu.org/gnu/mpc/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 03751e7b2492..c5f3eb293cee 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -8,10 +8,10 @@ DIST mpfr-3.1.5-patchset.tar.xz 1840 BLAKE2B c18392ecc3325c0b889b540257f3bfe3c38
 DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6bd897038dc306d597ea412013c869b3d2f9c4ba2a1d5e59eee67f562fc3bf5db8fd1584b70c1b30574e42f5 SHA512 3643469b9099b31e41d6ec9158196cd1c30894030c8864ee5b1b1e91b488bccbf7c263c951b03fe9f4ae6f9d29279e157a7dfed0885467d875f107a3d964f032
 DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
 DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
-EBUILD mpfr-2.4.2_p3-r1.ebuild 1507 BLAKE2B 1dee9bc908cb086e91478f7522540625be4ea5c77e4b060dfad9af6394f0605de694d06aa829ba6ac364dac580aed8815adf928371fa2f1188745b2bad49fd5d SHA512 2c02b88e29419c26b66c03f522d174ea409698b46b3567cabbd55b075d8921ac49a3de2a0adc161fda7c0bd652396616ea1b1b8350af875b0e5d3e024b5b6dbd
-EBUILD mpfr-3.1.3_p4.ebuild 1826 BLAKE2B cb2c4252b7c1c5dbc39b147f5d109a2b40f67cafe7fc9f9e410e25ffaab929774df3870996fcd95e52cecaaf7ed3eb99b1ef9f743f13f932c18e184a8ea48fbe SHA512 3e0c9ae63c66de33c1a4afc69f1790d1e6a1728ce15b9bc7d06d53510c1fa0bbf068fd7c527de3b37dd2916adf3e324d305f6578958d6b3b19284183bde47759
-EBUILD mpfr-3.1.4.ebuild 1655 BLAKE2B feffc8a44671a6a4d3fdee5e7bb4b30a679cbf5960c3eb9ed83a0b8b0985e4e8ad6e7bc7394f075dddb9f06185318028c048fe967cca2bc910c704ac20ac5f1e SHA512 6b9f4b4a769e485fa0fccdcb7af0d79c18c9ef22c197c19f11a721dcb039399f6163458520e5d3744bc9d13209eac7c83ba339b9a2d0aa6589740475c828ccdf
-EBUILD mpfr-3.1.5_p2.ebuild 1715 BLAKE2B 8deffe623eafe5b560cd336e5e7b2db7bd064f7ecefcafa20f79dfde0eaff7943ae8aedde69a159ef5117371875daece701a509a0e18c7b3fbc7b779ee9feac1 SHA512 d4706305aaf08f64ad52a9573f724a637f8b5972e7e36adf8ef3cbc77d41a241127f175fea584bc2e5558f487a17aea8d31fbca12ca337a624357f38d4fd70b9
-EBUILD mpfr-3.1.6.ebuild 1634 BLAKE2B 4ed44a10ae9776d884362a4f25d353f7ffc01a17db64081c9d60bd3f05569cacfff6969b714a618cd0fb66fd63699c3c67e5d4a87f316e45e40e9eedb186d833 SHA512 b662b8f50470a86a1f943f425c87f3ddba345b9e9b612b043911232379aa1c5837f287b122a6edfa4011bda3c81e9200aee21216e9dc8c2740c16be737b7eb9b
-EBUILD mpfr-4.0.0-r1.ebuild 1734 BLAKE2B 374e288ec1e303177c0c36195b05304c5304a8e78679747d38689ec3cd8f09c3937706b9570b832221f1d7be8ce42146d77587ba8e25318f26d99cb2538a03d5 SHA512 17802798613c3e906c9542ba420e2be1dbf0cce8219b3c5e16fbabf3652caf60b9ae30f8e94d543f650dbcb984502a7eda9f61f8b4d9edec12e6ac4cf090a59f
+EBUILD mpfr-2.4.2_p3-r1.ebuild 1495 BLAKE2B 8fc020a3ae219fb48c8fa3b52ba25b4aba7cbc589f04582a9ba0cfe8e35377ab7f4f9838b964a67a836850412a77e0394aae7c40daa0d4a6e2e277be369ef726 SHA512 d747c698c589f666ca47d7c49df6d6cd0989594742261c20c693bb1a4323f06aaceab02b55c7dc89316f4eb0997246e58ea811638b4877cac78236c2d8e5bce8
+EBUILD mpfr-3.1.3_p4.ebuild 1814 BLAKE2B 3d5e9461e43a11e45cab33b48ce9a0ee6a9b0794fe6d4cf9bc7f09d611f057bc3f4c5e9103da79f6cbde944c055468c378eda50478332367621b5d85184d865d SHA512 ef68f09708002739845ee4f3f8f128bf087f5caf3c75b9466f3660b81b8e2dc0f704815e0d748870e70e27797d3ed8d713ae8dd583ca4bd0bf03b0a57caf5cf4
+EBUILD mpfr-3.1.4.ebuild 1643 BLAKE2B 4af7ae247a28d27cc068f5494b6cf2b9a57540c57da149853132be888ff106193ca8eaf0c47ee1058bc626eaca9559f5ab73a8ecf7045c3400dcee7d530ef2aa SHA512 c413312ad6955ebe236bc2f5b0a1f14f8ca6ba615b87cf7bcb7e3a4a7395c0c0a0c0a786fbbd510842e4b78f7e5d4ca2d8e52bc4177d358f6c242f8e2953db89
+EBUILD mpfr-3.1.5_p2.ebuild 1703 BLAKE2B 20734b9c27f4cbe24c2932db42ed248602e6ba94d8d07dbe28b2129404f009c1b0525a96cad3756cee4b431b13ee82ff3ea69bcaebdf91638d7b6a0d5828a43c SHA512 23529a7c5489d717c0f67295914a8310683e5fe6fccd553558ca3476747451061932752d04092a2ac9e91dc172939b63975a463f5f10c54d5fc0399a170f2a10
+EBUILD mpfr-3.1.6.ebuild 1622 BLAKE2B d5bba8dff9524a015e10a9a507e45a0ba3494d0789dae98e892b7d241cd8ecaff89e928b947e47535ee13b6bd035c5492b906e87d6e574b29968a74c03a523fe SHA512 b7d9bc01795567cb1b2e2474a93bad4fa72997feb4fb9d017dfbef57544799d054b90fd990f7a0c6a9110e51cd2933e781270b317b912f823d6970733dc6e2da
+EBUILD mpfr-4.0.0-r1.ebuild 1722 BLAKE2B d653daa771db09f214708d8259bc43df763180631ad2d0ab0e7a3ccab886c6086f34c66f38d6e7ab1d9d4f6b786fbe97ef1eb0223d14cb1215e4cd776753b00f SHA512 db969a7142504dcd40f33fa051ec7f1a8a1b8853664da5443c1e7cb322ff6daaeccd29dfc1d3627357f4f4311fd78c86c9ec07058cc60ac43d799d9b01e74087
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
index 74ef62bbfbac..68a9758e2ff8 100644
--- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.2_p3-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
 
 # this ebuild is only for the libmpfr.so.1 ABI SONAME
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2:0[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index 6ebbbdfc51c7..c66635fdc46c 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.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="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index 5cd6fbc12d97..64e99d579059 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.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"
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
index 60a12e83e3e3..318769f20370 100644
--- a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.5_p2.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
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index dc2f051943e8..199e7df47fe8 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.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
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index fa5e936f4991..a29d3dff1208 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.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
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index d09b2638df9d..102f56c5d0c3 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -12,9 +12,9 @@ DIST onig-5.9.6_p1.tar.gz 605920 BLAKE2B 9f5ecd29d0dc583d424866e5a37fe92ae4c9874
 DIST onig-6.4.0.tar.gz 900425 BLAKE2B c2c76ea0bd1e47354169e386a495b8754da604be0dbcbbe43e7889e1c37f84ddf032b0874bdf3711221b60e717c1f1bd36edb35903102f0be55c323f81d42ec9 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa
 DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
 DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
-EBUILD oniguruma-5.9.5.ebuild 1087 BLAKE2B c5f088a0823653d0a445f409394c4d01c5de84978f107941736cc1acef0073c059c7d8bdfb8002187c6f28cc1d979207db60959cdb699becfae5f3504251a5c9 SHA512 f805ce558c5413dcf06800a0321335278ff089ad1e2e16ad57ea117b893a81e398544dec22058b1021f897274aa9cc084e2bb872a02de6c406fd68a7507e0b2e
-EBUILD oniguruma-5.9.6_p1-r1.ebuild 1379 BLAKE2B 0a497960069fb276d91eee2b2edb1e4ad5e6ff33b6b684e986d0106e2fc26b987fbcc74c830b3dcab4d0a80e54dc7714d026e556d6c35ff0227238d9490082b2 SHA512 6817357097456c702b5488cee375135e54bed44360a2edf0dbad9b2712c8c824b4f5433b73cfc8dcf460075fd95a6a396916a79032de4a69d633c856bd52fbea
-EBUILD oniguruma-6.4.0.ebuild 1167 BLAKE2B 7adb13bd230209a8f72a04df6399ba47a1664f980b1119cd1fc78b1531b1642eeca3e141a170294bddd70a5f9342166cd50b49f8d3c57ed431d70af970629aef SHA512 684194ee689ad9fb79fb2c933f8eb64e8dfa20c79da0c76907cc6b913391f2e4bbd42793a4d11204c66d87651c349f71c75c4169f2ad87808b9f43b6a14b63c1
-EBUILD oniguruma-6.6.1.ebuild 1125 BLAKE2B 550452a672bfd84186873eb1bc7ca0b4fd7930a9f9e7d48ac2e686f4e64cfc66dd68d3d88cb96c2060436ebe2fe4bf7a856475eaf045bfa18894a7a61ae0bdda SHA512 2f68311e1ba9a3999ec4cb0a026fe31afc3532678353eb34e6060b263533af3dc2674becca85c91b9f9919b459354da42f9a7722405caba4b5c32453364d816a
-EBUILD oniguruma-6.7.0.ebuild 1037 BLAKE2B 2bcf5b429f1d58dfa897fdccc20ccff5c9ee161d7b3277206ae956ce7742882cdfa70d8a132db418425c22c9caf5a78858c2ef9cd3e2e2bede4d1f85dbe9e7dc SHA512 d42cd9caa78b8c679414a06c90708cf733a2844634f49005c13cdb20df67e4ecccfbc3770d5dbc65ea22b8d23d6e52342fb6e6c25fb6a8982802895c0722a6db
+EBUILD oniguruma-5.9.5.ebuild 1075 BLAKE2B a4512730195cf7e2d48379ba4c4d43d02c9121eb142ff74541ab3233f5cefaba8bc03026a044680f6a54f45336c2b47721e2b4e360ea96cbbd1af4f9bb352293 SHA512 83ec9d45664414ba08759534b04f346641e680ee4daa94dfd668e5408bdb19d982f22bca41ec606a955777732043d6bc681d557270d1619447406a3435196c64
+EBUILD oniguruma-5.9.6_p1-r1.ebuild 1367 BLAKE2B 70deefd41dcea8158140baec264749af5279cae2456b5a55ffbfa2def6aa1c49037a5015d48982090e575083894316870ad89eaeee876925f8f2b830a9c455f9 SHA512 4ce079503ac7278f07bf34fb8bde3c7cd6afabbe5ec9bc5512756461502e02e23857e05f37cbfa2bb27273a8e204b1ab1ed2478ed2d6a15215d206b690327cb2
+EBUILD oniguruma-6.4.0.ebuild 1155 BLAKE2B 07dfe6707e0ce33eefcfd13693f38c47d40cbfe1ad6d6da73c76f1a271b0af677a5ed611599d8b1a8b1189fe0e2ee6701565dbddc62cbdc3a15261b944ad27bb SHA512 56f20dd2bd854d209674839e80505ef80b14a7dc8b61bc3cdcbba194f63d6a7dfe556ea83a9d78f1fec80fbfcf40fe94fee97bb89877de1e3221600055402f22
+EBUILD oniguruma-6.6.1.ebuild 1113 BLAKE2B 3472e1522aea74375b2e61693f27305387e6fec641474fa65ef5c6178110d85b4cd0c64b609e4771ba6a8c89944b390f30e68711919d893d67f4c8aea2dd05db SHA512 5db0a44bb2f6c9d657dc7f1543efc21bd496814a824fe44792fb90c0c1ef0cf6a563745fac6a774c3d79fa3d25db2bb04ea43a5f47d450b088ef0f18208aa285
+EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild b/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
index 2127baf35212..8b0019e6e59b 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.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=4
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 PATCHES=( "${FILESDIR}"/${PN}-5.9.3-makefile.patch )
diff --git a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
index 7fb47e7f69fc..07a88e15b522 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.6_p1-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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P/_p1/}"
diff --git a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild b/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
index 5388b8aa7c20..dec199e97dda 100644
--- a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.4.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="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
index 16f4f7647b93..08aa0d6d845f 100644
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.6.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/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
index d7d578d066df..d040e1b6cb1c 100644
--- a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index b7560bcf2f78..90a64b11ec51 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,8 +15,8 @@ DIST openssl-1.1.0g.tar.gz 5404748 BLAKE2B 23daf80e4143aad4654ae86f8e96042dd7328
 DIST openssl-1.1.0g_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-EBUILD openssl-0.9.8z_p8-r1.ebuild 5076 BLAKE2B 7e57a4541dacfc7a43720248334e8c46748e533b4fa455f70a9304fd5c4807a0202c796eeffdd5a3b096fb37549e4ca8780b8ab8e5d51872eb057aa5bae3cf7c SHA512 0df6324f095514b94b2d15bf44d269624d631cd03d5d7eaf45645fbb1d3c07880d6c927c91f6a2b3d8c5cc7a406aeb435b58e6aeb3f3311a979a3501d3f7a7de
-EBUILD openssl-0.9.8z_p8.ebuild 4997 BLAKE2B a65c31fb7e443ae990b8b434edcae82794eef0150eb5a352536af9fb7ddc39eabdef24b8a52f5a307b91e9704ce94f9ed55cf9c388076a9a8526891656295596 SHA512 15767d6ed531a7b27a37e9276f3ae02b1d3a57103db2bc256dad4ac9af8d1797f078731ac6a7325a36ca7b9cec34840dac2e3723343dca69050a524c300e7059
-EBUILD openssl-1.0.2n.ebuild 8036 BLAKE2B 15a1ba6ce7cc2c45dcb3a9eb776f212a00238db5384ff7ea74e3ec90089131273ec89c1d3a485b2efb496e66075a4cc825226ecc17b224f80183ba36ec8d8cf7 SHA512 f89fdfcdc4a7f86f8eca280fde92b3c6698c1993bbef5722e920535328b2330f5d0ab55b56b7a66be0192be87222a470cbe1a2ee2e571bff1cce6e6be773b6cc
-EBUILD openssl-1.1.0g-r2.ebuild 9045 BLAKE2B 7693bbe13e6bc635920e260895380ba5ddb163351860ae7f69ae3cb20076f1b0faf61b1fbc04f439281609f35a21603156ee646898b2b006e0ed668d08ac7232 SHA512 c32902a4f49648e1fc118586abfe38defddff8418f338d3d8334cd45b9a0d605fe2450af5fe4b5dbac648776c41e79dfa589f666ee2daa9dd2474a30b7290c9b
+EBUILD openssl-0.9.8z_p8-r1.ebuild 5064 BLAKE2B 1dd5b2191321cc28d206e29305393cadcf0241340c09a5f1de3aa67567a3ad28f90640ab598355c521e1005e9ca4a3c6979943c225dfedac290be1ba90c153d8 SHA512 087d142686bd8a8af6a4eb9c387ea1c4283a6a9029749cb49d31382c780b8a9c18328193defe21db46bbc07e7dd892ca80ae547249e194bf34eb381bd3abaecd
+EBUILD openssl-0.9.8z_p8.ebuild 4985 BLAKE2B b8f63b012f266297638b3bd4a112a5122f80862b82cb497857e8444c5b98719228334cf47396d1604a4d85a3be0223204cb812eb1a2da52997f1acf457f0e558 SHA512 a2c58689aae6e12ec3f7e9d377aa9f5998c690efc8e53ec76609b2477da5e28fecc0ec89b8fefe4c83a281c333aa6d77e41de46fa44d449db66f1132318153ce
+EBUILD openssl-1.0.2n.ebuild 8024 BLAKE2B 5c05f34f02cd875e73a7ab83ce76feed1bedae7c794ac2159666b327e59475002ae872f92d06391cd5c637db39232a460c00fbd4df0a8dcb7cb2e10d0d732af3 SHA512 4e0d994a19a112223115e6d9768bb34fa753fc74354e97ad322603f3af209dea40b62f17c3aa5910813b75dcc2c0650a05bab285669c195f04b70a9d943f53a7
+EBUILD openssl-1.1.0g-r2.ebuild 9033 BLAKE2B e57575c188737b2d7cce7a238fb6e104d609ddb45c8ebc62d9652f7fc42c5609c574a46087e998877886241602841d57b1b82498fd017fc267d5d21161865e07 SHA512 e92e8ea7f41dae6ea6171af4559b0680d715fb783d1bd470a75d179eb8e2f8b2494a22cb41cdd93f286ee07d2ac0783684eff48cb2ccd5020f2839b73f811155
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
index 5fcc6d8ea4e8..7ec8a13fbd6c 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8-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
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index f6a3c0025f10..229fa4a52448 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.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
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index 4ace32192cec..fc14a2ac5281 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
index 0c7e76558f8d..9f2d149794a0 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0g-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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 936f6b82081d..140c24c2838d 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -10,6 +10,6 @@ AUX ossp-uuid-1.6.2-php70.patch 11172 BLAKE2B 8cd653ff28f8eafb8f47eefb830a18bfa6
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 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 2792 BLAKE2B b341f70f123ad897f69e0e1f8a30abaf1f172b76ff58a18b29efa8d8a32f8dcde1c7ff79ccc2aae1959237bbb9c1f920ca594671008c95665cec6fa0f6f11e56 SHA512 0f3321e226826c8f15b52d498999a9bb6382800ae0452955c7067b4c5db558886d461505f48030d55c83e469d02b6b500e61d84fb28f7b933bf581820f4be341
-EBUILD ossp-uuid-1.6.2-r6.ebuild 3047 BLAKE2B 077b8c87edab9ebc23d099081526a5360190fc9e9be0b742599a6099b6da12cd2bd216fa762972763323dae0874ef4707d87b22675686389dee45b49d4ef524d SHA512 87bef1d453bcd197e228e51db0f28053f4ff13809e3de3b07ab2cb5fa1227c6a287dd7af983af482eeef7141048e84042447a463244c449d0ccd90ba05636247
+EBUILD ossp-uuid-1.6.2-r4.ebuild 2780 BLAKE2B 8d9477201e7115689ce78730fb57a71a26809b8f8ae42081cc7bd6a04445c6f7f007d3a3659034db79b4cfa215e65d9899deaf368366cdb80608589265934962 SHA512 2f36c1de9803540f124372dfbc5ba82cb8e31a7b168cda04a43c95b24c265ec4386794b00d44d6d24d9f1a98876bbceae94c459daf3cee559b1670b78d718721
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3035 BLAKE2B 80310233cbce7cffa89ee66a9a937086bda8cc57254a5e24ceb0e0292416fde5776d719fd815fb43c196f22cc50f41f4d28498db21bf4e9fc972ce17f8109fd7 SHA512 80fab0f830a8f1e89dabb62790af5b412b4ffaf91ea8d76ffbd18e6b514018e0660f067b08df59b88db39bba6b72f05f41c00cc610f2bc990de4a044f005c5ab
 MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
index e29921122eee..281c96606a40 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-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="5"
@@ -22,7 +22,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 ~sparc-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 ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
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 4f7c08a045b6..1d735746f34a 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
@@ -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"
@@ -22,7 +22,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 ~sparc-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 ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index c71b8cc09a26..0cbd37cf20dc 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,11 +1,5 @@
 AUX pcc-libs-1.0.0-check-builtin.patch 1213 BLAKE2B 4c2ba042fcc678b82ca01ca482ab26c2bb20649792543b2c1357f329ad3e49ebdb06c0c81f1b3093923f4cf92ab6c011c02aa08381b52c9bdd8e765ae41efb9e SHA512 b9aaa95219d7776418bc2032742b3401d4b2fe93a2cb1066fdef6e4a036519484eb5f6a77a5ef7783f42724cd743e3eb657c43a32452cbc230917c84929bb2a0
-DIST pcc-libs-1.0.0.tgz 190238 BLAKE2B df539d461fc2e16bb7daa7dd300323499227c49f8c24b1513de987a6197cdb85da6f26b06e7915fce3a738d92375914babd3b3eef370ec7c7af0c00e61974e7c SHA512 619e65bb4b6c979864a2bd800f2b2abf2702bea2d091f884e9c9d5a2fcf9ff999faf45006bf83cd363f95bf60789e118e82cf24bcb0666758686061baa9cc624
 DIST pcc-libs-1.1.0.tgz 198204 BLAKE2B 7cd665ba6a1a69514ead9a778cb24fe35561a34ae72cd5e53b63027ae7d4261261542434e3ead68f74056f228c35fe599dd76982280d3fbd2f71f5dc957b30d8 SHA512 89d90f246300ab1da652f652c685756aa038017f5b7d57d050bb5c88e01e70b594ffaef8772230fbeb9461e07c5b1df60e85e550ec4717008159218d50c8697a
-DIST pcc-libs-20121112.tgz 190520 BLAKE2B 3c2840df9e6e501c7038e17cc411d90b81df64a8a9c497ccc5a5868598f91fa6b8315cd53bd9bfd02a366fc8cf9587aa5a6ed2d931aa3b89a8877a43dc30fe4b SHA512 15524bd09be9cafc95f1c28102f357db0ac27148062dc2b003f9e20aa8055871da7efa833c27a77920ee2ec4b8a68d2d7553f13095c5575efc3acd176fd2a21f
-DIST pcc-libs-20131013.tgz 190540 BLAKE2B 7bf52120c4d5a52e5ae9f8ecfe141eed4b2ad2bcb38b7d89ba2e75eb2f65841c4aef51621ee5215fb11b427d7f41f0590ea3116bc915feebb7de46550412cd12 SHA512 f1fd0bd0cd01d25da044b8b78b7782f9103d2a56eb1b9f6e29fffb102c9a1012f428a1b2ab2b111426312a46b0ffce3b1b811fcd9fa10859cb105caf37313329
-EBUILD pcc-libs-1.0.0.ebuild 596 BLAKE2B b1385975e0098316dede8d4e916ae4becb0964af45cd4add23eca8171c88226b79eb4d3c13e4087afcd09757a8e2368d57964877ee9014caaf5de52b3794787d SHA512 960a01503346fa3fe5f3a34b8bdf59e229513e91c2beeb19d081bf3774a554977150cc63c1bdb329b53f2ccc10f3b929660fe62e8f092c97245901e983fac5eb
-EBUILD pcc-libs-1.0.1_pre20121112.ebuild 572 BLAKE2B eb754ed249e1803bf2518478bc8906723a298d81613c3f5d2608b1b449094251566a5022b8982e279989bbfe3731d356d6f33c6307fe76b14e8e18365a195761 SHA512 885a592940ce7b378067f2f6974b2061158faf20ddf9d6bc9e409361701016205eff4324ea4c842d8bebcf8a853e5b7ec8d5e6af1e82d2833ba7413e84c89111
-EBUILD pcc-libs-1.0.1_pre20131013.ebuild 572 BLAKE2B eb754ed249e1803bf2518478bc8906723a298d81613c3f5d2608b1b449094251566a5022b8982e279989bbfe3731d356d6f33c6307fe76b14e8e18365a195761 SHA512 885a592940ce7b378067f2f6974b2061158faf20ddf9d6bc9e409361701016205eff4324ea4c842d8bebcf8a853e5b7ec8d5e6af1e82d2833ba7413e84c89111
 EBUILD pcc-libs-1.1.0.ebuild 564 BLAKE2B d935a3da91b815625f2be31cb002958cf9f42917ffc4d0e3360f02304b6e408e5ead9444d1a528a9a9791c2be8459d1fa92624fdf84ab7d5f9c5d9fdf80120af SHA512 dde7b0db8175c2db61784cabdd04c9762403e36be04b0c0a6dd908ece19a60d7dd924b6ac9d09584105ef727df04edc35c3459e0efdf427c0845d9139353b3ca
 EBUILD pcc-libs-9999.ebuild 677 BLAKE2B a1774bf3a7ca03a14b3461647ff8c3f122c35373c6c5aabb0697b0acd26660e78386623a34dab3123f67f2941eaad8de72be00628e8dc9ad651dbbed904b454d SHA512 0f06667f68d71ad2fce8157db498857b666bec324e0f8ad293104a7d19261dbf15def1865fecfb37f61faa7995e30399b51b6b136d3738a9044e6106ba0ebd90
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild
deleted file mode 100644
index 61bd145a5dac..000000000000
--- a/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils versionator
-
-DESCRIPTION="pcc compiler support libs"
-HOMEPAGE="http://pcc.ludd.ltu.se"
-
-SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
-
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}-check-builtin.patch"
-}
-
-src_compile() {
-	# not parallel-safe yet
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild b/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild
deleted file mode 100644
index 17ce795e82b1..000000000000
--- a/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils versionator
-
-DESCRIPTION="pcc compiler support libs"
-HOMEPAGE="http://pcc.ludd.ltu.se"
-
-SRC_URI="ftp://pcc.ludd.ltu.se/pub/${PN}/${PN}-${PVR/*_pre/}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
-
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-${PVR/*_pre/}/
-
-src_compile() {
-	# not parallel-safe yet
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20131013.ebuild b/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20131013.ebuild
deleted file mode 100644
index 17ce795e82b1..000000000000
--- a/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20131013.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils versionator
-
-DESCRIPTION="pcc compiler support libs"
-HOMEPAGE="http://pcc.ludd.ltu.se"
-
-SRC_URI="ftp://pcc.ludd.ltu.se/pub/${PN}/${PN}-${PVR/*_pre/}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
-
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-${PVR/*_pre/}/
-
-src_compile() {
-	# not parallel-safe yet
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index f3b09cfa843e..37196161d61f 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 941 BLAKE2B 58eb572c01a4d6e396925c79d61f88a1af5e1cf5c158998df41c9acf303fceb8bb317928fca5d4795e3e8693daec57eaa70b2ca5b0ef31937bbcc6511477f853 SHA512 4155a187066ba325fde15c0e9d39fc58e987eecd3dd40e4f41ac0a5cd68a252de605a78b0b4833aa0a5fb0d4a3bddc7d4da222464776bc7e91a0dd2e39340fbb
+EBUILD popt-1.16-r2.ebuild 929 BLAKE2B 7cd8557d15ab34dafb444309718ad42adb1bcce2f1a7350a85608d88a98c3b3c22ff662dc446dc15a5ce2e5b93405ad448cc3e7f3de7f138291949deb5c5045c SHA512 f72a1229502b6cb6c092fc3c042d32ddf77bdea5f5a14231f509ba6b784b1092cf95b87f78d9e3d8050852c55fb1d5650dff145df1a0c1c8255228e887031046
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index f8cdbd195302..7ab06b9a326f 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index a4cac130b1c0..8ba116c23f7d 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,5 +1,5 @@
 DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.1.ebuild 1622 BLAKE2B b18db5c98d4693fea819c5de1e8bb206284e55075043891a76eb71eaa7934d52aa31904b72fd281a462ff2cd10bf3943716c200994ec93b07b40494dc9cc7c0e SHA512 f3f2197f3b3354f04af2a4daaaf05198d6418bd9defb947efa9d789001d5c157007c56ffdf59c484fe4eadccc5d79ddd20046e3d58f24a8a51e26a97d99447b3
-EBUILD ppl-1.2.ebuild 1627 BLAKE2B 236e8dce4dac0b6a0441cc88e88e7c91e7d77d1a195c016ef6874d159d71ab9b950803a3f5c6f4e38b729d589cbb9109fb8a9460a76701cf85581cc9134bfea3 SHA512 256bd444e49233b42b40c9e72f1df67462a2ceaa809002d3d720979ceb693459ef101ebdd0aa24ce84d06fd9f8990f65f8ba35175ed6b5109e1cb0b3468368f8
+EBUILD ppl-1.1.ebuild 1610 BLAKE2B 8ca7a6a22c6fc3573dde3f6a422999464cc1ca7e70892c2399fddd52fe129ac79aa17d52bfb151616586846f9bf788cadb8a240866a8fb18a9c93750f843e49b SHA512 91d0977cfb5d86333cb1eaa35f3b017f7f444007cb16f8370b3953f6abea7808bca14b4df75e696e859cccfd98d2f6b8555b902521dad24674d2461a83f4427e
+EBUILD ppl-1.2.ebuild 1615 BLAKE2B c99256375ecacf278e5dec97c156c26f30803c16781ba02ae37e1d6e701181c8a738154c3e471469b755643b13449b62499de3ebff6959221fed03052977b5ea SHA512 218bf984d5f777ceb87e4e9d9bd91120ac128db5be205cc14a823e215774907f737669b38a47214b5b8f504ee75238429d792bd48b349ccc833ed2154a39e30e
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index 6e27151c114a..37401f95c3c6 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-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="5"
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.13" # SONAMEs
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index e8ab746f7223..4c4cf952f0d8 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.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="5"
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index d49391beb2d9..cefb5212de0f 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,6 +1,6 @@
 DIST quazip-0.7.2.tar.gz 466915 BLAKE2B fe96398e86e9066ddeea09d225b775371fc72479291f4cdefa9b5657adb2646e42b7cfbc2de920c4a4cdd024e9dcf1dfc12f30caec8f78494b1c7128847ca66d SHA512 669efb01edefee084ae755728aa2392bf160331fb13db62b7fac5e91bd45c29bb824a41ec63dd4a74c4a9780848d3308c0dcdb503f907a0fcccfbe969c291dd0
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
 EBUILD quazip-0.7.2-r1.ebuild 1958 BLAKE2B ea1a623974ca241edb1469a86d0fd2eb2fa6a322181fbba395ab27bcc02675d6e4e5cae62ac71a934e7ac1e60537d26a96c15e768f814548b74000805dabc8bc SHA512 219c47ea0e5b592fe85221016c2e21268ea7344769c4dcd186c18dba2cb56d0be1506df294f7dd1ea19ed8b11a10672889a6df17214de8b80189804b50983325
-EBUILD quazip-0.7.3-r1.ebuild 1155 BLAKE2B 06547d4c977de746f1f32ac98509731c6fe7393f4dcc69676067b03b6ceb5126dfc6b49fb52d74069944fe7042311a458d9acd9df77c73398d64ea595103d836 SHA512 f70aaed1e77cedfa239d8233403c17e69b767e81e6f9c32ad64086e26218380c93bbca0eac1fd7e52dc02dec658a14bd249c96e64f1f2308385386a09ab95ff3
+EBUILD quazip-0.7.3-r1.ebuild 1154 BLAKE2B c1c45f4a97bb7fa6f2980545671e5a7d817427d9dc3474520f3def7abde126cf923631f50c683cb06a3e9020ed4dd8e04036bdf03271400a1aff7955f70ce006 SHA512 78278431d09a703aa53b2a69304daaba0d2231178e88f3ef3a864685f612a21eb11f61312aa6dfc574f98d97121ac2d1b3b2b5abb353f1ca20aa4298a8fb8444
 EBUILD quazip-0.7.3.ebuild 1987 BLAKE2B ebafb8141b72be86b4f961accf68f492c6d6a2f8988f4a59dc6c9587189b7e87dfba405b11d3a5a9a242b1235038b61a5d20c62dd0552821ff5c47bb73221eda SHA512 31e5a19d6fb9f3dfaf6dca1f1114974b56794b9776c0648b921e435378edfdfc35712f79272933ae025f3aae1b86649cf7f27fa94d40f8df4143d1bb876bb2ed
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.3-r1.ebuild b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
index a3e292a5c55a..3d21b5e373ec 100644
--- a/dev-libs/quazip/quazip-0.7.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index bb83dce81b9f..e661e6f7536a 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,4 +1,4 @@
 DIST starpu-1.1.5.tar.gz 5209660 BLAKE2B 3caf313402a840b8196dc94b6c4f973f87a21878bcbfe1a44ce14218c02290c8701eb3829ce0b89f3029f768c7760ea94c4f307c850e6e42ec877be017c50b4a SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd
-EBUILD starpu-1.1.5-r1.ebuild 2118 BLAKE2B 7197f5bada5250292746379f45ef41bdf8c9d48caf76f91d9b4591863248256961f08276fe7808ca84a2699fc64063dd7f22bb4fedefc82ebff507d1c407fb72 SHA512 553d55a66ed6ce32aa0cd328ae5003daaf4d3603267f69aed67b442f79d4861c9f4b5f11c257e6f07be46dc85607b6f2177c1e393fa5957124e494920b963bdb
-EBUILD starpu-1.1.5.ebuild 2173 BLAKE2B 981d681eb1b75210b0e6088d88436e7d60f17e2ff52bbc51af4fbd7fc6757e349299e346888dd76f3f35a8795516fdb2745e7d2517b4e6a6dfc0324b8b2b2bb7 SHA512 d85b0e808edea0b80c88f44bcec9e34df726dff2ad2f9be89fbe1e446c8899e56ecb7ee0a68f07646a07f426fee9e1ba67f82e47052f64460ecb2e6dbf29553e
+EBUILD starpu-1.1.5-r1.ebuild 2005 BLAKE2B 1e249d69ca9b6ad097a472c6cc0e0ac0ec141bac968dbc291340c10815482a0c3ce64721c81c91f082789496d6ab247863646ed3dafbf780efaab9bcd54692dd SHA512 477d14b9a4a4269c0c61963feb8e7eced569365709128456ca75bae00c8bb30c6f3bdf1950097faf52ab4ab674d784a9a826f3bbbd8d50d622a724c0d374e325
+EBUILD starpu-1.1.5.ebuild 2060 BLAKE2B 265d77704570bc9832c2ee4274eb2e7c7a4ccfe77714ea2ae32b3947df738a971d79ca8ae8ab24bdb815f821f087dedc283042becff12b93c61e5283696e86c2 SHA512 201b79423b2f6b9ba2ae810853427a55e0758b9e8a5136f610f54fc1a4255673c3f78c8caab3099f6740739d0b83eb7c4f2e53c8400c96c66797f63669ae5df7
 MISC metadata.xml 853 BLAKE2B 5873820e19a10507aa381bdc5e80defaa2dac2e65fc923aff907c7c28795205c271b82f756c5255e64ec0147726b2a305573a49d0a7694bf583b59a3e1c5eddd SHA512 43b79ddb2dbc234bf4715ee5d7c7dbd78dd9828f1fbd930198eed2a8dea66ebc28d09c105d2d3fc0685ae8123496b360f20e11b4a199c99743373ad9774bc964
diff --git a/dev-libs/starpu/starpu-1.1.5-r1.ebuild b/dev-libs/starpu/starpu-1.1.5-r1.ebuild
index f6b978c34f00..c6fda9dd478c 100644
--- a/dev-libs/starpu/starpu-1.1.5-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5-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
@@ -16,7 +16,7 @@ SLOT="0/8"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
-	qt4 static-libs test"
+	static-libs test"
 
 RDEPEND="
 	sys-apps/hwloc:0=
@@ -28,11 +28,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt:5 )"
+	opengl? ( media-libs/freeglut:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,6 +49,7 @@ src_configure() {
 
 	econf \
 		--disable-build-examples \
+		--disable-starpu-top \
 		$(use_enable cuda) \
 		$(use_enable debug) \
 		$(use_enable doc build-doc) \
@@ -60,7 +57,6 @@ src_configure() {
 		$(use_enable gcc-plugin gcc-extensions) \
 		$(use_enable opencl) \
 		$(use_enable opengl opengl-render) \
-		$(use_enable qt4 starpu-top) \
 		$(use_enable static-libs static) \
 		$(use_with mpi mpicc "$(type -P mpicc)") \
 		$(use cuda && use_enable blas magma) \
diff --git a/dev-libs/starpu/starpu-1.1.5.ebuild b/dev-libs/starpu/starpu-1.1.5.ebuild
index 420f6f28d9b5..ce3ab4e90515 100644
--- a/dev-libs/starpu/starpu-1.1.5.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5.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
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
 	static-libs test"
 
 RDEPEND="
@@ -29,11 +29,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt:5 )"
+	opengl? ( media-libs/freeglut:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,6 +49,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-build-examples
+		--disable-starpu-top
 		$(use_enable cuda)
 		$(use_enable debug)
 		$(use_enable doc build-doc)
@@ -60,7 +57,6 @@ src_configure() {
 		$(use_enable gcc-plugin gcc-extensions)
 		$(use_enable opencl)
 		$(use_enable opengl opengl-render)
-		$(use_enable qt4 starpu-top)
 		$(use_with mpi mpicc "$(type -P mpicc)")
 		$(use cuda && use_enable blas magma)
 		$(use mpi && use_enable test mpi-check)
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index e9cfbd6aa281..bde7d20cda15 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,5 +1,7 @@
+AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee454fd2ddc5386a8190cd4da8e07c76e47ebb374df6b9a11d171815256927adb09b056927d33b19bd52b189842e9975817421 SHA512 80d77d07c43001c4e50363c66e05245ffc61fac35ee0c771019ae175e5eacd3c02fa050dcc910f5430c8531ea73fc289f7a18e989bff0dd7e14f7e438c6e28d1
 DIST uriparser-0.8.0.tar.bz2 433581 BLAKE2B 0f39f891634de86fe1696c5d000c6325203561347c83f3144fef2319c9dc58657d82b92bd8499efda15bfa966230f3c2ca4b9051caced0fe15c7e480e564ac86 SHA512 e80efc8484f0b67107cad317cef72db9de906a86020c3ab31178e06e958782f0a744fe257b1e6cd130dd25c6747e684ece93ce5f755864303df34c6b763d2e5b
 DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
 EBUILD uriparser-0.8.0.ebuild 1101 BLAKE2B 1ce433e4c4b04b16f8d7d3b988795e42f3358bf7ef8b07f87d0eec3dea0b0d6be6655518ae950a04a21ca773c385085cb6c8b6222ff6d4d3f7314b35f7a559d7 SHA512 7a554f51d594177792b935b19b1b2b964936b5d27c9d50bc4faebc35479fca38f3d612273af6ca04a2d65e63263d06286dddcf84ef7fbd5b899ceb50f42f7c10
-EBUILD uriparser-0.8.4.ebuild 976 BLAKE2B b408b3abb8eca1b16822b7385a124e01b4021a7434037f6c03dbb2e49ed296ab2830f63d1fc1479f0799fe1562bc5fac386cb813042518f24fc11792bf950af1 SHA512 d356896c3040b0dd6e5935183ab0f26c996aacdae1725904800c49d4a23d6acbebd9d7919d07cf15f9edad7dde46526acc0ae19bbfb919d1bb230fb4a6a6eb99
+EBUILD uriparser-0.8.4-r1.ebuild 1068 BLAKE2B 797cd9004fb4ce9108c1acb48e3116f77672bdb530c6ce7fec178f76d4e49d0112453353be311cda2d786214d5a9a3525e07063bc08b5abd0de873995622d79e SHA512 4a906147237682d061aef5fefc5c5d77fb801d11aca5eca7e5def4fa05e0d373b35c98d2fe439b0e0f442aec5010dc79349611329e0377ec0b08ef40af05d044
+EBUILD uriparser-0.8.4.ebuild 1121 BLAKE2B c588049aae6874761ab9be7f69d0d847fdbba0a2fe8f9cb2e2747c4293c69f6b8c73eebe83c9bc2c4876cc50682950644fc0e9a4b25d10fafc029e27e9b134cf SHA512 f7d66431f203c3b5aa6c2c28443045db29d866f39c98675058140f16b810a5b8b277b7354cf1b3cb77bd0b29d783d27e360aa86de7d859fdd6e4a5e2c44aee9d
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
new file mode 100644
index 000000000000..28cef94c6423
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ae5e101..012f0bc 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -24,7 +24,7 @@ distclean-local:
+ ## Install doc files
+ install-data-local:
+ 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
+-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
++	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
+ 	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
+ 	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
+ 
diff --git a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..545d35ee9aa1
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="http://uriparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-sizedown \
+		$(use_enable test) \
+		--enable-char \
+		$(use_enable unicode wchar_t) \
+		$(use_enable doc) \
+		--docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+	default
+
+	if use doc && use qt5; then
+		dodoc doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
index 97ad9a716173..11c9e1d59348 100644
--- a/dev-libs/uriparser/uriparser-0.8.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+inherit epatch autotools
+
 DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
 HOMEPAGE="http://uriparser.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -20,6 +22,14 @@ DEPEND="virtual/pkgconfig
 
 REQUIRED_USE="test? ( unicode )"
 
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-sizedown \
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index fd11984a409e..cedada0780e0 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -2,5 +2,5 @@ AUX volume_key-0.3.9-config.h.diff 819 BLAKE2B ad442b6cff8468e49172d4216125b59b9
 AUX volume_key-0.3.9-cryptsetup2.patch 11118 BLAKE2B a271091011046c5765f1202a655a591a9dde6732997a39760a792c12caba5eff31c130247a33866d8d7cb47ef91c515d28375729d06f321bd0502063d7793e8a SHA512 154e8c2860ffb07f367696ed23309910162c23a445e7c46411f63f6a46e65aaf5285559a51320edf3a424d98300058356ef058689c06719e00616f211ac4164a
 AUX volume_key-0.3.9-find_python.patch 1845 BLAKE2B 0924bdd416f4eab70648964a1ad76263db76a3c7c62819146d200c6a88ef65ed24aa90c3dcd426e5cd137e07ddf04ddfd95474f6204f4e76b0c2a3b746e16dfb SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7
 DIST volume_key-0.3.9.tar.xz 445092 BLAKE2B b9cec52ca02e331501d378482484535413f3ef7675b6592b9f26f272d36448a2ffee1a0ca1c7a552764324ab20cd6dac98447914faafbea96e4c526796bec587 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0
-EBUILD volume_key-0.3.9.ebuild 1027 BLAKE2B 54d19099284efbe90689cf23255c1197925d42804f5278ff8b5ef760b774073102035b146fff489adf32209ddefbc576088951a1bd8984c927d391c49053408a SHA512 e50c15ce31a280fe08db1077877cb10ad1d4a7f31160ab4e928ec348ba30f5892271db0fdef76e8a4e17f17a4897b5d8dcfc3469bb15432f1c60cb0e5498754c
+EBUILD volume_key-0.3.9.ebuild 1024 BLAKE2B e66cebbd25ac6b4200979b31139b406d8caf677caf36d1c4461c25b428844e0f26514382caa313d35fd89f328f65fa87ff6ab70d53c87f394656f5dfba644f9b SHA512 40aea73e1247d82c7c47810022d94764163438f95ab953a1fd4214d807b63f58bcd24920ecfded50349ca0e3b0dfffa962cd9862b051d918785c44f0c57939cd
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.9.ebuild b/dev-libs/volume_key/volume_key-0.3.9.ebuild
index 8960be810ef0..42f200363698 100644
--- a/dev-libs/volume_key/volume_key-0.3.9.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild
index ba1ed282e8f6..451191ba6590 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.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="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
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 5b2735474307..07c137092376 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
@@ -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="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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 20e91c94dfcb..f08747774eb6 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -4,6 +4,6 @@ DIST Cpanel-JSON-XS-3.0233.tar.gz 217554 BLAKE2B ed56c20faa98b1dc32be7e2f544708c
 DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221caca14a0ac560712400632d90505e4fb74c50927cd9ad6453e91687e0b4c4f1fd2b50fa32d6355c7d46518bd63adda82734c SHA512 fee7b52f2bb48a4dc6314da4c274bb3456b6af2a0d891c1125425e5a0898e3115ea486a7dc057c25aaf7fc141bfebb5ea4341b17d00373b68a7388eb75f5bdb0
 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 501 BLAKE2B ccf660d229f23d33c72e9e12e8d6b2562f0aca9178039119ae333f605348ab19367c1410b78cd47a9262135e6fa88c1caad76624a8a811b4ee131ff052320709 SHA512 36234f396825e9a73010f7149497d1d28cadafa1b581b028c68438c50754a86fbc4bf2571adf2b69ef79b9ae872428f3808bea56cdbb91ca8fe8b28b89ef9109
-EBUILD Cpanel-JSON-XS-3.23.900.ebuild 513 BLAKE2B 4eb344edfee4648d85008263f35034fd98ca927fcf6f6d2df05a574e664dea587f92f68a1de618ce9612428bae4ff915c9372dc92c2a081b9212ea450d339e42 SHA512 14e7233814ea4388bc74c48f54f612eceabfd16728ee79d5860dbf57746e24ff6b768ad6e60170e601f1f33e70d93d8fe987c1f6faee57dd9656619707ae9bc0
+EBUILD Cpanel-JSON-XS-3.23.300.ebuild 513 BLAKE2B 5823a967d55821e7274144d898f203cbd95bb9af2e7a171019cc7bf96467a4a146cdf861e3a0ef02895d17c3736d890eb17a7e6206cbd07e8f8d44f942ec1776 SHA512 c795ada8b7e070638776509a9725313e258fbf2118ca2c4bfac7e08337dfc64ad4cc6a09888c187cff37011954940b0b0dfa36ea4b7fcfc6e96d8764089cf292
+EBUILD Cpanel-JSON-XS-3.23.900.ebuild 525 BLAKE2B fd8e4867f8abddb34ba6eb90c341a3e1f2a716da4331912df1f1aff1f5b9f6b2c804a18e96fa4616c50da303dd1df0f03d8bd50f24065137ef0a1714490c041d SHA512 1ccd684c090e111e04df44f12cc2b6849c6b8081dd4b5c0d56f705eadf3e5c3dac892f935e37ad1843953ef1d7e90d669fbcd0fb6d169a76947dd9b007fad43c
 MISC metadata.xml 401 BLAKE2B de5ee963566e3471500d6a481445c09715483b7bc913e5a1fbd139de0d3f34e986ceb4cf9966cdaae909027250b76c85f0ea8535ca02ce558b861e055371b05a SHA512 c1ab8b9c9957f6e48f83e6aa82ae0912f3a7db57e34f844b4c9e8c004bbe303e3ab4c5cc865bd9df3b9d5b818fdd2389820ae3ca98da56ee3216fedc8b10a771
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
new file mode 100644
index 000000000000..48c3cc910c8b
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CAPTTOFU
+DIST_VERSION=4.044
+inherit eutils perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="test +ssl"
+
+RDEPEND=">=dev-perl/DBI-1.609.0
+	virtual/libmysqlclient:=
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Data-Dumper
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		virtual/perl-Time-HiRes
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-amvis-type-conversions.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
+	"${FILESDIR}/4.041-mariadb-10.2.patch"
+)
+src_configure() {
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	myconf="${myconf} --$(usex ssl ssl nossl)"
+	perl-module_src_configure
+}
+
+# Parallel testing is broken as 2 tests create the same table
+# and mysql isn't acid compliant and can't limit visibility of tables
+# to a transaction...
+DIST_TEST="do"
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl_rm_files t/pod.t t/manifest.t
+	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+	# out why 60leaks.t fails
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index f5838b27f7e2..61ed8d23548f 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -2,14 +2,18 @@ AUX 4.041-amvis-type-conversions.patch 1503 BLAKE2B fe4dd5223797fef269693930aaa8
 AUX 4.041-mariadb-10.2.patch 1276 BLAKE2B 9e29ec5d423e77afe825adbf5146763edf168ed1050a8022d28c220d3fdeaa6cf631e15191be2da7dabccf41b9bc7ae1a13f4728a0f6790b7d230d0eb37c997c SHA512 1e2b4b98d285c7a0b0cfada98e7e65896b322dcf26985cb1f3bc0ceb1e72e71650b23a8b0600e887df33ed316545f8adc22c4cfd9318485f04195d3825d8ceee
 AUX 4.041-no-dot-inc.patch 3470 BLAKE2B 2c8bfe5461699a1d167f9c1ecd77631293685f02eb3b875f2b7d97dff3863b5535ba6a537cdd92725418606b1b718fddec8c2979f51f423a6dc0869910b000f1 SHA512 b7a075b9e63bf80bf78a91fc732fccf2059638961d941b7be0dd73b3669a0a0df7bed3a8e5c12d8d88a9da7c28fb872669de5f3d6b6ac60da5510599a173cb26
 AUX 4.042-no-dot-inc.patch 5717 BLAKE2B fd0835e7e6446e135035489d02ae520bfb21e8590daab905bd8433c584ad35135d77fb55a8a37aa720abfb830158f0980e49bf5a4d54b96c28d279a15b99927b SHA512 8b8707cffc9ff711ea0effe9c2eb0ef56fd4b97729e76f3bffe52e780764a4f0d812e1ec00249752363475650dc803b2311c82cc645016d0449be296b8b1bf0b
+AUX DBD-mysql-4.044-amvis-type-conversions.patch 1739 BLAKE2B 25fcf1c74798a2c0aaaeae3788e69e9735533ffeb6ed3455eecc0e3500d961522081745e3e0d6a99bcbe28996555ca0caf935628688446d4ab2e896c5ee92f3f SHA512 3335e80f756b75299dd8f398a6e6f2aa3902ad581f6c46e8a1e5d032b10c586b5b3ad4a237ccd7dae48b2039a72eb3de537dcab193aba294114392ba32c42c29
+AUX DBD-mysql-4.044-no-dot-inc.patch 4927 BLAKE2B dd952d2dac0de6c9d428832083034041058c019d16f29df2e06f107181cc10a1924c1ff954e33d2269cc6d1d6e0b379b3887ad75bc1542afd6dc6714b9876dc0 SHA512 faf3f4fbe551b8dfe65e747dc78f6136c059934c145ffbd5b83781eec044f8d764f1b02cf5f11af542476853c887fa98b09c6b939740e934c57db235b0668a67
 AUX DBD-mysql-print_embedded_options.patch 616 BLAKE2B bb8a5512e12e9a2bfe942df81689dfbc9551d94c9354830f49cf905b858a61c3a9f747c56dbb87677f86034b6747168881a09d71980d9633c345545b65cc0d37 SHA512 da7bbc1b65e58128af4c19673827c342de94e811b6ab20ff6844646eb7d6afdff79b61aaa6033ae2ac3d8dce8140f78505961e3da49306b5034a6c3eb5ba8157
 DIST DBD-mysql-4.032.tar.gz 146476 BLAKE2B 3ace983522e273cdb18352d2fa87702222594daed6e8d1eda2b037e5b98c31fd2e81bfa57ec71d6f5d836de80cdaf06a3571ae7c84d1ff4822ed6ab4f5d9e8fe SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0
 DIST DBD-mysql-4.037.tar.gz 146639 BLAKE2B fbecca7302cd6ea0386116a1824a7696f87f681dbfcd88970b1a5eab54639e46471fc07b37bd8c0158b3eca02d05dad159e11027daa5ab46eaa307b530f7c58e SHA512 3bda6ea18d29e32028b7eb93cd06fdbabbadafa66f982556298a68980c42a7b5236872113696e6d2df66a345049d1e63bc90ab358c8631f0cbea187780e514af
 DIST DBD-mysql-4.041.tar.gz 150508 BLAKE2B 900ccc4ad9bc5bfb236c66774a6c9529beed3568c3f3626afcbb572fa530a2488ee8e05b1dabd169a775f28d634321dd3e86923e2829e019943a9f3054b1e887 SHA512 8663c58f1dec273869ef5d3ee663d80cb36fa87b1956318fff07a4a801aaecc395510a8f31b7a51b823f7e9d6a73ebf13894c1b7f7b27fdc3f3956e6aba34777
 DIST DBD-mysql-4.042.tar.gz 160028 BLAKE2B ef2f9d6508a473c34275ae9d7233863698ab502d837975f08593d2d1ca9761081ffb84bafc5a02c572e2a6b4d54dd7c8312e476e0719733166f8edc030a016de SHA512 fe3c9e1e325f7056da783e0ea33f9a7810f25f3d9cd2c9a4bf4037b20a2148f2291b2f90d44730e63c7902b45e26993a7f9fcf1b3bf8d1bc5d3fca99893a019e
+DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb5552f6ad2b73f44aa7e2d8cb3684644773a89f35363c156cf40867a28943320e1b8b7ef4b9d4b8ac0f6b2417b38 SHA512 e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02
 EBUILD DBD-mysql-4.32.0-r2.ebuild 1319 BLAKE2B fca837574ca5840669f9d076dddbe0b5293dfb9df05aeb381cd2768de761b1cba5cc3c4f74d248718fe3752453935071653069f9632be06b33f852471d0eb9ca SHA512 e654b62fefeb79914ba77691a9b28777c594fc69f8ff91f77d190f831a79a7b5bd7caaf62d6cc9d6cc3d48a9ae43b96815d3bf87aa62cf9a1a2b3ef6189db776
 EBUILD DBD-mysql-4.37.0.ebuild 1973 BLAKE2B 072f8acba91a0512ed7b4f9ecd8c1dc71d14fac7d0b868aca54fcba46f38624456beb1336fe74846feff6d961aad3a4992511cb310211e7f113e95000063de2f SHA512 1b6e44cfff11f8f28e29721fd0c47b3b2b1c6a5bd638a9b219e94dd76ae23814bf86116006b1bebae49266e255cfe9b529b79e54076664a502013a6d057f1696
 EBUILD DBD-mysql-4.41.0-r2.ebuild 2093 BLAKE2B 046ff0c8ddec85d2fab3b7ec4d7018c46609b54263846d81b513a770327315ca3bbcc34f2d09308610028cfd3cad85fcf9ea4d92b251cc4576add96bf475e742 SHA512 72f9938a6e98a0a1631eb75d97af59c0ddcb8b7e5436572ab3049967452aac9d6d0339fb7c07e2e7fea58038c2d14f7cd5635767baa43967b480e3e3189fbdbe
 EBUILD DBD-mysql-4.41.0.ebuild 1966 BLAKE2B 3bd3a45c3dec31844ade8b79edb2089dc20a627b0c8797947c0e0e0ea7780a47a8a60582d57361a0f3bfa833dc65f4686f61cd33c04f591b1b562ecf8e091b60 SHA512 88e2669b1feb2b6bdeec630a9fa2fc4dfd62b907d0af3ac0b97a90608a4113593f704ce92d14fd542c8b9760d3a4a345dfdec251359d30075da1a500526182e0
 EBUILD DBD-mysql-4.42.0.ebuild 1977 BLAKE2B f7e71ad84f2f9889e4b933b1bd9b1f41a01956ac112aff4184610193b3f413d5905e16ac32aed958739457c9b2dbd1ceec46fb1fa3cb56571d317ffbf75ffceb SHA512 ee15ba80bc64c0073a81f9883ceb0366e21aed63d3543eb75427166f01ffe0125087d4ea0aa196eed1c5c8596581664038bc9f41c2486c2ea5b8c4f68cf9c201
+EBUILD DBD-mysql-4.44.0.ebuild 1830 BLAKE2B 8180d79a531407bd75ec583c81026edab6d329b047d2532387a9e6c38576d0f47caa70632ac3cfebefe3a19b4bf8e18685d256ef1f20c6b354e604d1aaba96ea SHA512 5b3685a070df80abff48d96b935305b640b60d4f21f5a81118b5c286470b4ecca712131c6eefd07d74cf2630e29597c8ba0647d7b7254dedce0296b319f6c92f
 MISC metadata.xml 876 BLAKE2B 72a484b9d7cef869858a3ac26315ca83317344de66a903072a93af8b80bdcd310d3a59084140181faaca40c1bf640e7b1f6baf9939254624acc166906f4da476 SHA512 05226b4f30741e8d77f5174491aee480a958e3cdf9b9484ff261b975805b82eee9ff865df97891c6107307c5cc19994764110f5461c3e80c9d8828b34e076968
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
new file mode 100644
index 000000000000..9cf9ff91fc8a
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
@@ -0,0 +1,56 @@
+From eb7eddaa2341b853df045ad4a3690c60fc38c6c8 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Fri, 24 Feb 2017 19:51:36 +0100
+Subject: Fix type conversions
+
+Calling SvNV() for magical scalar is not enough for float type conversion.
+It caused problem for Amavis in tainted mode -- all float values were zero.
+On the other hand SvIV() and SvUV() seems to work fine. To be sure that
+correct value of float is in scalar use sv_setnv() with explicit NV float
+value. Similar code is changed also for integers IV/UV.
+
+This patch should fix reported Amavis bug:
+https://github.com/perl5-dbi/DBD-mysql/issues/78
+
+See also reported perl bug about SvNV():
+https://rt.perl.org/Public/Bug/Display.html?id=130801
+
+Bugs: https://github.com/perl5-dbi/DBD-mysql/issues/78
+Bugs-Debian: https://bugs.debian.org/856064
+---
+ dbdimp.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/dbdimp.c b/dbdimp.c
+index 9c33994..7fdfba1 100644
+--- a/dbdimp.c
++++ b/dbdimp.c
+@@ -4380,8 +4380,7 @@ process:
+           if (!(fields[i].flags & ZEROFILL_FLAG))
+           {
+             /* Coerce to dobule and set scalar as NV */
+-            (void) SvNV(sv);
+-            SvNOK_only(sv);
++            sv_setnv(sv, SvNV(sv));
+           }
+           break;
+ 
+@@ -4392,13 +4391,11 @@ process:
+             /* Coerce to integer and set scalar as UV resp. IV */
+             if (fields[i].flags & UNSIGNED_FLAG)
+             {
+-              (void) SvUV(sv);
+-              SvIOK_only_UV(sv);
++              sv_setuv(sv, SvUV(sv));
+             }
+             else
+             {
+-              (void) SvIV(sv);
+-              SvIOK_only(sv);
++              sv_setiv(sv, SvIV(sv));
+             }
+           }
+           break;
+-- 
+2.15.1
+
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
new file mode 100644
index 000000000000..5e0829384be4
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
@@ -0,0 +1,151 @@
+From 35931a7465f19da53b97cd1bc5369a69aeac2ff6 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Mon, 17 Apr 2017 21:38:58 +0200
+Subject: Fix tests on Perl On 5.25.10 or greater with
+ -Ddefault_inc_excludes_dot
+
+Some tests do not include dot in %INC and fails with error:
+Can't locate t/lib.pl in @INC
+
+Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
+---
+ t/40server_prepare_crash.t             | 3 ++-
+ t/lib.pl                               | 5 +++--
+ t/rt118977-zerofill.t                  | 2 +-
+ t/rt25389-bin-case.t                   | 3 ++-
+ t/rt50304-column_info_parentheses.t    | 3 ++-
+ t/rt61849-bind-param-buffer-overflow.t | 3 ++-
+ t/rt75353-innodb-lock-timeout.t        | 3 ++-
+ t/rt83494-quotes-comments.t            | 3 ++-
+ 8 files changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
+index df6e2b3..e2c8c9f 100644
+--- a/t/40server_prepare_crash.t
++++ b/t/40server_prepare_crash.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/lib.pl b/t/lib.pl
+index 2221c40..0c756a0 100644
+--- a/t/lib.pl
++++ b/t/lib.pl
+@@ -2,6 +2,7 @@ use strict;
+ use warnings;
+ 
+ use Test::More;
++use File::Spec ();
+ use DBI::Const::GetInfoType;
+ use vars qw($mdriver $dbdriver $childPid $test_dsn $test_user $test_password);
+ 
+@@ -31,7 +32,7 @@ if (-f ($file = "t/$dbdriver.dbtest")  ||
+     -f ($file = "$dbdriver.dbtest")    ||
+     -f ($file = "../tests/$dbdriver.dbtest")  ||
+     -f ($file = "tests/$dbdriver.dbtest")) {
+-    eval { require $file; };
++    eval { require File::Spec->rel2abs($file); };
+     if ($@) {
+ 	print STDERR "Cannot execute $file: $@.\n";
+ 	print "1..0\n";
+@@ -45,7 +46,7 @@ if (-f ($file = "t/$mdriver.mtest")  ||
+     -f ($file = "$mdriver.mtest")    ||
+     -f ($file = "../tests/$mdriver.mtest")  ||
+     -f ($file = "tests/$mdriver.mtest")) {
+-    eval { require $file; };
++    eval { require File::Spec->rel2abs($file); };
+     if ($@) {
+ 	print STDERR "Cannot execute $file: $@.\n";
+ 	print "1..0\n";
+diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
+index 27ba1b7..86edb8e 100644
+--- a/t/rt118977-zerofill.t
++++ b/t/rt118977-zerofill.t
+@@ -5,7 +5,7 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++require "./t/lib.pl";
+ 
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
+index 37bffb9..9d091b3 100644
+--- a/t/rt25389-bin-case.t
++++ b/t/rt25389-bin-case.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
+index 5b6d799..8c31bf6 100644
+--- a/t/rt50304-column_info_parentheses.t
++++ b/t/rt50304-column_info_parentheses.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
+index 99a4ccc..494f985 100644
+--- a/t/rt61849-bind-param-buffer-overflow.t
++++ b/t/rt61849-bind-param-buffer-overflow.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+ 
+diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
+index 69b740e..41d1b8f 100644
+--- a/t/rt75353-innodb-lock-timeout.t
++++ b/t/rt75353-innodb-lock-timeout.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh1 = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh1;
+diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
+index 9df0d90..c42afe4 100644
+--- a/t/rt83494-quotes-comments.t
++++ b/t/rt83494-quotes-comments.t
+@@ -9,7 +9,8 @@ use DBI;
+ use Test::More;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh;
+ eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
+-- 
+2.15.1
+
diff --git a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
index b05d0b4f3294..93a476dea925 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.960.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="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 72af5a7e539d..000a96f28ea7 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,5 +1,5 @@
 DIST IPC-Run-0.94.tar.gz 121394 BLAKE2B a0d56f71d31eed6666e4ed5ecc5c20afd1188ef9f179960642c23b3b0bfade8d3f639cecc2f0f0e827b2760051b928a4a1cfc6351ee53026948350bb27cd8e3c SHA512 c42fb5e0a5085698bec3f970ba642c00ad947629bd30c1485ebd28e8e24db4273fa6439e0abeddbc602be66e4ebfcaaa7e8d3982ac8b82c3c6a8a431c170f721
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
 EBUILD IPC-Run-0.940.0.ebuild 598 BLAKE2B 08cd64ad80b7402b173aaef278c01e8b97ed739e704bd68074debd1d2a77118db8e6f14fcbbdcc0cf2d35e3a23c80783d78e7420e4a2b89e2631880f65307bec SHA512 602aec39f3cd7a14fdf95923a14c152156620af2becbaa47fd2f0ac0b490438d7b1728161c90b6a0de52b0a3f619cda5df70c9ef0e9e65eeda1d1d32f36ffa53
-EBUILD IPC-Run-0.960.0.ebuild 599 BLAKE2B 407d2bdbe384523389826e78967337fdff27c01547613e6d8f373232200197f5192f41fba4b6262de12f219b84e893a4d6c8b7c80acaef3d19a882f1a793b090 SHA512 9d70fcd8b2b0c4bfeb6f8c6956bd343580a8bce305ff10c19ce2527f3cfea4e87f982b127eda19cdd07130bceb5495bac287df0db9f2c7450508a653b6cc9bcd
+EBUILD IPC-Run-0.960.0.ebuild 598 BLAKE2B 0d56f8cea39d19971dea7245d348c423b94295cd26c3abad3558ab3fd2fbe6c8662b28fbf751c576c3bbfbf6166cc5ab19f61191c123ff402502a697b49707df SHA512 d26209c898e4d5785b2c461a71b5fcaea18ae11ba5c8c85305e75d0dfe611336c4f6d1b1a3f983f3c42f69d5c7bd35d4ec432746fe956e99019aaa16da4899d2
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
index b8a291525a45..d53499357bde 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.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="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE="test +xs"
 
 # needs Scalar-Util
diff --git a/dev-perl/JSON-MaybeXS/Manifest b/dev-perl/JSON-MaybeXS/Manifest
index 2fe9acafab81..3235d9a37edb 100644
--- a/dev-perl/JSON-MaybeXS/Manifest
+++ b/dev-perl/JSON-MaybeXS/Manifest
@@ -1,3 +1,3 @@
 DIST JSON-MaybeXS-1.003009.tar.gz 11699 BLAKE2B e1d961451908d3872d23006f68fcf94cf01c88e1cbcbbe005cee6deac30fbad26f8121a921d815fb15f135af7f4e15bf78f323ce3c20b0ea0849b7e16ac36eb1 SHA512 a8606ccaac749650004d70bd5d6219fb18f66c4c86f720bbec3daf21a15bacd17d308c2a394fb1c9f6584be4d7c519cbc8653bdf5c7c7fa4129b75261645d8e3
-EBUILD JSON-MaybeXS-1.3.9.ebuild 735 BLAKE2B 1ef608fab372625594ef5f42cf50c98503aa96e371a83416d6a5caeed208aa93474e658e2bf127f5d905cb91f0502cfbb58eac9d78f4a551fac98082d0e679c2 SHA512 4aa7dea5e27cfcc8f3e54a76d06834e1d90109b16b7d737dd02aa48dd85005433b83d3cb220a0fc129b980cd1ac45732d0ae21212076bd553955b05705f389ef
+EBUILD JSON-MaybeXS-1.3.9.ebuild 747 BLAKE2B 0d840c958870516242cc3026a78f3f27abf9cdacda978b27469fadd85118187093e74353a2f1482b3514b9102293876adde8d4feb669d3f1d5bfbf60feb7e7ca SHA512 9e60a9676c9453f038b2adafc239c27e0775f8a37817fd34961d2e6cb75abaf311db4d222357e063b97b21714d542f4fdbe21dda7a10e302d2b40d7eb5d123af
 MISC metadata.xml 498 BLAKE2B c3debaa67344aa149dba4497a9ed45a96484b63cc6e9a2d029ce87fa6c880f0bba050bbcdf43cd16bd55787a56fd3fd4bc2b35d239eaab54e737219ce1ba6213 SHA512 2db10423cb5558048db54f639e62d4ab05776edb1945089d48c979979fb1e369ae4f447c963d0ceefcbe5cca9ae525f6a0c6e59d29f7d536291b8300f2639fd8
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 3140c148a639..769cdd4d2efb 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Quota/Manifest b/dev-perl/Quota/Manifest
index f091cfc2df9c..32031e4fd00c 100644
--- a/dev-perl/Quota/Manifest
+++ b/dev-perl/Quota/Manifest
@@ -1,3 +1,3 @@
 DIST Quota-1.7.2.tar.gz 50436 BLAKE2B 6a90e545fcb3739f4f10cbe5caed7ba5a3542c19a8f1b68baeefc12dab77ac27d125e3de083c1cf6d68c29fe126c8e4f2eaddaa1c55c1974de0e0451011f6c7c SHA512 55ea9fbf027676b0e6f7a6f97fd3e75749860ebefe0127791a0d8cd8a427676eb1f6bf1ddf1a3687666752430faef877eedd12ccce39b7b76466fc7bfc628433
-EBUILD Quota-1.7.2.ebuild 666 BLAKE2B 411dc1ad9641724d435802aefff3335ad47984c337125dc9395c5a3142ba7257da78f22ba986cc3b5b6af72b4017691171baf48537ee8eb18b9838f1776e7374 SHA512 5e3e789956a456fad564ef1eb57981826257362fbb1383ef661d5893b73fcc54e6c6103cccebf8fd2c4d7b7e76f7d7cd8060ee0a927c1fc1d5291785fb3f5dc5
+EBUILD Quota-1.7.2-r1.ebuild 1006 BLAKE2B 97c7c37da8e6a61bccbc0678fc2643456da6541f62a1c09e9a92352ce2a3901cc786c813f498dd4cd8be4e79b5999e0e629a6ef8098dcb36549d12ff136fcaf6 SHA512 73b45e6cd0820c8daf5c429e803a0af2276036afe0b4fd6c4af314c8b6cf34c99e3072680f48e3238ac31c027a2cf85375668476ad424b6e54100615efe38e83
 MISC metadata.xml 1097 BLAKE2B 0f42a9e1bd2e313d426329bc432a483de366899b90ee0acbc95587adbcf4137dcd21c03633caf77abebc7df9c777dd5681d51767d0877f99ad007cd8fee2934d SHA512 8f6deeb42c3c0dfa770d2e516611151388febae3fefdf466f5cfa6dd3af1bce6b2f55e578a1594cb4a126f64dbaae17887f083629543f57e066a08da87d0bc51
diff --git a/dev-perl/Quota/Quota-1.7.2-r1.ebuild b/dev-perl/Quota/Quota-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..bb9aaf148174
--- /dev/null
+++ b/dev-perl/Quota/Quota-1.7.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOMZO
+inherit perl-module toolchain-funcs flag-o-matic
+
+DESCRIPTION="Perl interface to file system quotas"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-fs/quota[rpc]
+	net-libs/libtirpc
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+# Tests need real FS access/root permissions and are interactive
+DIST_TEST=skip
+
+src_prepare() {
+	default
+	export mymake="INC=$($(tc-getPKG_CONFIG) --cflags libtirpc) OTHERLDFLAGS=$($(tc-getPKG_CONFIG) --libs libtirpc)"
+
+	# disable AFS completely for now, need somebody who can really test it
+	sed -i -e 's|-d "/afs"|0|' Makefile.PL || die "sed failed"
+}
+
+src_test() {
+	ebegin "Compile testing Quota ${PV}"
+		perl -Mblib="${S}" -M"Quota ${PV} ()" -e1
+	if ! eend $?; then
+		echo
+		eerror "One or more modules failed compile:";
+		eerror "  Quota ${PV}"
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Quota/Quota-1.7.2.ebuild b/dev-perl/Quota/Quota-1.7.2.ebuild
deleted file mode 100644
index 7e107a67f8fd..000000000000
--- a/dev-perl/Quota/Quota-1.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOMZO
-inherit perl-module toolchain-funcs flag-o-matic
-
-DESCRIPTION="Perl interface to file system quotas"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	sys-fs/quota[rpc]
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-# Tests need real FS access/root permissions and are interactive
-DIST_TEST=skip
-
-src_prepare() {
-	default
-	export mymake="OPTIMIZE=$($(tc-getPKG_CONFIG) --cflags libtirpc)"
-
-	# disable AFS completely for now, need somebody who can really test it
-	sed -i -e 's|-d "/afs"|0|' Makefile.PL || die "sed failed"
-}
diff --git a/dev-perl/Test-Exception/Manifest b/dev-perl/Test-Exception/Manifest
index d3c3a36012f1..2565746f31fc 100644
--- a/dev-perl/Test-Exception/Manifest
+++ b/dev-perl/Test-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Exception-0.43.tar.gz 15204 BLAKE2B 072705a06992fea690e3e71896fba8c916dd153f47cdaff4eb1d4f8730baa3e9589861ffe901208aff48169b8b054ca118cecf5c92c116be9fd61bf4748923a8 SHA512 f5ab65ce7b142ab7a96b0075838826a7f6b975a151a285e00d99db307bea07b359d5ca44eb678ba93d97b2ae37a112f0002ae1c06bb6e5654b80ce8c5473aa20
-EBUILD Test-Exception-0.430.0.ebuild 648 BLAKE2B c7a9f607fb836d2040050edd64129c565b77aa5008a43132338615eda9d36bb718541e15bce14abb08645efe69820e09b7d81e3b3ea39bbbcb89afdd3fedc0eb SHA512 b37c6b9331054b4270aa9a88820d73666d69c71356aaee19179a7048ef1a6b5ccaba7322f6be4f1baa74dbd22c0204f2e84ecf2e6f82e823b68d41758d5c2f24
+EBUILD Test-Exception-0.430.0.ebuild 660 BLAKE2B c4dc9e7ddfb40dc72bd8e2379fcdbac638e1908e35de34ade9a210a172e51bb7f4856f106beedc2250abb2945bd281605528f60cda3b08a934dd7d1d1a1b033b SHA512 c5918759f015d44f400465d739b6103e9d047eb6729ab6c6d09da2f9ca4e1379a80fa466c5b48a6cdcdeedfa7b0d9c28ea3228bf61966fca629e8b141c0bb486
 MISC metadata.xml 400 BLAKE2B a0cfad7338fd59c9ff94063be86dbacc79301f95f0fb4ed0c78baa75b976bd234c08574aa3b99940f73794fe037feb97924df0ab7a2bb1dca76e836ff99ae8b5 SHA512 c0cf344db8299f4f5174267d9b75e23538330143cba4a0c46bc8e8af29f5a0ac33f624dc5f86b7cc8d01b8ff28e58ef5480e13c378230e88d8a65b5393151171
diff --git a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
index 5b96f78862b4..769088bee316 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.430.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="Test functions for exception based code"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index accbfabcb30e..8b6c85dd508a 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 95a8bb6ab24c..88e0cab5a811 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 652 BLAKE2B 52446074ba284b01fa5aa07cc8c042d97936d891e87d5c60f14ec8de5f6f0e5e2a921b8d07766a20ac8a5a56c24321844ecf6d20ea5b62b8d6ff0f7d4eee6194 SHA512 b0718c5bc03864d5736ba45d02cbd8a59f8d23d1cd39b033547698fcb3f6c7a4d19acb5082b6b00d0e2e0cbc0d4271681ec792256eff7d7f1b56eee5b201e374
+EBUILD PEAR-Exception-1.0.0.ebuild 651 BLAKE2B f1ff0892ce6a3742f475490e4ba28777b88c5052bfbd2bff1c6930be12fc10b60e861f6ac25c5e0380132c3c93524e4d02188234a2c22fd00b18268cb3569088 SHA512 e60fa118d14002d9553fc0f0e1fc305c09416381f30c008bbec1745dcc62e967475c20213aa04e007760964b2efbf98daa73c3a0ea1c27bc4ef04fee3c6566d6
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index d74b26a0c5cf..6c3b38353d20 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 RDEPEND="dev-lang/php:*
 	!<=dev-php/PEAR-PEAR-1.10.3-r1"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index dd396d3304e8..90a35776ecb2 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -3,5 +3,5 @@ AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a7
 DIST PEAR-1.10.1.tgz 291167 BLAKE2B 27bb792db46e560fc8ba7daccc4a8a4d6580193bcaecab11548e10cadfa66a56242b125594b88d58a86974c2d82330d4cdd6ede491f3dbc2040efb3c646745d3 SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2
 DIST PEAR-1.10.5.tgz 291151 BLAKE2B b9095e6e488348917846693769f075c898271f2b65fbc69781247e8f46bf41afa4dfeb98d66c1aabce884e24c91bda50af3766745c3b8b5101aa54595e53c796 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364
 EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5088 BLAKE2B 4ad309d5296c0456ff1ea7ac531543bc98f6867e2ed5fbded5fcbbfb03ec82f4eae6639ad2be55731ce8803f2b6e44a399da873b979fce22cb7632975f7356db SHA512 a709a4874155a1095a390e159d77e797fc0cdca1b59929851a07e752d32648a27d36abc755c49a23fc6cc349dc0ef1a3f0012ba67c92b69c8c3c56b5394db22f
-EBUILD PEAR-PEAR-1.10.5.ebuild 5888 BLAKE2B 204c1df86a16cf8d5d96d3dd43b35051c55e1570be0917dda4c3c600e426e9b81c94b1ef76453584de3b26a3688dcfe39d7c5953dbd233a80c2ce2f8a61e9eae SHA512 f34595bc0309206203539c71d4380e63a8537eb05e77f4b0d309a4cf778f5a3f8022eb1c82c3994f615c76eb10a954e119ae053df98840cf09202e2d9d556d1a
+EBUILD PEAR-PEAR-1.10.5.ebuild 5887 BLAKE2B fb0d7fe43b72121e0a3e30cb2879d20abac0e0eb43c8384e187e82f0dc244c07e7aefe255704afd88d7f4e927bd2ab995d8837457c14585af73cb872f7204a3b SHA512 5a0643d8a0cc37d3ecfd0c1c2637e60ee3df6e6efeca3be3b53aa8998260e15cecae14678b13e59fe47ede3e8587f6141d8b212ff505138e53154f0242ca6b36
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
index 93c177406601..100194043803 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 79410201bd0a..44d51cc52be7 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 965 BLAKE2B 5f9137a431f59e640b3d120ecafc1f7449890ff16c104899ae3d6d238756ac9c07dcfe49535cd59236cf92a9d242754a8a92a22ddc31609c3a72de8a8a258abd SHA512 c3ea41e0bc11b249b5b39e0fd3366e9f5a75e816ce7db0b11a223c4a4aeb6a3e031d2824e062ff26f5d1e75c01e023ebf9dfd3a1d5fc8b8e0f18168b79d3061c
-DIST composer-1.5.5.tar.gz 1102418 BLAKE2B b8a29ab7473e439d0ff71ba5eb21a63a1c10a3f805c076c3af4f0fd46f5fe7a216085e999d3dd23ca78d769661d1bbfdf04ecf3c353428f6326735ddc564945a SHA512 c1021d1fb5ef992ea16023b982aa8ccdfddf7bce5da0945847ed28c555e795e7d23d4f0892e98d745784ab702e332217ea240ae6297bb18638b5161b6d7c84f0
-EBUILD composer-1.5.5.ebuild 1157 BLAKE2B ee64e916ba5a78f935b9a7bb6e68582048b8386b8aa14a768062adfddb01ef138683da9c5615303f66ea153188f3eb5ecddd96327c4815ec660ac5c556e9036c SHA512 57fe4fbeded645a0e08184a5d2aad81638a59a3cd138390abd59d2f919208a0eb92435e19d1e5572f4d0b71a041eb8b26ae870940ed43f19da90958addd18ccd
+DIST composer-1.6.2.tar.gz 395403 BLAKE2B 8669bd7945d01fe0418abfce70574f6f305f03508adcd51147f08e5312a6c8238dcce7144e96c92bc2f7dfb8eacba28d8156f9960239f1a3ff98230a96ccd21e SHA512 0569c6876bfb30bdec1731718fa5d21d34fa7ecd0d1fd99fe02caf73cb2631145ff7604a374c4b14dc91d5d8e8acf3ab0c52f0f7c6c11b63130a21db516c1391
+EBUILD composer-1.6.2.ebuild 1157 BLAKE2B 2a3d611fdc39228bfb67d4dde8e61f676e46cc31cd5e714c2a3445e9185eeabcc12c591d1613b7ec2808e6f702857f54a1e4ea537de642ad0769a2080a9e4dd1 SHA512 867267e16fd7588075ba537c105244cee5210bb0d5738a4e0b89c11e3c19fd5da6fd26d8c37da4802c32f84b38e3e7f8fd77a269d2cfa802be2a817bd611bda7
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.5.5.ebuild b/dev-php/composer/composer-1.5.5.ebuild
deleted file mode 100644
index 7e9f959246d2..000000000000
--- a/dev-php/composer/composer-1.5.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.0.0
-	>=dev-php/cli-prompt-1.0.0
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-3.0.0
-	>=dev-php/jsonlint-1.4.0
-	>=dev-php/phar-utils-1.0.0
-	>=dev-php/semver-1.0.0
-	>=dev-php/spdx-licenses-1.0.0
-	>=dev-php/symfony-console-2.7.9
-	>=dev-php/symfony-filesystem-2.7.20
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.12"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}"/autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "/usr/share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.6.2.ebuild b/dev-php/composer/composer-1.6.2.ebuild
new file mode 100644
index 000000000000..34f3d958c3da
--- /dev/null
+++ b/dev-php/composer/composer-1.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0.0
+	>=dev-php/cli-prompt-1.0.0
+	>=dev-php/psr-log-1.0.2
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-3.0.0
+	>=dev-php/jsonlint-1.4.0
+	>=dev-php/phar-utils-1.0.0
+	>=dev-php/semver-1.0.0
+	>=dev-php/spdx-licenses-1.2.0
+	>=dev-php/symfony-console-2.7.9
+	>=dev-php/symfony-filesystem-2.7.20
+	>=dev-php/symfony-finder-2.7.20
+	>=dev-php/symfony-process-2.8.12"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}"/autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "/usr/share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index cd471fce7984..fb8b51a134da 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,6 +1,7 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
 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.8-r1.ebuild 1980 BLAKE2B 9c1e584cc0322c4615a4be144e38e5b2cf34bf527889729630ec75ef1a7d860483dc57229512cdcc967298060aeae2c4447de0ae83e1ffe41cd73a951e3b14f9 SHA512 7e867d09683d87466f994f972b53d0a7c5ad7643313a1c377ed026d9c3e0d2d96a6de0e25db88b2ab6e3de16aa896513691f5646075a89538e7bb6d88cfb1961
 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.8-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.8-r1.ebuild
deleted file mode 100644
index bcf56069751f..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.8-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 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-apcu/pecl-apcu-5.1.9.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.9.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/semver/Manifest b/dev-php/semver/Manifest
index 698edb4dd519..e0dfda114890 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -1,4 +1,4 @@
-AUX autoload.php 266 BLAKE2B 283e64227aaaeee5dbcd00f3135cadb1c902a48f61779094b4a13b6e5faec96e57ffd1969cb51215962efc1f4059460d316ecde95aced3d6039733fe51adcbfe SHA512 a28056325fa7901a29fd5f060f75e74d23e1750c28c2051e39cb127fb08771268c25dc02dc595a932009ff715c82e861d390548910da536a03dd9ea533d72a6d
-DIST semver-1.0.0.tar.gz 9428 BLAKE2B cbdfa4a1a2b9889c683e498af6b83ed84a269993efb2223d1296455a634cf8ddb51b20e9af36ce0fae58a7ea4e4fa186c3e7a0a2912d2f7e73f82020c9763667 SHA512 7f7d529f7fb47049e65bbc47fcd4c1fa2dfef7de7441ed29d7bd81450414fbf3a4e0dfdfec0c9c019656d125e1591856a341d989b37c3aab70fbe5fa2f92f9a1
-EBUILD semver-1.0.0.ebuild 543 BLAKE2B e5f9c145b139bfc2198a02b9e0e59ca1e71970f567da3aaa05ab7aa9444d2e9b5376f979adf7bc58832c18dfd69360ab67b67478f5059d5661149184a9f3419d SHA512 fe2ebe513cfc270bb362a0168cd6a48dcd2136eba9b3bcb419a30d35f7868be7bf11a2c9d35be4ec3ed3ccd6c2b892e8a1fedcf9168153ec6eafa99bba1a3be3
+AUX autoload.php 251 BLAKE2B 6d0768402735be6031c510b158bf29c0bc38a7c59317319e7b3240275903ece9a24c6eecacdac60b7dcb41c8b06513972cc649f7a36064adf7be33e1fa25ab67 SHA512 acae828e0308a02338aa850f4ba68a8becf171e9ddc6d9d6d1f48dfe24b100b53cd7b5d42d723f69e4e19aded8fe36c86ea3172b5681b0d96ec9e1a9661460f1
+DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2
+EBUILD semver-1.4.2.ebuild 630 BLAKE2B 7741098c8702cf362044f6b6726df614cc85521f82e3a392ab79e47061691205c22bd4c74bb58cf2330f000b45b47143949f312a351e082af75ce10e1a3d3a43 SHA512 83b91af48b58ba6ffa34b26c30c0291c76146fb3088ce76fa5ab93a5b13888037527961934e460d6433716c74a09b02f9393d70280627a713686b9341a0c0374
 MISC metadata.xml 691 BLAKE2B d635ca9e1849cddd3377081ddd927fcb15d092728a624c408d17aa0a307751150212f1a4abacec0dc03618402f05cdd226f0cbbaea4b47d66141637f7d5c6aad SHA512 58d106fb2642c5445fcc487b818a7d0ddb21bf56d17455fd21cab83d9941437a4f339cdd192ca212645891bce3da01bf936e503b63665cf014d55ebe12b635d4
diff --git a/dev-php/semver/files/autoload.php b/dev-php/semver/files/autoload.php
index 2295f8bd9a0e..bf9e65beee0b 100644
--- a/dev-php/semver/files/autoload.php
+++ b/dev-php/semver/files/autoload.php
@@ -2,7 +2,7 @@
 /* Autoloader for composer/ca-bundle and its dependencies */
 
 if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+    require_once 'Fedora/Autoloader/autoload.php';
 }
 
 \Fedora\Autoloader\Autoload::addPsr4('Composer\\Semver\\', __DIR__);
diff --git a/dev-php/semver/semver-1.0.0.ebuild b/dev-php/semver/semver-1.0.0.ebuild
deleted file mode 100644
index aa18286b690b..000000000000
--- a/dev-php/semver/semver-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
-HOMEPAGE="https://github.com/composer/semver"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto "/usr/share/php/Composer/Semver"
-	doins -r src/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/semver/semver-1.4.2.ebuild b/dev-php/semver/semver-1.4.2.ebuild
new file mode 100644
index 000000000000..21aed1b27903
--- /dev/null
+++ b/dev-php/semver/semver-1.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
+HOMEPAGE="https://github.com/composer/semver"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+# The releases don't contain the test suite at the moment, see
+# https://github.com/composer/semver/issues/59
+
+src_install() {
+	insinto '/usr/share/php/Composer/Semver'
+	doins -r src/. "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index de0bcca1e94d..b0c57258a277 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -1,5 +1,4 @@
 AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d7a1565c4e2422f6985c0b66ac73ce706c4cb53261d05abf3b6e5f0724bdc34e497fa2e1abc959 SHA512 6dd28dc205943fa5fa8fb7577a88926573533d553e86577ec2d2e34045ea744731ea08c9dfee277dd1550cac033ac53d1648aa8b28fc78eaa73d0613371aaaa7
-AUX spdx-licenses-change-res-path.patch 872 BLAKE2B 35831d2ff12abe26ca750bb630ca43e9af783152887d704b0c16ad01882fc9c8ce2fc8346ec426b630c5642b979c85170d6729ef667ff004249773ba54ad7fbf SHA512 9050ac3f4ab33172a8edee04434f3e0c3b38d53a51c590d2c65c4ba0bfb0b718c702275cfd448bf6b850549589569c5a8d15d2f82fcb35c36efd9cac9e6deb1e
-DIST spdx-licenses-1.0.0.tar.gz 8244 BLAKE2B 57ef1ccb7f4165293c8daca0fe3e04322658a06a10e82b10ee0603974572c51fd005de7a530fce280d8ab3fa78fe18ac3bd64babdf2565eacb1c61a3f3df9ce4 SHA512 1ef19555f252c5e03fe3b0376442f47bd50d894effa04bca58e7644e18fcc2a905239086d1aaf31277ce5928a7f9743e123c767e197c0fa063c015ad14851a14
-EBUILD spdx-licenses-1.0.0.ebuild 596 BLAKE2B 80be834d56272bbea11f40fee8b9f2f7615f04c9a9748bbca27f46b6933e6f8507117e4a0d007efc7679dd35ac9ee96e4dceeaca2c5c5dda9176775a146a9189 SHA512 1ed43a022d3c0ff5c714cb278e68dcfba9ed7f8adfc78de1eac93fd7aaccdfb5197f42604cf0b9616b6bea07558c79a08c1f39f88012bb20e6d5575d76f4043d
+DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
+EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
 MISC metadata.xml 675 BLAKE2B 6ae4ff5df27e2d6334deee789bf253f71f6b55999e2cd9f0c4a1be6358c63c74f668624025f0d8fedb24dea3ccb36ad7d97972f1f627979b7c40e5ca1c389eeb SHA512 f660171c2d2bf3582a91e72a9a92b8f1270a1339c8f68d47c3d6abc2d642027873b8c6a4b2ec7c8bf968cfc37de208c3505899bc2d4fd472cfd403b73dd9fefa
diff --git a/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch b/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch
deleted file mode 100644
index 284cdddda95e..000000000000
--- a/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Fix the path of res/
-
---- ./src/SpdxLicenses.php        2015-07-15 19:38:14.000000000 +0200
-+++ ./src/SpdxLicenses.php        2016-11-13 19:24:17.659442468 +0100
-@@ -170,7 +170,7 @@
-     private function loadLicenses()
-     {
-         if (null === $this->licenses) {
--            $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-licenses.json');
-+            $jsonFile = file_get_contents(__DIR__ . '/res/spdx-licenses.json');
-             $this->licenses = json_decode($jsonFile, true);
-         }
-     }
-@@ -178,7 +178,7 @@
-     private function loadExceptions()
-     {
-         if (null === $this->exceptions) {
--            $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-exceptions.json');
-+            $jsonFile = file_get_contents(__DIR__ . '/res/spdx-exceptions.json');
-             $this->exceptions = json_decode($jsonFile, true);
-         }
-     }
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
deleted file mode 100644
index 099ed89b2b7e..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-change-res-path.patch"
-)
-
-src_install() {
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. res "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
new file mode 100644
index 000000000000..c23832e1773c
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Composer/Spdx"
+	doins -r src/. res "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ebec65781a7a..a31ed05b184f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index b0631814a7ff..93cbd3113eee 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,7 +1,5 @@
 AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
 DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
-DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 BLAKE2B 5a31ecd4c4e516dc0520591313f420fa3d56d46454ea43309b26bfc00cbd7b737efd244f1377e705b1025670257c39d47c1687c76d3af1893878d8bb1834484e SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731
-EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B dce917cd4c545ad37422e352b44ac582b7a5c346ad1176c4874ce08731ecf2e16a883ffafb5a28f9b815dc2ca342f9034a55a4b7df19e38317fa90b7ff7b818a SHA512 8814e5492d22fdc9f3e4af6d794545e258f57bfe6ffeee2903a94d989d174fb0c4169b2e3e0b676829ebe02e4f145dc94ce4311370028820ff2df17f47207930
-EBUILD PyQt4-4.12.ebuild 4723 BLAKE2B 441c0b2cfb0ff02295808a7d812cca49149ef06c7226ff95ff782ead9d90eab35af016188abcfe308d7d085058cc10aafb552dd4937af40af46090cc4fce31dc SHA512 04a5e08557d5f44c247105c9a52b3b524dc03f02e4798c7f3833bb6455ccc511ece323d3341c2e9e6213d9bd5f3d09b51258b006195a73072f5dc797ec448236
+EBUILD PyQt4-4.12.1.ebuild 4725 BLAKE2B 74a04ca3df420dc17b95bc5aec8e0d874c121a053c3018ecec8b7d3df567705ec99fe23fc8c9f567ecb22b95d74e0fea4e56b745b4af4d03619e370beca11380 SHA512 19fd9c014da59750dd5e0f5ada820ab7a97fc6f394d788f1d59d0e4d236d4d5fe2a8694e731e1200cc1fbd15854cc333f6889e6f21e2cc810f258fe6f5a8e38b
 MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 29f5ca288ca8..33ecc5f591f6 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.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
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
deleted file mode 100644
index 979f8323a03b..000000000000
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="X compat dbus debug declarative designer doc examples help multimedia
-	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sql? ( X )
-	testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? ( >=dev-qt/qtgui-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( >=media-libs/phonon-4.7[qt4] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
-PATCHES=(
-	# Allow building against KDE's phonon (bug 525354)
-	"${FILESDIR}/${PN}-4.11.2-phonon.patch"
-)
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349)
-	use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
-
-	default
-}
-
-pyqt_run() {
-	echo "$@"
-	"${PYTHON}" "$@"
-}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt4_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt_use_enable X QtGui)
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable multimedia)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable phonon phonon)
-			$(pyqt_use_enable script)
-			$(pyqt_use_enable scripttools QtScriptTools)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webkit QtWebKit)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			cp -Rp "${S}" "${compat_build_dir}" || die
-			pushd "${compat_build_dir}" >/dev/null || die
-
-			local mycompatconf=(
-				"${myconf[@]}"
-				AR="$(tc-getAR) cqs"
-				CC="$(tc-getCC)"
-				CFLAGS="${CFLAGS}"
-				CFLAGS_RELEASE=
-				CXX="$(tc-getCXX)"
-				CXXFLAGS="${CXXFLAGS}"
-				CXXFLAGS_RELEASE=
-				LINK="$(tc-getCXX)"
-				LINK_SHLIB="$(tc-getCXX)"
-				LFLAGS="${LDFLAGS}"
-				LFLAGS_RELEASE=
-				RANLIB=
-				STRIP=
-			)
-			pyqt_run configure.py "${mycompatconf[@]}" || die
-
-			popd >/dev/null || die
-		fi
-
-		myconf+=(
-			--sip-incdir="$(python_get_includedir)"
-			$(usex dbus '' --no-python-dbus)
-		)
-		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
-
-		eqmake4 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
-		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			python_moduleinto ${PN}
-			python_domodule "${compat_build_dir}"/pyqtconfig.py
-		fi
-
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index cdf7625e1927..62f37d8fa114 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,3 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
-EBUILD asn1crypto-0.22.0.ebuild 609 BLAKE2B 0a892fed6845331e12bce9e53838d94ff1d5747a6b845fad9caa8142bbb13391dcd371915bd1d62fe640e8ba94a786c7e3802c541975a3f8b768ec0bdb9c49ea SHA512 7fc7d0a4c1ead7bbeef4d6f54a5b0f52d714c942a29fdd41beb87fc629e9a72505e9436f25e2e597d9a0a02d5583f6b44822662a0ea1af18c12a2f9b2a04caf1
+EBUILD asn1crypto-0.22.0.ebuild 610 BLAKE2B 562ffe89a03cd014c14fc4dc9bfc453fd24a3a5fc910fad1a70cabbcac24445211bc1b6eaeef8211642c58ba820308dd9396e820fd9905d80cd02549669fef54 SHA512 c99ccbc6fd5f5b4d6c0c87d4332580e0190de21789cb82b99eda16a9a741beb5d37e6489a469fd46bff693bc1313822cc1a4e2281d99bcc509534a70f6752f64
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index ec5211d69f06..7d17ec13ec63 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 24828f7d6667..65b6d7b99adb 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,5 @@
 DIST Bottleneck-0.8.0.tar.gz 1634340 BLAKE2B 9ec38acb7d2415139b144fd4985d801183e86ef6f938d4f5d6232201e50a2d447959c2a7cde00a13d5455da9292739e4f47448ad5e9c0263e0a8b03fdd70029f SHA512 5b03ce2d0df9d177534d3f1fa02f147b12b23f5fbaa3b2685d1e8b86848c96c54832e0b0b6364479841742785c0b23bcccb51a0ac95675c72efc39693121dcaf
 DIST Bottleneck-1.0.0.tar.gz 363223 BLAKE2B 6dd8e18d14675c08010850091343856f2599de71ef57ff1b0bf1b748bc7f2e6d2d0fd0ad8ae1bc00dc38b9dd92676531b4564558b7ec0f9b79d2ebe4061a028a SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6
-EBUILD bottleneck-0.8.0.ebuild 831 BLAKE2B bda00fcc0cdfbeb48f7f2baace73426fe8282ee7d9ecc5565a484ec21749a8c6a84ab280ffb4c6585802acc780c1094a9f3ae9d929bac2ffc5e05b0fd44fc4fb SHA512 7db15dfec34df6b82db102aa665ae8b7c5dc19e220ba74ca7cb15d70fb04b989c300dcb57aaa8de003202583e9dcb917be2c80b07f78d3b1f554f46e0093e84e
-EBUILD bottleneck-1.0.0.ebuild 863 BLAKE2B 20539e2620ee5b9a741ffb3136f25c8283df9bd9c611f8d528cb71d9175b8b135d09b01d70e0e60fb5605c24e04f252a3c35a1924772907a98a0979cbc801b62 SHA512 959d7c17a2c92bfd9b9ea4ebebc03e23ca36faf08af6a9c125154ac1f3cef0b5f5a8e07b45970fd6f9c0df0404d353ccfc8e8a76c853a3d735f7ef5a2ab6972b
+EBUILD bottleneck-0.8.0.ebuild 831 BLAKE2B 103de6a29c0440201cae1b03582dea6a5e5b1be592b7f69a13bfd32341dfc717803efacf5a52f662b5f0bf85a0fa72b0c87e1e32d84c9b432b99ebfb87752263 SHA512 3ff934b2313285266689f5add87173244b76745ecb22e222a483b7fdb616f8e50dffcae3630c0112a7459a743e4dade7f68c726c431fb42e0b201f072da121d9
+EBUILD bottleneck-1.0.0.ebuild 863 BLAKE2B 2890747f60f36d38a00c4fbd6802f217a99897e4f4d93819c4f5f5c50ba9b769d2ff791cc8c9cd79b964d825889352e5b3b42cbd5368e0dcb2b9835f8f88c77e SHA512 27b9c5169abfd6434a957aa423302cd34d0faedbb288974854bdaa763d736470663e30605e616322f7aa407d25bd6789903db3a629747712613b494af04b85b7
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
index c23ccfffde69..122f38004509 100644
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.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=5
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index 3a9f09cbd62a..e8418e14afd5 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.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=5
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index c2d8cae5b953..92e76ecb6cf6 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,3 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
-EBUILD cheroot-6.0.0.ebuild 923 BLAKE2B ec9450c391457226a1449e536b5c9694488cfa02dfb1c7e51fd6ff04959dba7b115396ded4ba0a93013d5c95c39ff66ab4a8ffb180c3b11e543307ec3420f38e SHA512 cee1e51b2d172505a0e1fee09910fcb7d543048b55c167d433a5d16cc30b5355bcc3d97c6eb4255a53193791f2aa5101fb57a8c975e3c5620c2f53a090248eec
+EBUILD cheroot-6.0.0.ebuild 929 BLAKE2B 06bd6d597c356cf67f11c59ec5581aa8329755f0aa567fcd52dee2a22563ec91d1b821ee8d3ab857995e993dc84bd6b7e848052a630a8082e4bd4cbdfa23f259 SHA512 f81b94e434e4f9a20a6ded0673788444768a497d72b9a18e3d15400daa380358c4c633abeb3b97d9186a64d38410a1fbf1b204e0ebc75132bb38321e7e3d0fdf
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index edee3e0ea2f9..87d8ebd8f061 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 462f2a4cf71d..499a9f987ad7 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,5 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0.ebuild 1307 BLAKE2B 595b0e151246b7a46af2f6ddc6af41acf57a391a1c3d9efab668f3237e01fe770a98ca0d74161e654770cb9b45a7af4faa16dfa8725cee3c89cb99573d379265 SHA512 738e33a7fbbf4eded1362f184ab5a0a8198cbea3428b7bd30b245dd8c13e879fad0abcf90d41da9d1fbaa6846c012054a149aefacbff034c6ffe01425cc137b5
+EBUILD cherrypy-13.1.0.ebuild 1313 BLAKE2B 9223217ec3a6c44569863a2f2b3d3adb14877266cc5a0be1460a58351dcf8bfc369aebaa30ced963710ff970e42da5f32d6bd3c10a3d37e366d12e84a98f102e SHA512 d4e5491995b2e5870002936e239efc743b835a4d8be4c3ba9f0b8954a61452c1027bf0b3e5764798c7e9ef9a3b444a24311c07d0c125fc67e79ffbf00d0771da
 EBUILD cherrypy-3.8.0.ebuild 1661 BLAKE2B f3ebb5b8bf5ea529d9a3be6041b93f1490249e88444d718ef095511dea4af4f97c73841bd2301e5b084ce78c6b76b547cbd9ce72351276c6b411d26e4374f51d SHA512 7149cfa87ee95bed2f95e0107425e476155902f411a7261b4b05e8eb002aa3f4730d3c3469aad48ead90fe5838baa14b2e4e441e0d1848e013c88e9e8ecbf195
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 13a80e2b9df4..55d7017fb48d 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 00332c3e1adf..4b3fb7aa1aef 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,5 @@
 DIST construct-2.8.17.tar.gz 705812 BLAKE2B 3178f7f59fb893bc521c88b7ba51d6bd83cca37c1a243e602dcc2ac41a2cb7335e2cf69e7dff3b130e974ff9dbd01a12004423c3a88fc8e88c784c665437e901 SHA512 5bca40d7f33f336ab2a66546027c8bf24bf1b0125bcf425063b3bab14b1e3a96577d602db1eb73cb0ee99f90d92af6e24fcbd228912c0a70de6b2bd7d33e75be
+DIST construct-2.8.21.tar.gz 706022 BLAKE2B a7fb81185b380b444bede5dffce11158d93f0076cc3fbd836cdef3cf8425e2bcce0cf7b8e2d2654effc8beac3d3d0f722dd2786103f9b85f05b98216fc7684cb SHA512 f8e2c8d0f437cce760b1439fc68e2b10dccf852e1bf3c42e0569a3e32fe218d2a4d4cc662229455a910fa8a7cf0fc0500cb0d38ad0485f1b9fd954334f343562
 EBUILD construct-2.8.17.ebuild 708 BLAKE2B 1c67690079a5c288769c30c8717d0ba83c8df1e22fbfd84d81427364fc8c7c19947d6d231cb90b08a1137f16ea26f2df126872e83be210cb4893e33d4f90e4b5 SHA512 74633e9f4beb1abd73ea78de7e6ea6821f0ca0d0d0e429d9b90105aae5bddec5f7452a15e48824e16a2cfefc379d3a0db26b163a84a722367583d61ccb6f758d
+EBUILD construct-2.8.21.ebuild 712 BLAKE2B 2ec3795f5ae5e9e2afd3f553ed52a8d633dec54db08cc51248db47f8e73235ce7f126499ca590c8da4b6526068909da589fe86971f360742ea0a7abf62a47795 SHA512 04c172e06943f59b2a25365475605ab55f37e930f24f2bc199614ba1bd1e7dd9e4a40b19b99e4d1c49ba3c5288ac760200111b219c725daa9752e7803313e120
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
new file mode 100644
index 000000000000..70ec0fd0fff1
--- /dev/null
+++ b/dev-python/construct/construct-2.8.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index aa45e33e9907..b507604a3537 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -2,6 +2,6 @@ DIST cryptography_vectors-1.7.1.tar.gz 26652514 BLAKE2B 5aa670b4d52b010964465091
 DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531fc649a9843a9b7083a0a7a726ac89201f37016e258538671b15d4197deaffdb6902c345ff40e1da604e2b6034148d9c204b0ab1d SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36
 DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165
 EBUILD cryptography-vectors-1.7.1.ebuild 632 BLAKE2B cf2ecbb63c20058a909c1de56572b17fb8a96fd36ee35e81ee8163422508dbdf6c31d21e317bff332bcaa00bf7b6ab42e465210019ea70a25feebd3ef2c5a030 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b
-EBUILD cryptography-vectors-2.0.2.ebuild 633 BLAKE2B 5ba6d226f28599a4d150471cfc004c6a1c9f36ffa7258c19be485ded145266a6558e47fc155506e20e026ea0ccb139b2d8866a319e30c2ece6061c837d23ca11 SHA512 245ab5c5b17930fa85039307428ba2138484831b8dea4afb382425ce13043d66addc3d4616e5b40aec13d11dc8870c9e0b244d2b5abff87ca43b4b6660662ba6
+EBUILD cryptography-vectors-2.0.2.ebuild 634 BLAKE2B bd08d78ca9991391197a5924358e514cb34fc04e295f74611f7a7ea852defdf9ef3186efe13d5385f742d3850171213eb818c9f7bee9815466ba412d9a9c26fc SHA512 fd846b4ae8994bbdee8d0833f43bc6ce44efeee9036ca348ed0630256756b5766e2d6990a4b77f0a7593f333af805cd64eba73192049d59fee0042e2999fe45b
 EBUILD cryptography-vectors-2.1.4.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
index 926b73996f8a..2ec39af5a885 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 5e06f9fa152f..fa19cf25370e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ DIST cryptography-1.7.1.tar.gz 420673 BLAKE2B 8c0257187f29173bae610f191f6ae3251e
 DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
 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 1624 BLAKE2B b1da2d228a2b5804435e978ac073d15373d4a1ce1bb56b277d3eb8f66ff99410d5b8903cc0ffc620ac933f556b7fea9ae932a02db5e249c8384ba7a7990c3f59 SHA512 ab34101a8b2556703dfd1d4947aa9c42b85489c3556e558ce0e78b0ed685c00d836f4a349c623b78c5e1d54f92156d982bcaa9f54b04c8f960f447b5be390bdd
+EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
 EBUILD cryptography-2.1.4.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
index 1ad0041e1fda..e1a1c26f4aaf 100644
--- a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 0235832e08e6..ef6fbfd546a2 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,6 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
-EBUILD docutils-glep-0.4-r1.ebuild 1172 BLAKE2B f24fd73e88f9f598e4db51b58b248096fb472180d752c78bd8f2ff80bad5d9b2222b0ff3a2cf834b4aa61d7f1a1409e4b48c2c6824dddc56eeebeb086c305f2f SHA512 28f60c997dfd07a32141ead50c9367d7448b9fef9056a8e138df28d8ce47fd58961d2bd0521654a6fe31623d85f4ce2cef17d2ae5439a2419482d2f14e1f4a48
-EBUILD docutils-glep-1.1.ebuild 852 BLAKE2B c81d443caefac67452fcda6b69c545f627a7e41b1d7255e5037b093b884edb4bf77634a2350dae42cffb4fc4be745f50a4b276e3b2175fec98bd1cce1833ca1c SHA512 c9ad08e5ea30c2755054e81ba4516b0581ad2b6825906a382cbdb6ca60738f4308aa1f2d639a38e47908a2fa5c47b04b0844c38ae0995f77f1041d02c366758b
+EBUILD docutils-glep-0.4-r1.ebuild 1160 BLAKE2B dd01498b0945f97833ca83fe44b72be76200d08b4a76394dc0b8265de641cce0a85d094e245af02b7b1590afc211a218f52324a57683feefb17958683d21bf22 SHA512 083901d85a132393ffb1300bef09fe3f797580a41f3e74fb4dd6f6a23e621a353f262fa03b642a34f5a73b96c5be39bcaea6d531ca6881e36c7fd891078312a9
+EBUILD docutils-glep-1.1.ebuild 840 BLAKE2B b9dd7da733b58fef60c1f0d2765ba998a8fd56c513bd911739b50996597af14f98b7857a7fc4da938028899cdb6d7542c046b148fba5c6d4f0928d0f33836ec0 SHA512 b810f77716d42a9959cb2817b8fa55379becafcf2bbff53037a9136df7b415e89d8e7a3504cc0c98fcc897dd23410a24a9d8c9aad770474431a9d776dd7da66d
 EBUILD docutils-glep-9999.ebuild 573 BLAKE2B 032fc2bb940904ce0602226f004d4d8990bba9ffb35ca3e81774ab101106aaa147ead13d9e6bfbda48b7f48840fb4c0afbe5578a5c8e8070bde87afd9a7e164c SHA512 200f86c1399dda6276e98c83a649be7d1eae49fec9976f1b04234e61aeef73bb6f55a50d50b8add157e844061f7da7092e25e9136eb0acf059d1ab2f32200ce5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
index 3fc69600a5dd..c59e4ea50dfb 100644
--- a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-0.4-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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tbz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
index 76ae3b34e333..12405e0cd3ad 100644
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index ce9fdaa437aa..837f6eaf56b2 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -3,8 +3,8 @@ DIST docutils-0.11.tar.gz 1611755 BLAKE2B 78e377bccb949d5ba324b90e0a316b38d8874d
 DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
-EBUILD docutils-0.11.ebuild 1880 BLAKE2B cb81f64a2f83427415a89149e2b15e75f1fbd1fddfe6abc5f25085094ce6ed505cf7a9ecf34ed6bd9165414cf3d1f9c3cb196ff1727ce627fffc9ba90ac1cbe1 SHA512 46663d7ddab4817db565b0c45893796f09535d8f529e93758ecceace6a6c8b4b3fc7f466ffbc596cd20deb393bed8c9b347e8a0adc285c380d80eb16eefa5d3b
-EBUILD docutils-0.12.ebuild 1830 BLAKE2B 06d2107c27fc444b1ccd911c9f2cc0b648999d0146d9d8492df281def832dc3202599c58e84a3c503d64d5017880ba0d36c585e3a99afa81573cbaa7c0d0a5a9 SHA512 d6fe937fda326cc62b6e747f5e9dee812309539ccc3990b74d8ccfff66e8c8a470e57872dd46c8dba93dbc3cb721ab490765704998ad75087c1b602449f1f64f
-EBUILD docutils-0.13.1.ebuild 1844 BLAKE2B 02e2aed44725407bca5fb8469d612033402b111f28c9aa23c872cf5b4a607e2c6cfd501f08d5f300d355196966494f4e87de8f8e92075180d9b85f34c621bae1 SHA512 f72cd90c9d34825a1a310759cde12e9b1b815e2a6ff7680410e8f3a2fe0acc3975a73356c67596b412074b4d576cf26fedaeabdca3c7149b815072a978028fe3
-EBUILD docutils-0.14.ebuild 1854 BLAKE2B 424dadf3186c003d0fc1bfd8e9511cae06393e977b54375ad9c8598f919700eceb24c8335d01a735a7abc058eab7b82d85ba1965a55281f5b66d61adffba73f4 SHA512 66e6f8afc471b48ce3719cb435fdcc450e997b2af9a97b595662cf89f8622fb2593591a8d425972e9d074cdbef68a9f7f1304c67a86b55ef1a5cb0bda1cce7c1
+EBUILD docutils-0.11.ebuild 1868 BLAKE2B 2aef1d2091428c1694f8b46b8a7646394154d317d79cea4d1c141ba0ac2f99b945a780459d63941aedca1901735132e04cc0743d9601afd825a7ba5b61c7dfa4 SHA512 9da01a07787b013bbb2c19cb94098af8a96ab77d8fa4d875cd4c36ac6cd1e295b92b8e09e5966802e27a6e84c659f1c4419503ed66214027112ff82076f07ff8
+EBUILD docutils-0.12.ebuild 1818 BLAKE2B 0a5186b912d7589b9be20990451277b47873055fa09e06b3a435ad121ac58734230bd185ec0f473865588b2ad3983dfaacf6c25b6ac1443cf9bcc603bb3d0502 SHA512 05e85b00c77a37f821fc49272d2e8c4bc993a60de2de873eea5539b88de1f94e57c42ed0fc88fddcf0c314a0508d331fd89372b9f3745b64cfd2d9471dad3d57
+EBUILD docutils-0.13.1.ebuild 1832 BLAKE2B 72c8e80a995235365fd867022e987b398ac38076d73474606d689421a952417be960f7cb0e75289c83b1f16a4387c1d90485c5c6cbee58958a5656492ff22acf SHA512 e2df1abd90dd34531a3fa4e1a053097bed114d5a02e05c482d297a2df7553d2ce6d360fdc47f06928b34dd07289d5462baf5ac7f793a482d94e4bb00de6a88af
+EBUILD docutils-0.14.ebuild 1842 BLAKE2B a9c65ee6686a4d2d4dc4071227027fbfd0525ee426ac353279bd183b1f1d82b415ee8c850910cd60d9e365793ecec91f2da76ca7c3dfd8613a3643c189fb18cb SHA512 dfd0c911ecda2699014909ae264f481a3cd0b881f4bb6f1f85ab07d0537c6976cd43fd7d93d74c69b92af3cb449a6e07bedc56ffe52969ce88976d63dba47637
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
index 74f4ef82f19b..ad8c2c982407 100644
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ b/dev-python/docutils/docutils-0.11.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://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 76c56c7b0a09..16f246c118f8 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 2822eef75a65..527811c366ab 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 47f8bb06d9fa..42fde788ce85 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index 2d9c0f1957da..b1ba7327c921 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -2,7 +2,7 @@ AUX egenix-mx-base-3.2.6-tests.patch 1024 BLAKE2B e1c8716d4fdd5b97773fe46f647c93
 DIST egenix-mx-base-3.2.5.tar.gz 4575752 BLAKE2B f113aeac32f9d648d4f90124397e03f6cdd173a23a64b8572cbbf4c01a78c66f6853944616ca682e88d605a248ec9de6144f4430559e8d99c65710360df8107e SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42
 DIST egenix-mx-base-3.2.8.tar.gz 4597088 BLAKE2B 8f74031d5793cb04a930bb2192f7173e1c4c0fe32a3c1915d1feaf5db80711f2cd7344614066a60ef4d87ee2b3270197e706052bafdb7c6ea6f2a0176f14ecf9 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9
 DIST egenix-mx-base-3.2.9.tar.gz 4611603 BLAKE2B b27afe2c06458d94b560fdfc1559a5afa68aa904d0947ac972ed08a3194eb7a99c7a1f7b10f359fd46407f0ce02b7edd0833e05ce2faffd62ca924cb7f766981 SHA512 ff3b6ba90e9729004e7b18511a69529698b7d6089f08b686a0930d8f065323933e9fb97f2ed7a5b24c4bca0ddad1983773144b5dd9ee401859a2ffbfcfc79025
-EBUILD egenix-mx-base-3.2.5.ebuild 1511 BLAKE2B d0f851fba7127ee3030e8940cd1933444d30483dfdb161c204e6b9231e077c282c159f0c1d7f1bb44aec80d28fddd052128b90f5b4156dd3a7ec8eefd2ac60d1 SHA512 76e8306ca68d0970b69fa326c6ac24b953ebe3229b8af07623d373f2f097ca43392e78d67d56956391674a4a51afb49d6e5853d903facf577beb2b13a2283756
-EBUILD egenix-mx-base-3.2.8.ebuild 1615 BLAKE2B 27ba0704a75ec65c4ba4c0026a2ed36314d2c41444f99ae51ffc9999d66609ce3626edabface884f4007e01ae7c53121b025133d6dd882d77829fb17dcf03e93 SHA512 2315ae69d136c70f6198c9130a69ac240cd0f49fd4efe4e3d6e0bb2b05df77aae5fa34b7d36526a1842cd7e8278f1cfc9e15282d25913d5c354acc595019390e
-EBUILD egenix-mx-base-3.2.9.ebuild 1617 BLAKE2B 6f6c8a24b4d9f6366bf971e93994bbe5b8b7e135fd562d0a1a7a9060446e411b535cdb384fba1280f4cfd690aeb8284832c798b54adc3cf820ca54c9c9688950 SHA512 505f59c196bc9cd593cf92184f8f5957f0132c77d486fd8dc6dfde966e1c6778d6d5658a9e98f0da139efb826d16b3236c06754a2538e49e14361e5da9af17f2
+EBUILD egenix-mx-base-3.2.5.ebuild 1499 BLAKE2B c7eef1b0c94931ba47f2bce4b878d81b0ada13ee21a089ad2875775d8a23703c8f1f7f7e60bcd36da6e34738663ea48cb51602929688f82b0b2d33bc1530bfad SHA512 ecd254e1a4947c55c8b3af51825746bd87a8653e9699e8ba9e695c10487bd23a5c2f564cd8181605f4e23dffc0be8709f5baa7c29c73ce404f7b281f03e93334
+EBUILD egenix-mx-base-3.2.8.ebuild 1603 BLAKE2B a10fc2356a123e276ec6dd63c9a0e95ad84e67fc15344947731d204d84c71298c2cae52cc8f5c9b83f7b36e17a893ba201c272319099dfde6190b685f3d70d84 SHA512 408558e2216a1c798529474c8070001aba2873d6437418ac94f40795bf0bab138f22e8269ff3feb76cb46b424e71abfce305d437b71f7051d555583682a5188f
+EBUILD egenix-mx-base-3.2.9.ebuild 1605 BLAKE2B 586b20164d9dc0667083ea0db26236dcf97010ee02b442305e49db9d738455fbe4cfd792aeb0161cfb7121e5197eb5a5c114abd7e8276f9c09be12567fe8e391 SHA512 6a78ade99b00b230039d82b388061620748f5eeac241a65c207bf39229c5ec3f27e51794d21a8e2ee7187a28dbe623478f8dd5c4afd3b27b9757157db1351b84
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index b985a149ba12..5254624f8a4e 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # distutils.command.config writes to CWD, bug #450516
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
index cc4b4460693e..9b41ca58a425 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.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
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 # Correct broken tests
 PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
index c0345c5a668c..b2915766ea6e 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 # Correct broken tests
 PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 35c563707114..149c28eada3c 100644
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -1,5 +1,5 @@
 AUX epydoc-docutils-0.6.patch 1190 BLAKE2B ad424efe439798076d99e3eb5c516277eaf05fbc73a24bb07ac32d4199d537d1a93af15660543ba8a038edb2b8539ce2392c7f8d008a13d5ff8abbbae870c901 SHA512 d1366440fb3942d307508e2a629453dee1ba53dc01dccb6a424bc5486a34dd714cc5d502262ee4fa9d8191faabae61176592a950d0d7cfc0d037ca0fbd5abfac
 AUX epydoc-python-2.6.patch 2425 BLAKE2B 9eb7426637243073fc0ed93975e2ad77631f11243c5d22b5fe8bb79c7379ed0771ab3af244b10d88333394e4f9690fe117e60e2777646eed9e40d436af49ee48 SHA512 b1dbc9053125c770acb75a236a32475e98be41d77dc9c1816cc194297cbbb6334e3e4cdfb1b50e37ec37a18285be6675be50f8a029ffac96705c776c0768d173
 DIST epydoc-3.0.1.tar.gz 1785792 BLAKE2B 405e58132f4d0f9c40bfe58ada11618865e29c3b7a1eb41954f4769287ff780b4f17e57b50214fdc0f38a269093e35d11c83629e22c8ba854ed78ce299825826 SHA512 5c4011f0018ab956c0e1fe5fe0c1608fa2416439a60b5836a9d2d95e359428086ba403bcb5ed53e64d9d4979441ca6d537d9e5b8d6224d2202e7df3332d9ea83
-EBUILD epydoc-3.0.1-r2.ebuild 1141 BLAKE2B 5cc5648b1d68f0ac4531eb944b81ab71b2f9bbe3ca949a6a2145bd8a17cc096403fb016a313b1e6c8c0cfac88fb3b88588e5243e5335e33f6414ee1d536b45dd SHA512 2c679dd207b5670e0703d2c517bb89b32ac027e6530349dba6e0e66d81e49504fa0503d5dbbb679066ec06c80d965107a26b99f68a0bfc3e787fe7960e8d0e47
+EBUILD epydoc-3.0.1-r2.ebuild 1129 BLAKE2B c3364a90b101419b4d207d61e0716494196349737385a49b68f2aeaf7d4b0199e37ec5ce532d07c2366b550d82ca71b8d20e6048b1b5efb80110ade58e49099d SHA512 7d2b1dc5a3bbe28a82594cd63e43643f46e010df26071a8d154f91a1ec20e8b1727bf67e3ec037f0b8867c2f87fb2efae26bae42d2ab9d026342f318da4da3ca
 MISC metadata.xml 1217 BLAKE2B 89ec592e9bf635d08b60cede28d77fc2efc5674eb409120a51f107676c3f87dffb7ce57269ef936b723a55e32cff2287affeca88faedd7fb90264f52ada262b8 SHA512 3a8b0a2194a7899b9e7fedf2136a587e38947d395fda15d17b9ce6aabc65adae91783f8e4ab37acdc5b2ded8281615dd9831f5dafaf7e6c0d22ef771ce253c39
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
index 63cd3bcba64a..1cacbff4e908 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.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=5
@@ -13,7 +13,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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex tk"
 
 DEPEND=""
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index e9d0d79e650b..cec8ab328548 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0.ebuild 750 BLAKE2B 80621d904c627c29ebb51f5a2339ea63e45e1b149378cb3b6d8d3d8d16ae1137fd13c892cc0e458dd973e62239b99f12ce946902e0b87904f11785f3a86e25ee SHA512 c43aa4d3d363be6020c9cb13d2fcf28752cc78d3c0494101756983572c3c7104f5c7c7d93cb1f262d4ab035a7029494aa19feb4e9eaf6bec76dd7126aaa6c590
+EBUILD fields-5.0.0.ebuild 756 BLAKE2B e7c5e97e7fbcdb5d757585a0b3f0679c43fafc9a345078af2a0bc9f09f393101f26360ddb34189037bf7e0893372986b8b91d846d7d5b1e36d88dd3db85ad6dc SHA512 b6c076b20d2dbfc16f2a0a4f89d95ead53012a58d1009bb652eb5b4095cf4096851ebdd7ca649cb7a76af9279fcc549ce053f20c3d7b895f9cf4cc5dde8098ca
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index 8df43bdc4bb2..91fa01a5e63d 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index fedc1220527f..057c98c3e994 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,5 +1,5 @@
 DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
-EBUILD html5lib-0.999999999.ebuild 879 BLAKE2B 5c40d502b03171403ab0bbee8e24890cfcef366e537d83128ac6464675162817db53b089b1c6866f2296ada8c55fe6a842312b152faaa4391a43067ca5736db7 SHA512 b97ad3d5d8953fdfd5527a4f04e67c67eb9131d54c3d5155600a03f115c45855853e1061f5ab9ac6f747ed980268258726ef3ad6aa15736b400e95428090dc55
+EBUILD html5lib-0.999999999.ebuild 891 BLAKE2B 68f8c063fc19c261859aefb91624a712c8da006c939301d46c77d6dd050f940607b88e9bc82d5d2f7f615d8aaf427ccfce1deec046e67058aa590ed47701e1c5 SHA512 cd6f737f856b1b9d6fece5da6416b0bdb4eda80d3fc494a426060041c6b10e1d93250aae093f0297ee6e0a7011302d9009cf98d316d9d04f438478a9ef9ff987
 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 f53420c0ca0f..01deadfdd3d0 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.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 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 8a6aba55c60f..a4b2640bf36c 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
-EBUILD josepy-1.0.1.ebuild 636 BLAKE2B bd6bb2ffb5a6f76757c67152be8b38ff43530992cef53708dacdb5c6ee9bf42a4ef6a06ccb2238f0282925e03f17beb786b4c3fcff99d04d8b19378bf501e631 SHA512 f5f2a5921a848b092f92859d5ce0e51fad53641efd0c202fc23d366e23d37c3d71c9917e23b45a97be4a2fc97cf5871c6d6fe24907407377ac65be85eab5972a
+EBUILD josepy-1.0.1.ebuild 680 BLAKE2B 7762326b20ff3307cf1ecf66236e30e98c0d361fe9eedd9f37d6708bbaecef5deff77a86305565c7fe9dc4615dfac3ad681f1805c737d6b4b9f0367928f1cbc3 SHA512 2dd2979cda95190d23cdf94a80f3837da846862384136e1a6aa853d427949fe977e79c220d7098aa4b55627a5f958f056e6678b23e1def498aa8ae0201c08c04
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.0.1.ebuild b/dev-python/josepy/josepy-1.0.1.ebuild
index 115d502f9d0c..3cfd2a6f2aac 100644
--- a/dev-python/josepy/josepy-1.0.1.ebuild
+++ b/dev-python/josepy/josepy-1.0.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
@@ -21,4 +21,5 @@ DEPEND="
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<=app-crypt/acme-0.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ad21c37ea4a3..a7c97cb9dd1d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,6 +8,8 @@ DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb01
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 EBUILD matplotlib-1.4.3.ebuild 6150 BLAKE2B ab34b10ad72a013c9ccae7c6b34b2f624169c44df8a149dde10a6fb5448f928bdfb107e39cc220b54c5460be1645d3bcbf8278a37b20f3906776aa0f2094b715 SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46
 EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
+EBUILD matplotlib-2.1.0-r2.ebuild 6230 BLAKE2B 32fd252c9c94b28951eea2bfc76e9acc763c584484934a4b01a86515592a11dc23e476cd1714d1b47b05ba792ebce1f63d62b7729d2333488cf7ce889618614b SHA512 7bfd228192a97f11b7e44f7034abd11fe52d2820fbadacf3e2398804d86af7c4b9b28a508339aa122fb9d63c5f933aa811d1dac18d9b9bef1c6942e619dd3752
+EBUILD matplotlib-2.1.2-r1.ebuild 6284 BLAKE2B 8d94e2799442b4561a5a1902f6ac3a7d2d008bdb331310f617ba368e349e3ba49733da2aca0462687ddf8e987520fcde5a43d568261daf6c60ed219173e6f67c SHA512 9001327a0669e7a8a18a8782d1f0744e0b9e5663bc138ed8ac509f5432c809eca206fe1d6806f10bd50dd26eadf536f124d8ca268557b5807f25c6102267d8fc
 EBUILD matplotlib-2.1.2.ebuild 6229 BLAKE2B de1955eb1ee57e9a64108f4d79ee4ba4ddbee244176f94885deacf2870d0940e15528c254facdab50bb036d42eeb1dd9feeccfbdcb86f041e3db0a8ca7165ec7 SHA512 0b694d982e432f5566b2f4ae075a8723d284ce5d9e334a8a975b1641e21410f0d35a6cddcc9d2ac62effd7e2a5012c5d49d2eb80d9bbc41c76353c50b42b11f7
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..0e4935861800
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
@@ -0,0 +1,253 @@
+# 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_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..b7615416dc61
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
@@ -0,0 +1,255 @@
+# 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_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 80767d21706e..661bd0588d59 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,5 +1,5 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 BLAKE2B f98cdea21ad015e65f638cf5828dffb006ab2f142c266b54f851faa3b38885fcd29ef8717d62235e675a8ca3fcc91fdc8d8e594be2c6404a45c3dc09b5401f1c SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
 EBUILD mimeparse-0.1.4-r1.ebuild 1158 BLAKE2B 8222072ef7a7e7b24cd2f849bf1ab472d7024fc0258ff47dfe61c81935b3e291eb625eb14879b6586adee63e4b11c17813a44a7516d46d8417ad77df2b3a777c SHA512 77250c17a627c22853db5d2caa05dae861ade7d7fb0859997035e1163730523799d6cb0d2facbd6932390be40fbf38dbda61df086e7cc5519b733982147560e2
-EBUILD mimeparse-1.6.0.ebuild 1195 BLAKE2B d604743fd117035e6d6724bae38a247314e343aca66531a8d3a4cbab16db27834dafe8d4cf92a105e08333a73b8d6f69d9c70f87a591261205c9b7233fe171af SHA512 773a843d5e3bcaf05f8755e3fc19574229346177b70b126b64e278150b5e227627ca9b9e3539c8549a35afc88a104b9faa7616d0a40ea63a438ae3eeaa04363d
+EBUILD mimeparse-1.6.0.ebuild 1194 BLAKE2B e78da00488122ab6283af6ce25aca72f9008a500dc7b6c747d9fb6bb488f4e1557eff6fc1119f4a6e71ac9191432da9a5b09590124212f9f4e9ba17d806a7ec9 SHA512 2af2c2ce0537e5747db45c2f271196a7b4d86c0a24ccf15ff9f96b6de001611fdf1c5089a917aece22ad88307791941d29a9f15134c4aa3267504b11c046d744
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index 6942247da748..8e2527bd6836 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.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
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c121661f1889..5f6580f7eead 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
-EBUILD more-itertools-3.0.0.ebuild 932 BLAKE2B d6ec11c510198390910ffc62c56bab5b593231c5cd48f654e4dc7394b0a0c4d23341ddaaf458efde82261a0c790d5982585139a3faa6ce8cac7e175ae9527ae3 SHA512 a8a11985e3684e3d9425920cab028e620d917a38041051039661046d4a1f696e619ef9b5e81ef99b4b33c3e77aa21687a93bf0b90e5ef1a690603636819ba576
+EBUILD more-itertools-3.0.0.ebuild 938 BLAKE2B b9ca9ea14f323bba0096c463bf9b78defc0bf099bdda8d072115aeb4689b8c11263009d575768c22f1d300acc6e422cd2354237a12e6278858bf26e876ac4e55 SHA512 6d34438e310ab1f9b2ac8be045ebce01e4fbdf2f2d2fd7b9c70346b0b8c8aef5f6ee50dd37e84316f523b2ec6a4fb32577275fe1639327201ce3631e4c5ccd1e
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 0f707a6f089a..d609a963b321 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 00c13f831b3a..7fec5c04a09c 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-EBUILD packaging-16.8.ebuild 1461 BLAKE2B e84f2fa0a4e839008794b5d8a6bf8944e8d4c73940e65728a951426b65fc0c2856aa1f24e811d47bd51d768c1e9f7a4150bdc06b6c9ad1cb6722769aedd0eeac SHA512 07a982c089274c472bb4ff5050bd705aa9333fdf9267f72ed1fe79bc1a305bfec6db2f4503ad0fafd6e145f7caefc074438504872f20ad3e13dd0d29c5a8b464
+EBUILD packaging-16.8.ebuild 1449 BLAKE2B cbfd2dbdbc5e5c6cfd0c0afa144e43a74a28fc5b79cb93db7299ac12521ed48e12ab91590ea24d48a0ef69ca913266325219875518d806860eb04c8c2e449ad1 SHA512 ff504a98f6843c0c28512618ee1aaf52ba42565215fc3b91a83116d531438bed2074b64c1aa3963e4b743f67f33daa213fec682c91a8a41f15a57c37f7d1dd07
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index be9240f517a2..a15cdbbbd337 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 7e676cebf67c..fd198f8a5c56 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.15.tar.gz 22334 BLAKE2B f07d41d212192281008173f6314c4868ef993dd7c8220d21e2d45d461cdb5377c61acbd8d5bf7f915928fd007e844cd50f8b5ae9b87d1a6d7eaea97f0529b1b0 SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b
-EBUILD pocketlint-0.15.ebuild 480 BLAKE2B 544e03cdc085b0956558c5434f4a325dbcf89537e53200437b7b205207f93eb53b9865e77ec408a18c1c05b21208d85345f71cfeb450c684bd91d39f9f0b5a53 SHA512 d7e08248c944413c00271bcd83804119983a91feea6489de4439e8f9fdd6d93e20fb68c1664fae23fa43675ef7e91145b8f8ca89b16b247b05202bdd193b0c62
+EBUILD pocketlint-0.15.ebuild 477 BLAKE2B 36f05154d338d4d9159d7699b81003dbeab542ec647adaa7823b7e82e63f6800b9933abad3a358f782385e98d158431824566e8f3c59168b44ae0963f9735c9a SHA512 19f928f63ed333700b4b9799695349979376049dfb35cb35a50b3350f18856b0c2804870ccd508ea83c25e7643227d29bfe159629c0c48265cadf7d0f84c3a57
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild
index f951396f16a8..293e9d7a8e81 100644
--- a/dev-python/pocketlint/pocketlint-0.15.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.15.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 382340548ee1..efeb1512191a 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,5 +1,5 @@
 DIST polib-1.0.4.tar.gz 151634 BLAKE2B d0f28ae50e1c082f695867da2b65721d161b9df56b4978feda59388b20fee3c3a060438aac0f1f08420d5133d1b5425715a3c0cb00dffe0e7515d642e287d2cf SHA512 a38d57acdaded0371be83825a28f14f178aebdbc0435724f33eebda109adb2b8210e33659ebec88d2d9e98aa60c482d7f8a958ec18f6769fda7a2fb14edd2744
 DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d1749752e1c9a563d9285670db5d43d7c5015fe266f78c89d1ff7a334bd2afe2d7d8b68fb376df35f8902cb0ed SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e
 EBUILD polib-1.0.4.ebuild 754 BLAKE2B e21ccda996b866c4e4aaa37aa6290ffc897a6910b2c9cb3d7415b6aa3c4316f7a04449ac0f7617eaef6e32a02f1c6cd9b74c8f2adf0817e145ee0807e9c5fe62 SHA512 7ed72366cc0bd3b039bf9492143c9627ff9213e86473f7e98004d9f0aa4869cc36d939678ea30fe83206b1b5c19e1df6441d4bdf34bf7958c638d5225fc5e3ee
-EBUILD polib-1.0.7.ebuild 800 BLAKE2B 16ebb715904e97e70560006d1712a3ae057bb585b5e81225a55b823b5131990ae8b31f8656a6d4c4449ca60b70a32a61aff2deac30a8d8a80bfb74c8407668d4 SHA512 252c214ecb2184e678a3636e5b508a1f845aaadfc1acb897a3038637a43141085adcaaeb58a001d586b463bb6f5db3b69d83401dd4f7e6311a52767d266cfab4
+EBUILD polib-1.0.7.ebuild 797 BLAKE2B 5c1255e810ff817496ffc262b5ea04299321c93f9ff9950b47cd8d499774818ab6d916efbb276c57752a54754982a36ff2c77c4597c081ad682e6bcac083a92a SHA512 3a14e043159afbd6ed30ea9977309245186f2a627e2cd237feaa2e16a7faf40e6df867a4beb1ec278adb3065725eaa6ed3d30e7d95ab031be274bfb5691b28f4
 MISC metadata.xml 388 BLAKE2B 49be94fcd86aefe8e2c4ab2035478b470236492908f7d08822a4e035277c83d557f78076d72cd96d6320ec08276c629dcd52d04380518cf694c10ebdee0bce16 SHA512 7afe518c98f3cbb71d13aa4cea16fe59eae8f711a1d1dd58c982c1dd8946b0a69196e0979612c995d53be215148d05615226eecc4be457adf8cd35b96f3f3f57
diff --git a/dev-python/polib/polib-1.0.7.ebuild b/dev-python/polib/polib-1.0.7.ebuild
index 0495d83fe99a..73369498a496 100644
--- a/dev-python/polib/polib-1.0.7.ebuild
+++ b/dev-python/polib/polib-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 8db746976034..9e6adcce1898 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
-EBUILD portend-2.2.ebuild 713 BLAKE2B 8373a2a22b28185f5546ca1d33d75c0e69c7ad7a16e415da3fd2e3904590ecedf25a89a1d41738842920600a5b9ec5c1ae63077d265055fee330081223039270 SHA512 580e2db88eed8356a627af8f9ba9e9483e3009564f01c0498d4e367bc9bdc2d9eb0f291ee5e5d21f95785b56edefe31603e01289fc4a91db6072393bc48e3ba3
+EBUILD portend-2.2.ebuild 719 BLAKE2B 868fe2b8b3b2d8b8a9bc34692c7adf3c30b9b282b496a11646b2e72d16a74a63126846fd1d201e00d85bc7a960cf658caef614a8903eb5216a5eaa4d285c1e3f SHA512 36f519767a24d7971b0ea5845a733487cbd7bc7f5b524e8d1b490fa9633ded90ccbb6fb3eaa798ce44bebda0d0e9c0b936edbde711094e0efadfbc9a0d3bdfdc
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 5c7f4e15219a..136a42637fa3 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 953ad2f067a2..dd8724665554 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,5 @@
 DIST pyblake2-0.9.3.tar.gz 130641 BLAKE2B 5165f104b5d6bc10bf8b72177b4ad08db55e1a92ad1f04efae2c3d73b6f3f52a0962cfb23832a5f5c1ed9d75c7c3a04be9c37643e381abfc7a2f843fefb43151 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
-EBUILD pyblake2-1.1.0.ebuild 781 BLAKE2B 8d0ba783acaaa3bc5e859339409b678cccc14906cd8703d273d2cf2d9a96c299be625a37c780a4cbdd37e98d9aa33edab51c60db6ef1621b29c96c054c0fc805 SHA512 c5247439cf39631e0826cc380b9ebbee49d4830b44d9a9cfeed5e138ebd147f76bd517d5f3b4e46722af41172db09a9666c7b55252d87e3d856e5da173d254b6
+EBUILD pyblake2-1.1.0.ebuild 805 BLAKE2B f1c7beacf65577897f7edf2617b9cc8e3f792c82a0c9652e62b282b93ea84a3d3af38b1c39a53dc9adaf681511dc9007e90c25f66e2cbd68d7207265a62d49c3 SHA512 f122c31a9f37dd1388f01c4adc8b6b068ae179e4b7bffc4d43985831dcba6c98d36bada89c1397d7afeec943773d6cc28375c3c615738b56d38445b53c0c65df
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 41255bdd959b..f9dacce78ea7 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index f8f00a78d8a1..098eaf38a9cd 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,9 +1,5 @@
-DIST py2cairo-1.10.0.tar.bz2 402070 BLAKE2B 77a0c85d687f286bc77d6c8f05b50d534c7d2569cdd34fc3455c3d1e46580ba10131253ee94f3c5bf8bdcef433b09e75dd7d5f35f0c344cce571ed64979d6c35 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc
-DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 BLAKE2B c2e0797e60b17bb8a871607abe51ebeb49a34de2036d5fde062abee532f5589156a80c8b6bd8d8906d2ff694a5736e28c6566db4d472a824aaaabd2c006dc297 SHA512 c367a7d8fa771ac900ca3363cb7dfd50de045cf67c73c6e552d05018c6933b13dd5660b033be59e1acf8af79f16253a8e56aaa3f135a262a8148711ae8b7a587
-DIST pycairo-1.10.0.tar.bz2 246556 BLAKE2B fd04135ef5c4591641cd3ec29aad4de70946962cb0473e737b7cb4ab1d88295cbd920a598923e0c28af44175a69ecfa194a7a64ca27dcc109b93f1571cdf2fac SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
-EBUILD pycairo-1.10.0-r5.ebuild 4801 BLAKE2B 9ded1e263bdfa4ffb0c3191372936a674afe9f54daea7f322febfa800360d81e0dd5e828307afc4d89b0a1229ebbcb15855f5640e49868e78313afd5adafa1ba SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a
-EBUILD pycairo-1.15.3.ebuild 1608 BLAKE2B 4749c1ad1b98be907999897783bdc3e576457c0c9a678c45ddc12bb39a7c44aded89ba8e2a0ecd4d709a523d64239386748d788260f625d60fb4da36bd1e350e SHA512 5feda5dc1598b37eacac9a93d2d59fd99de65575866f2c98fe911295225c1fa15aeeeaf41c0187ccac170ff6628e431180d2570daf03c5207a2399a6769b1358
+EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
 EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
deleted file mode 100644
index b61eec3973dd..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils python-r1 waf-utils toolchain-funcs
-
-PYCAIRO_PYTHON2_VERSION="${PV}"
-PYCAIRO_PYTHON3_VERSION="${PV}"
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
-SRC_URI="
-	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
-	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-# LGPL-3 for pycairo 1.10.0.
-# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
-LICENSE="LGPL-3 || ( 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"
-IUSE="doc examples +svg test xcb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/cairo-1.10.0[svg?,xcb?]
-	xcb? ( x11-libs/xpyb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-unpack.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-101_pycairo-region.patch
-	popd > /dev/null
-
-	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch
-	popd > /dev/null
-
-	preparation() {
-		if python_is_python3; then
-			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
-			pushd "${BUILD_DIR}" > /dev/null || die
-			wafdir="$(./waf unpack)"
-			pushd "${wafdir}" > /dev/null || die
-			epatch \
-				"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-py3_4.patch" \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-80_fix-pickle.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-81_pickling-again.patch
-
-			popd > /dev/null
-			popd > /dev/null
-		else
-			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
-		fi
-	}
-	python_foreach_impl preparation
-}
-
-src_configure() {
-	if ! use svg; then
-		export PYCAIRO_DISABLE_SVG=1
-	fi
-
-	if ! use xcb; then
-		export PYCAIRO_DISABLE_XPYB=1
-	fi
-
-	tc-export PKG_CONFIG
-	# Also export the var with the slightly diff name that waf uses for no good reason.
-	export PKGCONFIG=${PKG_CONFIG}
-
-	# Added by grobian:
-	# If WAF_BINARY is an absolute path, the configure is different and fails to
-	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
-	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
-
-	# floppym:
-	# pycairo and py2cairo bundle different versions of waf (bug 447856)
-	WAF_BINARY="./waf"
-	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir waf-utils_src_compile
-}
-
-src_test() {
-	test_installation() {
-		./waf install --destdir="${T}/tests/${BUILD_DIR}"
-		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
-	}
-	python_foreach_impl run_in_build_dir test_installation
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir waf-utils_src_install
-
-	dodoc AUTHORS NEWS README
-
-	if use doc; then
-		pushd doc/_build/html > /dev/null || die
-		dohtml -r [a-z]* _static
-		popd > /dev/null || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names; next to waf producing dylibs (not bundles) and
-		# calling them .bundle, it also has no idea what it should do to create
-		# proper ones (dylibs)
-		fix_darwin_install_names() {
-			local suffix=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')
-			[[ -z ${suffix} || ${suffix} == "None" ]] && suffix=".bundle"
-			local x="$(python_get_sitedir)/cairo/_cairo${suffix}"
-			install_name_tool -id "${x}" "${D}${x}"
-		}
-		python_foreach_impl fix_darwin_install_names
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 3f400cf8083a..7866b76d519a 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 5e3d697ab5cd..7e816b2051da 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,5 +1,5 @@
 AUX pycrypto-2.6.1-CVE-2013-7459.patch 3808 BLAKE2B a13ec783c0a99f06efba4caa2f77cc101bad577c47eeea58a53aaca343fb6caa4ba6e617c5ff07808781c2fe71a2f48fd9a3ec4aa18d504d56ab0e7a2ec9f40c SHA512 b34a28fa886ad749878aee17459307fb3006f392304a368e9c80b9beac78b1bca2f35831664e504097996ae1be4e1e81eae5e68b211e47fbf11f2b05b2379fb8
 AUX pycrypto-2.6.1-cross-compile.patch 489 BLAKE2B e4505725793379547d13a3b08b3621471ae0828915c48253aba778b576c3b379267210e5e763ce9f78f3f9ff992b2521c9a9940c744042d16ba992b9e5728b17 SHA512 fbf1f5b6d065725e84594c1493d0d795a9f8c73d9e873f28b473ebc6bf2f346330d5a92362e1dc09f465227f0bc839ccfaf8dc0011c21323ac80931f74b16fca
 DIST pycrypto-2.6.1.tar.gz 446240 BLAKE2B 89c9cc5b8cbd446364bd56c170c2733b960ec269a6691085392b3cc0ebc2eb244721f6763ed72a1254f90bfaadee2cc1a8446865a95fca19ffb36700d89711a9 SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847
-EBUILD pycrypto-2.6.1-r2.ebuild 2105 BLAKE2B 1934496680b39cfd9b6cf5065a743ee633cfcabc836aa244dd3fb394f97c56bb878ea18e379ec91ed54b43a8d492f475e11ac04583a068e7b4762afbda4ee965 SHA512 122808e523aa259994f6b729ff3fc51db168caa9c95ce30d09ee76ee647233ef0578bca6f6d099ac420828b3537152ac5ca309c2ada25a5ab27ab94f74a07fa4
+EBUILD pycrypto-2.6.1-r2.ebuild 2093 BLAKE2B 54768a4842e8a1c71ff169f2d6dc85edc7d6172482439d13348f24260368fdba5935d2eb1d65c859d1aa5107a01726b426ba19b5f53ff7998eb42a14d7ed1186 SHA512 676a6bee8c14885bf8b523e5704b849f4410d7cd159c3b9e600288bc0079c429c92114799312aa8c51bf08b8481c395d04b601bdf3ae2bf5fc25cb59e0312e8e
 MISC metadata.xml 1797 BLAKE2B 0880d583a65ca52fccc51fc6451205ad5ff2bdb49e861c8abc3586e396fdff72fb1b30082b44eb6a48c4e5be32895a5e4a74642821b9025e8ec0b1d81ee7620e SHA512 63afa4bd18299965a4e5ae4690ece849a00d568cbae5bc4d7983f4299fa0755c5cced81a8d160820b3b3f1772c5b40d0e81d8ac2b4e784f4017400acb592ba65
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index d5de62ef8300..d29462284470 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.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
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 
 RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 171dd93e5f5e..c94a75120dd0 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,3 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
-EBUILD pyelftools-0.24.ebuild 916 BLAKE2B fadc7507a61937c8f9faac5519db03fef3880444c3bc6168065f106a82a3f6e2ee036efec66f68520ac681906736f93414e92f21b14a9e253ed66f87c2070c22 SHA512 13f55deef148eb1522ba8dcb0b1c090d95fb61a72036b7d918a5cd08703c935ac7a83d60022965d28709814da98ee1ed3a1ccad07d8a661f2a5199e4d8163cab
+EBUILD pyelftools-0.24.ebuild 904 BLAKE2B c5bf1c570fbacfb2561365c361c9dcc0955a13168eb905f94467f2336fd9ef8db9af74340c8037109dba8e38262f272b63df159de45f37751205c0eaa5f9a72e SHA512 b6a8994f6d3f1d31d0fa7770786a058a67adff181bb978126af0dbbc5cdd41b099279f87de5717854e5fd2d7326c9d5a134cce40e1aba436dc92d933fa1c12c7
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index 57e50c588117..bab6324ff1bc 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.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="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 9171640d314f..fb2ae5f906f3 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -4,6 +4,6 @@ DIST pyOpenSSL-17.2.0.tar.gz 170816 BLAKE2B 10abfa61ff329d23c99897c58a02a487c28d
 DIST pyOpenSSL-17.4.0.tar.gz 169362 BLAKE2B 87a51efaa157b4a91a48edfcd9348402b6734e1c9f78e7ed638e3d245ae3922083c625e3d967e7513c588e131f96b06f110ae528cccbbb820f685afb9dda72ef SHA512 c3c791b15f2245d3c1381f84471f9e1b07b4a01c318a5a4012ec70193ba055fe948ba150f9c88d2dabe30b37f2025fe26ffb95c01682ca656d561014d41cf965
 EBUILD pyopenssl-16.2.0.ebuild 1596 BLAKE2B 2fddd33669aa0bec3680851737fef5be19fdfef10dce644afe2b3e07c8e1bf452263555fb4dd6e21759e7416fabdf7e470bd3a8c7a255d96feb10401d3f52bc0 SHA512 f91345bef67ef4d002828b6db8cfdde9ea1bd2e502672e2c29be7cedb814127a0d7f08ac0ab1c601b7056a406020bc3569c5a6b163fd3b13d92b6290afeccc2b
 EBUILD pyopenssl-17.0.0.ebuild 1606 BLAKE2B 170a0d141beab15e063bf6137e7ffb052265676e9ab9134748f9cd608a1af8c1c30354e0b9f29ccb576a7449ba7f96bde4900b93a220ef04d7e9c31110e152bb SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f
-EBUILD pyopenssl-17.2.0.ebuild 1572 BLAKE2B 7275d0930b1816d76ad8afa99384eb50b8d68d705e6b5a5dfed999a592a92840e8140eee12447eba6637f169610b4d0a2ffd2069c04e3dc8da62a971b5afbf76 SHA512 ffe07c7353cdc75044cd5460cca76ecc7a73dfc4c4b942cbbd409612f61e58e05e2089b7ba9b02176e7db33479a849740320c8bdae0104a630aca59807322f80
+EBUILD pyopenssl-17.2.0.ebuild 1573 BLAKE2B 178c8cc77f28ad47c854f60689bdc25378c32dc3cedf8bf4ff1c1692545a8a49618f2b19235c8d60cb3c57520d0e183c2466a85b594902d9cb9fcb8539e26120 SHA512 927ac59c13d8b688a27f49a56ca719656755930eee39de29ff84e3206af271e8b0bf30b3aa3a623aa9d14cbabd4cc03cf2724646161834d2d713d1c00e98b4a3
 EBUILD pyopenssl-17.4.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
index 16630e5d7b90..d8fe4c3aa6ac 100644
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index e663a4534872..f41fad330a30 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,3 +1,5 @@
+AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1238 BLAKE2B 09a52183ab978fc941cba857271228ba036832a2c7b48dbdde728d6903c5eecd865f9ec9d04730fb5c0e5e9eed5f12bc062a64e0494dd3031f614fc5b75770c9 SHA512 2de86ee403ecb209a5093575aab31f7aefd39ad36f2b745fea393f83c340eb2ff15872ae0dffbe3bd29adeb1956c53bedc0f0b10462ee6ca9f2e3dc686f4f5d5
 EBUILD pyqtgraph-0.10.0.ebuild 1222 BLAKE2B e0daaed27a5710a98e09508fd047492c89ea01fa8303cc4c1f370148d8b530da6905e7ffb51d6c4cdbd7df9ca24e6c07f66e366a7488a36fc92a7d3a40af4ac4 SHA512 8bd56a0d401ac1bc1d5ed34e258d912cfac4dfce5ee5f483710716de73bc072c9f94a342478bfc77c50140b3bd90bc4fc0141dcdd568c5aa3fd7a6d4aa58bff8
-MISC metadata.xml 334 BLAKE2B c8fcfcad89f0666ad4d69bc47faf07e9834a321839064177fa1d35904be17625dabc122dd467736854513d1f481a486f880993fbe366404aaa73b2ab9b813c35 SHA512 0508e3e04125aa9ec46c82dd47593ad3055ed8769d4d1499d892986db40deb9f5405a57546e48f06149c0298bd44582efb53b4b21d67d15e8c3b3fb3aee63eba
+MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
new file mode 100644
index 000000000000..b74df26df5d3
--- /dev/null
+++ b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
@@ -0,0 +1,10 @@
+diff -r -U2 pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py pyqtgraph-0.10.0/pyqtgraph/Qt.py
+--- pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py	2016-10-17 23:22:41.000000000 +0700
++++ pyqtgraph-0.10.0/pyqtgraph/Qt.py	2018-01-23 22:52:19.503525554 +0700
+@@ -25,5 +25,5 @@
+ ## is already imported. If not, then attempt to import PyQt4, then PySide.
+ if QT_LIB is None:
+-    libOrder = [PYQT4, PYSIDE, PYQT5]
++    libOrder = [PYQT5]
+ 
+     for lib in libOrder:
diff --git a/dev-python/pyqtgraph/metadata.xml b/dev-python/pyqtgraph/metadata.xml
index 1dffaf00842a..3f66bf396f36 100644
--- a/dev-python/pyqtgraph/metadata.xml
+++ b/dev-python/pyqtgraph/metadata.xml
@@ -5,6 +5,13 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <longdescription>
+    PyQtGraph is a pure-python graphics and GUI library built on PyQt and numpy.
+    It is intended for use in mathematics / scientific / engineering applications.
+    Despite being written entirely in python, the library is very fast
+    due to its heavy leverage of numpy for number crunching
+    and Qt's GraphicsView framework for fast display. 
+  </longdescription>
   <upstream>
     <remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
   </upstream>
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..d69ef3721ec0
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.python.org/pypi/pyqtgraph/"
+SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples opengl svg"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+S=${WORKDIR}/${PN}-${P}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# fix distutils warning
+	sed -i 's/install_requires/requires/' setup.py || die
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 445c0b3fd8eb..14fe59aabd61 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
-EBUILD pyrsistent-0.13.0.ebuild 912 BLAKE2B 5c977d1ac807d385b039287c84b6098d21cab68ffdb5267db7bb9464d623f557e1588f3734ca5ea4374506e6e44f9184a69f6795c2b03fe38edeeaa0a6e2750f SHA512 89ae8ed3601e5f0573eb10211149e6319e4e397bbd92834343725f7a64c63ab2e64e59d6c32b089a5d0476619d77987ffda22c4de257e12aa8a0877efc7ca620
+EBUILD pyrsistent-0.13.0.ebuild 911 BLAKE2B fabbaa90e2e8f6914ba2d77139e38867f16b2b8028f4b854bc67c20ad3bcfc475c314b23a01cfa763afc210ee345d29cfc54269a60363e4d7cecad3f693c43b7 SHA512 36c94574a75fd0de857daf179f8daac3158186654da97059e77ed38bfc4d642ebb36e389e2e16a58c69b2b39806bb495e830c8423dd48e6a6330e2b5c916c27a
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index a3ae27aee016..1609a504f549 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 573d607ebae2..7bc52a3f877e 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,6 +2,6 @@ AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105f
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
 EBUILD pytest-cov-2.3.1.ebuild 1539 BLAKE2B 2ef33a3cb6cb07cde3e5a756a7b25c1e81847675a409b35a3d81a4b77a7c5baa5b50dc98b83e3590434a2fa690de006fb4fb3a1e3de9eb21b339bc0c2a5e4a6d SHA512 4b2d0235e1affbd327df01544c6db6b807752aaece33f38bcbcbf66121e05967d8355784e91015b9183b51932008cd6ec984b90be2871b0fc6e3f70e17de2065
-EBUILD pytest-cov-2.5.1-r1.ebuild 1492 BLAKE2B 065f6e33f8d6e18f0a2555797e1743e85b2daf06124b6b0236a0872ddd1cd241ca37c93f4527e54366c9a856cd7dccd8cea653978a1c510d62290e6320cbbd8d SHA512 93b3047688f7084ab81d3e93320122bf8df7a5385b5542b50f66a56bb0c0b57e64563faeed959eca6fb521e8ba084b444c8826602c1f222462a1b904fcd79cf7
+EBUILD pytest-cov-2.5.1-r1.ebuild 1498 BLAKE2B a6aa711f8346945aa366c26ac59569b5ac0b0488d5b85aecc099b055770e006ab3f795f0b81594b5cb918333ca7b2579ae26c749818692f9dec702d8866b74b2 SHA512 dbc392ab9ae9bc5561738835b594d33dc948d562190df2b1314084e5d6054678e8c616e3ef2d7d2b1c7db1db1346f169332962ab946c8eb03313edba0f38abf6
 EBUILD pytest-cov-2.5.1.ebuild 1509 BLAKE2B 04b63690469fe1d6af9ac85add37fd75f2f90c4bf95b092efee26e2f85bf47ecb8693628f025621928b26887312a85202c4447708e0f6b116aa886373a01ccd9 SHA512 741f39ad5f2d63ca64cfdad5a2049783d79b1402184a6bb3ced95c894ef332f5b97b23b9c4224ab168f7965af13ce8ea0bfb766fefea7e7d7c153e2b9924230e
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 4d2b6d45fa0e..6a553e46e149 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 550db0cd7580..4aef4ab0164f 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -4,10 +4,10 @@ DIST python-3.4.6-docs-html.tar.bz2 5517260 BLAKE2B c8e605a3b27358c22e2047241a4b
 DIST python-3.5.4-docs-html.tar.bz2 5747840 BLAKE2B 013791c8d0023ffa3d3e07ecfbb82dd36d2fc3e14514f4e14ba90e3d65d05aa4c3ec7cf7c86fe88090dfa0323c444acdefafa36aa315c98db1b5f7af9c0bd5fe SHA512 b1c6028e91bdb0a85a6765ab66c50574804f0aa799c6d13ed4163e6aaba98eeecfacd8576fbb6a721028fe84049ac1718497ad491f993973e3e410a660a10084
 DIST python-3.6.3-docs-html.tar.bz2 5945784 BLAKE2B 88473f63c6a0d533d568184b8459353bea3bc49c24a0a0e5f3ea240556971f3a76018f08f18371b8c7cdeaee93c4cf466fb20eb774db96ad4e63fb45ce730e26 SHA512 ffd6ea459ba36b19c788638f7e2f72ecd286218ed7eb29493819137c4bc25c02714128f07b781ad642eb08826d00924bd1b90a236ba46107bbe17de6633fa1ad
 DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be125586cb5757a34e2b342358517d62656734545fc221812f3c54cdbdb877188648551c3e1cc9331f159d011ca2b0bef587847a471 SHA512 a4cf51ec0e7127f417b066e2727258395954dfc5f1aaa0ad1d25e81dae40ace0d51b18413600fce0f5b1002e4b130a3914b7c9244025375e8fe5332c8d86635d
-EBUILD python-docs-2.7.14.ebuild 719 BLAKE2B 4f97d7446e5feb44d657f1136f9dde82d42be3129bc776f0024030b324f497e28d41d291b77329bcfa0ea9bb09efe3a491edfc87878b49017090697ef8b9141a SHA512 313940fb52cd7ff642add74be1703ef6b0f0cafb081222923b382925eb56a35293424852720f126fa3dc4711cfb3e7a52fe4182e4b6d824b7db721ed82ab08d6
-EBUILD python-docs-3.4.5.ebuild 719 BLAKE2B 4f97d7446e5feb44d657f1136f9dde82d42be3129bc776f0024030b324f497e28d41d291b77329bcfa0ea9bb09efe3a491edfc87878b49017090697ef8b9141a SHA512 313940fb52cd7ff642add74be1703ef6b0f0cafb081222923b382925eb56a35293424852720f126fa3dc4711cfb3e7a52fe4182e4b6d824b7db721ed82ab08d6
-EBUILD python-docs-3.4.6.ebuild 732 BLAKE2B be089c896b261457a638075eba5194514ac411582d7736a737bf2d663697e2e37a3e13329d0ee8810e09cb47df5b5ee7e0378c17c5ac4586114b065355d2d5f6 SHA512 7e8e8c6a97c6e6f4ea56178f64e358dd9acd50a93b25da3ff1b863e4705d7a6401e52e89086eded1462dcbd3ff196ddc4600e2534c856170aa993cf60eb61073
-EBUILD python-docs-3.5.4.ebuild 723 BLAKE2B 24c1db0cc259a1bfd8075fa010c9af99a5fa43f78aff523263c1f53bfc3c443e10c05093d7ebb0bdd04f2ccce2cc35202c3656e532de0d32199310089348b6b3 SHA512 622be7aa469f51762b29fe86778429b0ba5b1ce91c4bb5da10483f0bb864b00e7722073f40dceb3eee1fcc500539804386b5b6299c862af9f65fd9eb483a654c
-EBUILD python-docs-3.6.3.ebuild 724 BLAKE2B 72a6de8f1b2c27d6bcba786b3b15536f6294b79ed37d0d5cb39e615308fd8ae6a3be437c7a1a102b64a8f06f1dd85214c91df6c25b930f9ea31496b96571bd85 SHA512 def7a830826f1a46bcd04cfd14a0c4cb7807be3f285f26a1fdbf911cce2f8621e6b527f28cc4ddd876f5faccd0442c73fc5363ef05c3f58aedfc93479535d4c1
-EBUILD python-docs-3.6.4.ebuild 732 BLAKE2B be089c896b261457a638075eba5194514ac411582d7736a737bf2d663697e2e37a3e13329d0ee8810e09cb47df5b5ee7e0378c17c5ac4586114b065355d2d5f6 SHA512 7e8e8c6a97c6e6f4ea56178f64e358dd9acd50a93b25da3ff1b863e4705d7a6401e52e89086eded1462dcbd3ff196ddc4600e2534c856170aa993cf60eb61073
+EBUILD python-docs-2.7.14.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
+EBUILD python-docs-3.4.5.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
+EBUILD python-docs-3.4.6.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
+EBUILD python-docs-3.5.4.ebuild 711 BLAKE2B 96a7d98d1c93ac3fdd84c4e3e012e3ab4c42b0f44ba02305152430c369975ab8bbc3415f4e77cd60829fbe7f849b37df1c10ca5e1bc78ea9004d4bee03dcf84c SHA512 f61b84c8ead4496abcb2de42173f1b9597f69488e0fc52cb7fcacb9d4d1a6fba85bd88e17d900ef3409bafdf753302dfade8a571503bb3068197bcaeb22113aa
+EBUILD python-docs-3.6.3.ebuild 712 BLAKE2B 2726fbbf972789556ad12704c1613bc84f8048e7cb77d570528a1ef290b196b1ef79d636b72b57c5432a6a7cb30e7a5c995720264ab1253e1820703f58382429 SHA512 063898eace0b5bb10a1f808805b43ce619331f81c6d8d7283923cb9813bd315f69ce617b9ee98e2280857ae3c68378e6e7e8443edd268d5481327f13b4c817c1
+EBUILD python-docs-3.6.4.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.14.ebuild b/dev-python/python-docs/python-docs-2.7.14.ebuild
index 40bed4bfb9f9..16ab1890661f 100644
--- a/dev-python/python-docs/python-docs-2.7.14.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.4.5.ebuild b/dev-python/python-docs/python-docs-3.4.5.ebuild
index 40bed4bfb9f9..16ab1890661f 100644
--- a/dev-python/python-docs/python-docs-3.4.5.ebuild
+++ b/dev-python/python-docs/python-docs-3.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.4.6.ebuild b/dev-python/python-docs/python-docs-3.4.6.ebuild
index 8478819dc0c8..065d7091d1dc 100644
--- a/dev-python/python-docs/python-docs-3.4.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.5.4.ebuild b/dev-python/python-docs/python-docs-3.5.4.ebuild
index 0725faa64ce9..10ce6019a601 100644
--- a/dev-python/python-docs/python-docs-3.5.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.6.3.ebuild b/dev-python/python-docs/python-docs-3.6.3.ebuild
index 3aff5b480dab..c867a73eba85 100644
--- a/dev-python/python-docs/python-docs-3.6.3.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.6.4.ebuild b/dev-python/python-docs/python-docs-3.6.4.ebuild
index 8478819dc0c8..065d7091d1dc 100644
--- a/dev-python/python-docs/python-docs-3.6.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
index 60af19ffcb53..d34a70181ad7 100644
--- a/dev-python/python-fchksum/Manifest
+++ b/dev-python/python-fchksum/Manifest
@@ -1,4 +1,4 @@
 AUX python-fchksum-1.7.1-md5-align.patch 699 BLAKE2B 6a1f30d90caa64cdf353a8c264da5794d3fa2098bcb4454073e3c76a87e7799dbede7f050b77048f711462dd6b4c915a7f107cd9e1e2d290b8a8c9f4101b564e SHA512 53b32029e211ee374c8b3a10680959af36a7a85b2b243bfc13fde6b195236fc2a6295e2d3b66be621773105f709467f48a711b2bc8de2342245a300aa55c557b
 DIST python-fchksum-1.7.1.tar.gz 26724 BLAKE2B 63385862b770c30098f80912c37b9e559fa4a1f400dcc30777cc8af4fe8abc2f658e41fc33035d7c6f04624960b499b04ae03257656589cd24986cd7f8273f5d SHA512 59b561e2938c41bcda2b98eb3fa0670be3fd85f8cb67368132ce239cac21760a5e9a5a05be2429992fa480ccd2e2aa457df7b4a07e709acbe42be9b1559f3060
-EBUILD python-fchksum-1.7.1-r1.ebuild 690 BLAKE2B 095d1111da701d731520abbbf5b5e0df0fd77545f819862a468da5a4b88d76e4845f7b980fdbdaea560dd4eaa365492724393a79401b0d49a61b1266f2d5fff2 SHA512 127e5626f4928c20809c1820981e2e3eccfe3e5cac70fda95667e93184c3a39502c3080b97fe286b31bebf216b16d471a63284e0480f51e77667f1887a1d7d4a
+EBUILD python-fchksum-1.7.1-r1.ebuild 678 BLAKE2B 4181e0a13070974d472bf6119ddc7bdfb6010629a5cf16eb71d352a960d896a0be6a73d0f0a3ddbc6e9afbfdafa0d75cc69ee17360f4948e73c47917f69b0748 SHA512 3e0a99d09b9a61740ec63e9f9677b755f22772fb1ffeb610068dd483e9cffc095a78222279f75e386e4ddbe9b5391e9d431991625abe2a8b152477575591aa7d
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
index a80d84cefb96..309636264d0e 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.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="5"
@@ -12,7 +12,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index acc513c30810..fe95d3aa7142 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -2,5 +2,5 @@ AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d80
 DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
 EBUILD pyudev-0.20.0.ebuild 1667 BLAKE2B 6b20c4b6ca9e7d6436bf661df661825c22bf8aa6eace1b48d42a75cb5fa235187675ec91899c5f8b8aa33fc795ee476dfb23dedb78ffa22fe7bbad4b3e730093 SHA512 592c4d063140a2946bd029d1a6df488e839b9ea75b506266f21f1d5d394487db5e41a5b6d0d3f06ae96472982affb342de65d0f7e810a94d9a895447369dce2d
-EBUILD pyudev-0.21.0.ebuild 1526 BLAKE2B 6f83d3951951f329932debca4462f39d91878b04407bd9048b3476049a575274bc5761256770b0b34db9552661eeefbb4d57c696e15ab025c8aa53de790a256b SHA512 7ebf671fb1bedd1b97fba1c6531627bc46a36697f8599fc0734e0631180d88a9579fe092595788f4c80dcbc772601a8378f9252c11db675edf2dbbc053eb2d9b
+EBUILD pyudev-0.21.0.ebuild 1525 BLAKE2B ca472c816a357daf4426590711f9bcb188695b3d63c6a37ed880f35e288635ec5039f42f9d1ab2edde7437233dd316d69ee6c8c6cd89ea6a47f662ef44b8615e SHA512 c70510eff13ce50465258b0f031a6678e5959b4216670285db390f1a4b89e5ea9af4611054033c7eaefa0ef1bda9bf9afb081d84f8daec16a16bacd415bb5bdb
 MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index fa91fd736fb4..a991dfbc1103 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~x86"
 IUSE="pygobject qt5 pyside test"
 REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 39313796aaaf..ba0fa51132d1 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,6 @@ AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da737
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.4.0.tar.gz 1995779 BLAKE2B e1111e784ead913f803ba8151bf3585fdba9fb5e0c1d568c839d5ac08f5e6757b608c8049644264dd1f0bee5b4bb0c1750640a70feef34eff8e276d9929377e9 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
-EBUILD reportlab-3.3.0-r1.ebuild 1666 BLAKE2B b40ec2ff01a2c64bf17d58e04c626253c728dbfd117ab5be78fb01b56f6815b081ac6e8b75d3f16edf9d4b1e685d0fbdeca280a22bf92f1f0ab9c2e7b70dde12 SHA512 3a14bb37721c8cfe9e0b97b185aff26d7300128c1f47d6723a56378bd1a7cc63ea9a6d4669af8ef55a2ea589a4e1db66553d5f4f1235f7d37cc2c678510f1945
-EBUILD reportlab-3.4.0.ebuild 1697 BLAKE2B b9898f40d64c1a0146a94a1cb2c750e4ff50158ca3ec8b34c11f4c5ea12b5cf95ffbf2949d0f44eb4dfba591544ec6d13025461ed4cd14ec1f8e5d380e93e0a5 SHA512 9b7e35d4ca25eec9576d62c426cbaa2d3aa2ef87eb5ba50c9add55b6bfc3b1bdaf5b79177af700ab498e455d2357dce27dc6a79ab99427ed392be7255ca69dd0
+EBUILD reportlab-3.3.0-r2.ebuild 1666 BLAKE2B feaa5cab8351bcdd953ca8eee04bfe94da9d6b46d76818e3f45f9dabd7a4505ee774a0d4e7a2bf0dcd9e2cef49278340c8f51f7372c866ac9f8109dd6a841a06 SHA512 368eb6c3688f99ec757ca3c5d7ce2230ff642e8248b6be9bf312b7d985ccc9c2acc0e4eea773419c5eb9ca944a0cbcac0cccfa4455ac39858d74873303ed91d9
+EBUILD reportlab-3.4.0-r1.ebuild 1697 BLAKE2B d040d66bc8029ea9e94c7893707d8f61b0ccf410eb6feb547dc2a6cdd7a86f82a5b0223a44975e83ee81762d4b44f1053bfc494dd4e4ac47ed42fbb99fcb4af0 SHA512 30a2e5b2cfbe2a9a69ea2fac355791a97f6b60f3eb1c7248b793970ba8b9550c73713fa711dee51b56ddedc9903709d98734f877e3cea92c9371d03baeaf5413
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
deleted file mode 100644
index f950134c4fd2..000000000000
--- a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	sed -i \
-		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
-		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
-		src/reportlab/rl_config.py || die
-
-	eprefixify setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
new file mode 100644
index 000000000000..b5246ec3edf6
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic prefix
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+	media-libs/libart_lgpl
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-no-pip.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	sed -i \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die
+
+	eprefixify setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd tests > /dev/null || die
+	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reportlab/reportlab-3.4.0-r1.ebuild b/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..86a8de6dbd08
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic prefix
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+	media-libs/libart_lgpl
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-no-pip.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	sed -i \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die
+
+	eprefixify setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd tests > /dev/null || die
+	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples ; then
+		docinto examples
+		dosod -r demos/. tools/pythonpoint/demos
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reportlab/reportlab-3.4.0.ebuild b/dev-python/reportlab/reportlab-3.4.0.ebuild
deleted file mode 100644
index d9aff09004a9..000000000000
--- a/dev-python/reportlab/reportlab-3.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	sed -i \
-		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
-		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
-		src/reportlab/rl_config.py || die
-
-	eprefixify setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples ; then
-		docinto examples
-		dosod -r demos/. tools/pythonpoint/demos
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9f2881c18cd9..7bde6a34d05a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,8 @@
 DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
 DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-EBUILD setuptools-34.0.2-r1.ebuild 2038 BLAKE2B 5a53ebc2d8195e9e4ad48a742ee07a3459a0521197bbc23120c593cc8e13024d9fdf7ea2d0bad613343ad48c3cc874de05fa424c3dda1cf186905514b5fb5127 SHA512 69c22798fa9845772e20e8eb3b5a187bfdaf2868a3cc441b99cb5afa84e13c88bab0a983ee0784d4b29e9b2e7b937cb50d9fa014ce15b656fff16c6efa27f4b0
-EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
+EBUILD setuptools-34.0.2-r1.ebuild 2026 BLAKE2B 0999ae1d1ae5bdf8f0e8d98d35663afc7af8d3d4be637a239e3811607dbb2e34d2428c24055de7d075732e9ffdc45b8af12a50e1e2f605674b545733f240dd08 SHA512 eaa7f954938b08b580448455e507046b080bc2b804e0d5bb007e6d485418afb7638967656aa33872b773684ac9c4c84d053b834038f555701a33500f502e03dd
+EBUILD setuptools-36.0.1.ebuild 1890 BLAKE2B 4bf0f275c01a08b3358a5ab34fb8fed5fbee7acdce432dd45695d0e0068a757dfecb5645f12c5f1bbe7994e885a32ef693b3e012a7c8049b2892e7e7385a4d16 SHA512 8cd5f38fe9dc164e5440fa6fce425a64ba70c240f1c5a965f9390d3aeae495db08f05f7eb70789fbe32326068c35bc5eb125ac04ba12ce0262cfaaa73fc4c4e2
 EBUILD setuptools-36.7.2.ebuild 1856 BLAKE2B ff81b3c14ab0c70033aa7524fdeb43593eb81db469e57dc830fac23777722df420939b01054d616c4afa142e4656f77e5fc8f73216e6d481f90e9f395049055b SHA512 52902140f245ab92b96651116754e195155fcadeb5ac97a255f939e5f613234311b3c11ff8d2646acdc997002c5a4db3f58f113039842cfcf450ae348ef8e549
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
index fb4aa3528d18..ab4dfdb73300 100644
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.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
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
index 7d871ec24b2e..cacfef117a0a 100644
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-36.0.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
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-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 ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9fc2e20fc036..96548c0dc9a2 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,7 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.1.tar.gz 1000644 BLAKE2B 7cb0362a60184ef4e5ba2b53d29c5ca70babd4e81f328beb24e7b3b7f27fc7a3aef3432a4ca599aad6833e088382ae2b705334dc2925b3c98d943cd6f88b1559 SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf
 DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
 DIST sip-4.19.6.tar.gz 1019295 BLAKE2B 107bc63b8c0f200c292bbf465507602904383a1d3fd0b76da907cda2dcf0e79edb9cbf835bc15dbefd991db6a7eeff97462965d88704e3c926ce9e0dd5af829f SHA512 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7
-EBUILD sip-4.19.1.ebuild 2113 BLAKE2B 24d83915451e1c3fddfdce81a571eb4f2422908f1839911d994cce96d03d067e9c7f21ba3a930cefb6a434561506b961bf1710100a98ee175ab2d09d907ebcda SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa
-EBUILD sip-4.19.3.ebuild 2121 BLAKE2B 37583e4ffd346d260d70f86fcd1cf7c4c306fb42fd8a903a87fd2ec78a54a43a5db9cd41fafb609b8361b1a1057734649fbbea5d13906f7d656535528f325a39 SHA512 a2c51c20fae19fb984251cdf9ca5b9ec49b62f25b5e6b571f1043739f9f017eadbbc19da2edaaf8f9c2ae70d6bd8de44c889cc4868706689d03f1a13a77ed718
+EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
 EBUILD sip-4.19.6.ebuild 2776 BLAKE2B d1fbabcd47a7b90975c684020df39eeeb5b5975e541249046bd297a8b42895415bcec6390886e9b88c747354cbe1cdb8293a895f9aca32a2fa91036d4b8ce0b1 SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.1.ebuild b/dev-python/sip/sip-4.19.1.ebuild
deleted file mode 100644
index 21a766bf9cda..000000000000
--- a/dev-python/sip/sip-4.19.1.ebuild
+++ /dev/null
@@ -1,87 +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 python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
index 4debf53e1542..f8b510397e55 100644
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ b/dev-python/sip/sip-4.19.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e1e085d9c1e0..191c89d29354 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f
 DIST tempora-1.9.tar.gz 12469 BLAKE2B da18fc066cb9cf7ee0fa7eefb39ea2ac941760144c7efdea66a05780ced43d574757665dfad6088f98c135e7b14874aef0c8243ab338fcbaa5a515ec27507f52 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f
 EBUILD tempora-1.6.1.ebuild 1192 BLAKE2B 775920937225e50b4335b4d4bb14bead8bdd8858d9f7bde262bd609e8c9b81d102c6b3035906133dee7ee6a07db8ccf53c8e90e9838eef6b31bc2e5505f4092f SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
-EBUILD tempora-1.9.ebuild 1281 BLAKE2B dce9d5716c5760c16b44f593f10527b09ffe90147087780b80142b7db4162ce5d8da6a03ae0325da234a58b302096c4e7bfacf8c7bc83c0373e99393378a29a7 SHA512 a9266c5e3581c13b072f986bff2923c102481f983648ed26311670d0ce5a6dddd7f4f651ed19c2588ae6abada87e1f3f75886d6652d5d12f56f564284f894d87
+EBUILD tempora-1.9.ebuild 1287 BLAKE2B 81e16d6e66ecd6550eb80e0096ab3877d4ef0328643983d4618eaf90e873a08bfedfc5c9b3277b8c52aec0fdcaaf8a84cbdc6ff0caf7414db057492d45da079e SHA512 c20e86eb4e962ace556056ec18cdb326983ef4c436a38c806bb9335c3820022b6397d64b34e728b457a550f53838f8be050f65af97eb66a47beadbc9a8274df3
 MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
diff --git a/dev-python/tempora/tempora-1.9.ebuild b/dev-python/tempora/tempora-1.9.ebuild
index a619b0f986ba..0ae039b43846 100644
--- a/dev-python/tempora/tempora-1.9.ebuild
+++ b/dev-python/tempora/tempora-1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e35482e5917f..df0c3d22bb8e 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2dbf16a8dbb9..6c185964e5f1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,4 @@
-DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 BLAKE2B a15d4c78ee65230d587cc469881d9ff350b61a1b5b3671691924a9383bb04cecd916b72e92abb4dad933a4dd42087c3460d70af289ef9ff1e77138d3a82d4a4e SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
-EBUILD qt-creator-4.3.1.ebuild 5717 BLAKE2B 3729dfb06431c823e75f088d35eb8623ad7c1890644cc75be8f72690bcdeff7327deca4da8b914e12559b2ab188e79cca342c75331b28bfa1aa3d321df6e629f SHA512 73c9bba22675075fc21bd655b952bab2396c13510216eff9c430a18b338e1dbb293db6b97db215c78702a5363baca49170fffc9558f2f7cb0f378366c2c5a43c
-EBUILD qt-creator-4.4.1.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
+EBUILD qt-creator-4.4.1.ebuild 5658 BLAKE2B baaa1e7e3d5fb610d6dba2132c3128af48fdebaf42ea36374c9cf5b49550643de0f5a0a02ca33092f6c790de3befcf6c7b747c9211061b6fd1db72af3d987bb8 SHA512 66df671ef8f81e125998a510965fbfff1fd7fa8554f57cf856ec9599d9f1517005ab721818c95fb21d01ac6b0bc0059028175e822a8421db0108e61c2600522b
 EBUILD qt-creator-9999.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
 MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
deleted file mode 100644
index 8e8a0f9cca3c..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-LLVM_MAX_SLOT=4
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils toolchain-funcs virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.0:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? (
-		<sys-devel/clang-5:=
-		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.1-r1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? (
-		<sys-devel/clang-5:*
-		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
-	)
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	IUSE+=" l10n_${x}"
-	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
-}
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
-	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix path to some clang headers
-	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
-	# fix translations
-	local lang languages=
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=" ${lang/-/_}"
-	done
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		CONFIG+=qbs_disable_rpath \
-		CONFIG+=qbs_enable_project_file_updates \
-		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto && virtx default
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-}
diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
index 38641edea7de..6b958f5b91db 100644
--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
 	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d049f738778e..9fc3ff695f59 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index ea2c97913695..0621acb69a47 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,3 +1,3 @@
 DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
-EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 3d20ca8936628e349793327bafd9741ba1f6f65e09ba47af0933e0b7dc38c31b0c4f7454df7bf04045ca0f46b3269c6618dff5aaebdef4770a42b965b5c8161d SHA512 5f5be519c8ffd3f65441fb869d29649d37c096e906ecaf387ba7fd801e0e9196c05b86f33d58449a5a07fb0d7c50135622d1b5812d3cef621532986dbf74a596
+EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 2e0b618ab5c7f549dd5d13e116b947349e57b0c6076a2af2a44035b567a796c826854b4268d074325ff71db357a207ab344a14cf23aa9da1b60b17f361ef1538 SHA512 7d85cccbb8d0649954122aa4b99c9b60502e93a3215a53373bed9319cff3c8bac2727db4ed5636ddf8448be9f19df72a96e89effb65f7fcf34d0b1528dca5b75
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
index 90c73cf3ff9a..c27bb706e506 100644
--- a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
+++ b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index 801e4bd01a5d..9c14bee10275 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1,3 +1,5 @@
 DIST Ascii85-1.0.2.gem 10752 BLAKE2B 1a38fb0d04eefcd73028aeb166169bf04dced4695eaa3ab8d5add8233bb898780b896101558f7db248aeb4cd9c58edaf36b67085ba0b2cb06bb32b312e576c56 SHA512 e2437948697dd46c646e55a361b74ad5069b261809a0e374eee1f3e755d07bbc45d85fc8ab6d620eceeeb020e6ff23224703cba0ce4ddf37f8a5a96289efd74b
+DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
 EBUILD ascii85-1.0.2-r2.ebuild 679 BLAKE2B ff94a3d791054113a575c2a6f48f5edfd91299dd33f750006b461afdcb2a150174a50c6467b59f2c8b81251cd5795d198c131d08d5db3d6339eb5425fb1d0867 SHA512 2e9aba974fe41c7dbf6d4ca9067a09e347dbfac9fd2044e410a721b8c01868b2aaca0d4ba3468a5ba75f3f62714c1cc9a221cac7b96aa66e868ee8b4b0aceb27
+EBUILD ascii85-1.0.3.ebuild 677 BLAKE2B b26846b43d8e4adc6319cac1e49e85a1c9b0922a4db6154db94bc76d7b8fa1512bc3627bdf95d347e19b48bbde49d992e088614b40ac1bb639866e71a1ca667f SHA512 3f2c69e6c97a6a2bb4b1dc774903fac5665a4712b9853837ec60452f51429dc2a754b66e453a8cbefc85683b03316ac3e1e4da3627b3f1252547b2bc41ccdbb2
 MISC metadata.xml 347 BLAKE2B 3b0a255aa723b441f953964689464ac15e6542dbab4183a32f670408039421d294eb308c0ec37d6080cbb6ebac4c43473f67ed3eb7429880fc0cada79d7bc560 SHA512 362fbd91725d86bf6694499188bdb904b99639488b2cc87f6fa7c50392790f921abb54cc8d329cac0e3f1d4cef6d24c05eb8ab8a365ddf149a7dc23dea5f72f8
diff --git a/dev-ruby/ascii85/ascii85-1.0.3.ebuild b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
new file mode 100644
index 000000000000..84e2c0e63200
--- /dev/null
+++ b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
@@ -0,0 +1,28 @@
+# 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_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
+
+RUBY_FAKEGEM_NAME="Ascii85"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
+HOMEPAGE="https://github.com/datawraith/ascii85gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/ast/Manifest b/dev-ruby/ast/Manifest
index a96152a0313e..813408acbfb4 100644
--- a/dev-ruby/ast/Manifest
+++ b/dev-ruby/ast/Manifest
@@ -1,5 +1,7 @@
 DIST ast-2.2.0.gem 14848 BLAKE2B c74733f6d72eeefb9576128e1e58f1f002352ba9d7c2a2474677b580a85783c5963ba7f681caa0e3fe08ab4c5fdf05d304898a478550ab437665eb520fc1f851 SHA512 556b9d68787a05f33f6f7e518971dfc965d326fd1a2e0dd1d16d1360526c598fccb0117a09348da88f6243bb3295dbb6d91fa6bd2a27c19cd7b519105b826aea
 DIST ast-2.3.0.gem 14848 BLAKE2B 141aa3fd01bfd9d7c1b82ff20cab9243322c70f69ee54026ec121c5491fdfca1c00eae293c631c67b0c12b0ba9aeadcf3756a9cbe2a05cfa7c89a8acda48d188 SHA512 7b814517075a5f4607cab24e1c20747c7def1d818e6df95205eaad2152952a38cd551bff5f0d59979fd8c6cb7dfa6bc9830541257bb3a24927217fd84526d58f
+DIST ast-2.4.0.gem 15360 BLAKE2B 1d68fa8137bf2a158e8b2e0f30d3d803791db7fcb397133681cd2ffb57badebe6f9afd792a7cf3907dc1fa3e3a617fbb0331c85c69e36a46ca49962f30be9979 SHA512 60a0b00103ed57c71907155ee7966127985021e51c1d829e2149c87066504e76fdb955f9717bb19b5627d5b8c44f0d6a165e208900ede2355a47970ee9664b72
 EBUILD ast-2.2.0.ebuild 703 BLAKE2B edb2720c234b99b7ebf7311d92653ecec344c1270a781150e63fd9ea71b14c568ac591846aca52ba2b36a900a319c5d0c4c9f79277895be78a34cba47cd8df1d SHA512 4833fbe23d8600490b6fd70df241bb307319108a119d9f8da06b9d09dd730d717ec86251880f86f928b16aab04ab236e91c5d190cd4abdcacd73a59113626ab4
 EBUILD ast-2.3.0.ebuild 703 BLAKE2B de64826b497d003d6a657ad35bbd01e8c88be7e0836dddb7195c35ca11c85168016de967d26176be462c70da5099da5a467edf46492899ad24982e28c60de26e SHA512 a3d8192dd239548a7fcd44bf40227659b86f997503a3f8bc70c7bf08581fe136d4e721ff6cd26d780b9f9868bd70b9cb00a788ae34bcb1bb126011af24138bb9
+EBUILD ast-2.4.0.ebuild 703 BLAKE2B 75a60dbc26cc730c9e4e36fd177a04fd2391e6daa7b38a8c47f63ab50f6441efb013cbdbfc0fbc06389a8c13e4808134adc60265d1d358503e794ebc0a7242e7 SHA512 2b4d266f4ea4e6c51501626101ae3ab1f6851298da24cd17ce17803b2038621e704e608c6d4d66b3f382c52cf5fb626d1c47effdafb4f44fbd342c34065aa6ca
 MISC metadata.xml 340 BLAKE2B 30aec3a2478894cc3d10da2ff828e275c0400061f0fcf123131501a55ca56355e9af3fd0d53bf5edbbd4e5953a426fd68ba1b912771f66bedd9a2c61c335ca58 SHA512 cb57a981e9698ea62d17dbb519c215e420d9fbc791ef3d98394202909beacfaae2bc425332febaae18d9966b3586e82c52f60cd442f9cdb9b4f2abc25ba7b86e
diff --git a/dev-ruby/ast/ast-2.4.0.ebuild b/dev-ruby/ast/ast-2.4.0.ebuild
new file mode 100644
index 000000000000..3f3bb140d306
--- /dev/null
+++ b/dev-ruby/ast/ast-2.4.0.ebuild
@@ -0,0 +1,31 @@
+# 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="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for working with abstract syntax trees"
+HOMEPAGE="https://github.com/whitequark/ast"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bacon )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/git ls/d" ${PN}.gemspec || die
+	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Itest -a || die
+}
diff --git a/dev-ruby/celluloid-io/Manifest b/dev-ruby/celluloid-io/Manifest
index 18d782d5c216..0fdf8257f26c 100644
--- a/dev-ruby/celluloid-io/Manifest
+++ b/dev-ruby/celluloid-io/Manifest
@@ -1,5 +1,3 @@
-DIST celluloid-io-0.16.2.gem 53248 BLAKE2B 5ec918e12e3b1f86796ef73a3a3c68863f3267c63b06fd65cd78ac471af8985974a61b6f4e4e1bc542e71ee24af30a2900b843b43654da9b4a964d9d1f46aa44 SHA512 6e37fbf99cc57aab13f63da68318fcab5d70b0c48da154da22a5fc12ac9a17d015d5784af9c02679d0f5c72fed6a693ec459cb455f10aa75b83e5e0dce913f71
 DIST celluloid-io-0.17.3.gem 57856 BLAKE2B 6b2368c9e51a91ba1d7707389f173c1070e2d0a81698538af5240e3798509fe8e3495c2abea83b8c9f49148d3cce59a38823f2a47d7b92da395e78ad71506f8b SHA512 8b1552549c5aad59bf3789518ea2fa6833a4d3b7213cf70d941face215382a68b3d9d2d57e76b2bd7c478fe0e2690b19984d210b806bf1f67f159fd2bdf6b8ac
-EBUILD celluloid-io-0.16.2.ebuild 850 BLAKE2B 8c0e1c2fdf8afd65b5f38c345dad27a7c3499d685e0b8248591caaf450d57dfabfc648eff0f31f30ae263997bc4c70ac2a05705413c6ce1fc76803793d3a1336 SHA512 2eb824ec95663cd308293de7e801055dd534082d1f60b35aeee086459f725927dec7919e58650fdad253a418401879aeddd7d1b7ec27ae90b5fa5851e4c0b1a5
 EBUILD celluloid-io-0.17.3.ebuild 1094 BLAKE2B f636d994cdbc79302e32726a9c05987775d87cc5eaf71f259a348d5667379a999096e9baa54a74f633e84d913184bfa3cc7561f3741edc424d68eb1b78821136 SHA512 b96dd242e7e56f35bdbef49633ed2c804309dd9f2e9b8713d027b4e8857dd3fbe7a3b18282654c8b1ca654888e4c59bb66a6535e90223d3e8895c24cc2958d30
 MISC metadata.xml 348 BLAKE2B 82aa98d484afd7116f7d2079ff5358bd3af36987427c49ab3c525325371ff7c8993ce49f7c1dbecd5f12d763972a84358f13523599a929b4406c51e19e13d14d SHA512 b351fe17cb7e9f63c2033e958bf2c6f37dbcae42cd59b76f7c979b42eaf3f35d79e6e82ad2e3bc4cdb2fb7e4410062acadfdfe44a5e767077a223c198bcbd2b8
diff --git a/dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild b/dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild
deleted file mode 100644
index 5df64dbf5044..000000000000
--- a/dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Evented IO for Celluloid actors"
-HOMEPAGE="https://github.com/celluloid/celluloid-io"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/celluloid-0.16.0
-	>=dev-ruby/nio4r-1.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' -e '/[Cc]overalls/d' spec/spec_helper.rb || die
-
-	# Avoid DNS tests. They either assume localhost is 127.0.0.1 or
-	# require network access.
-	rm spec/celluloid/io/dns_resolver_spec.rb || die
-}
diff --git a/dev-ruby/celluloid/Manifest b/dev-ruby/celluloid/Manifest
index 8336a35db826..b74e57374e33 100644
--- a/dev-ruby/celluloid/Manifest
+++ b/dev-ruby/celluloid/Manifest
@@ -1,6 +1,4 @@
 AUX celluloid-0.16.0-call-private-methods.patch 765 BLAKE2B 2f1fc1108906d31682085a4deab14ebd390d24d40e53a2c555d843ae67561c452d215b975a769d7f808dc1b738f64287c48fd0ee304c9a127b2d0d1c120c818a SHA512 322039ffb8c08f88c334e84123084aac3c870d2149d67d3bb083a6496a383cfe6506f4fd2b62fb1b59a261a9be4ab24975b6196cd74a2561f17e0a98dc6cae40
-DIST celluloid-0.16.0-git.tgz 63859 BLAKE2B 701347cf2ab55d4855722805209f5336cd3ffeb16561227781b4d696f417711be231d8eeec084f965b872f1c364a3d7dc5a3d75906eb15d235d2809529bb3203 SHA512 b1acc0daf35b16c086d720fccec93519de609e6c9e8f411ed70c48f3cfcb0c88f5ee665ac41e4a535e00eef112cae26ca2e8ab6b6de4738e13ed50579098d8ed
 DIST celluloid-0.17.3.gem 61952 BLAKE2B 5b64b67dea84261706acaf2612c23cb0b82d6af7fe0eece9d9e17e5d948d83a81b0de7598a1709fb5e1073f3632c7df6d6730c4797e0a4da593795b85c3bf9e1 SHA512 bb5005452ef7a2da1fb6b6515a6ad9df992dfd043caa605d1282a24b874c1f0798da0d19ee00f434486f9ef2c9467b1d6d2cadaa7883db98b885eeb842f1b94c
-EBUILD celluloid-0.16.0-r1.ebuild 1315 BLAKE2B e723e86b7a3994ccf6a9883dffc26c651566b99072d1678be0f2ebce285a66d606c3fe08d8ecb457319b0305cca6b323a84eefde2be3976332ba5c702bdf961a SHA512 3062aa391bef128d2482605aab724d8ebc2fd960716bc539db2e756dbafcf8ac15dbec761e3616468499a0373e38880511bfdb75828d7447843fff83db03a5e0
 EBUILD celluloid-0.17.3.ebuild 1178 BLAKE2B 2f605e51c48dbfb0f123e22b1d6e851ffa31857534aa1508f046c238610454478229cbbe8d9e233ef38806cab5a9305db6fa2d885579351e9f8e22309552bd90 SHA512 8878fed12a3a31361a0e9fbd3ecb31975b8acc630fea1da440449fabaeb68e4fe82f81a41f118b02161a7751bcb83d7088b61566241020322a3939c4045d0455
 MISC metadata.xml 345 BLAKE2B 57803cd94baa4d58e4c4c418834347d84a4e8bd5b4ae5019dd71797ace22f508b601bbe62221df4a2fab04eff1fa1aa43d78d98462d189ba13b9bcdf70375f44 SHA512 e07f38e8feadf085f1adeb737ff56aeb9cc4c79a3b7702f9c018544bebcc14646be394aa32ff5502c37ef0fb8968707b7f8d9a6fdaeff23cac5b71fabae46aa8
diff --git a/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild b/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild
deleted file mode 100644
index 30755bd02299..000000000000
--- a/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# rbx or jruby recommended, but only in 1.9 mode.
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-#Needed by dev-ruby/listen
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a simple and natural way to build fault-tolerant concurrent programs"
-HOMEPAGE="https://github.com/celluloid/celluloid"
-SRC_URI="https://github.com/celluloid/celluloid/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RUBY_PATCHES=( "${P}-call-private-methods.patch" )
-
-ruby_add_rdepend ">=dev-ruby/timers-4.0.0:4"
-
-all_ruby_prepare() {
-	rm Gemfile .rspec || die
-
-	sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-
-	# Force loading of the correct timers slot to avoid a bundler dependency.
-	sed -i -e '3igem "timers", "~>4.0"' spec/spec_helper.rb || die
-
-	# Adjust timers dependency to match our slots, bug 563018
-	sed -i -e '/timers/ s/4.0.0/4.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 31b2a8f83f4a..ee79e28aed85 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,7 +1,5 @@
-DIST chunky_png-1.3.6.gem 350208 BLAKE2B ee18c9c2eaf3c9d4384dee92d05d046a3a8b3f8e379c6d8fb7e7c545736425f2cd09e9c1a270b0ea588bd0a233e0e6254c8f5169bad288875f76460e5d18fe9a SHA512 334ea571194a3357003ddbdf41c669ae189c6927c43182a8814e5aa5b3cdee2a3adef80cae4453a3d6d186652c78fdde496bf9080a28227d26dd411dbe0d880e
-DIST chunky_png-1.3.7.gem 350720 BLAKE2B 6096b01989df944647f39f459beaee8b350c3bd6472ddedf7a858e7fda7353afab3049cbd2b7e3639ba2a22bcd77a0841c04997a1ceac06f6823a1b579e8b636 SHA512 0cd9314ad551128d3d9dd234b3998ed8a96d1a038ed92288485538873be76e5034233e205f16491031ebdade9501593133ea8bfd7b0288bfd83c03de034a5bc7
+DIST chunky_png-1.3.10.gem 352768 BLAKE2B ae34d2bc8199e46add874511343a7e8ecf08ed3ec3e488a22a99335895d260ebb60c6be96c5771915a176f44e354599373feafce9dda362b6ebc2b58cd92e79f SHA512 968e068a6fbcc3a91d435509a118976de56c62b9e311d201064aae2eb8129994b6c0876ca5ed3368b0415b238f46d14ab1059d00cbf473aaf9631456596e58c3
 DIST chunky_png-1.3.8.gem 351232 BLAKE2B 9eb2ca5f997558240911e1a62801c5058e052731a512fc5c35a36e77468c1c93263cca25a11cccdb45bc70bcf53e44681bbde7f7fa2016857f6b054ab79a04e8 SHA512 3e4725c960e8f404f9702323deec6d77a3ef8bcaba9b679483c7de2be1ea327a2a8a7f67cb6beaa1a3c473e573600cc7b228aceceaa37f0a522cf9b2892e0351
-EBUILD chunky_png-1.3.6.ebuild 733 BLAKE2B 9855014bbf8115ef647de4318131d01852397df4df1ce98a9817af2c38138a0bdeeb17165d7e2dcdb1206daf4e0a7b0e94e1d050813ff213c1296ab80b4c5c39 SHA512 b004ccce3b8a5135e41b1b22e0c2544506fa15b061748a1fbaaedf9dcaaf3c113685c6955c2abb70dfa64230ace5e79b99bb597724bf5f6d730a9e25775b4932
-EBUILD chunky_png-1.3.7.ebuild 738 BLAKE2B d19f5b3fa2d9316e8d2dfcc661da7a151105e3ff97836360a75e1940255d5ee5566eb13ace58bfde1f2fd272431b75824458cec74346ef1023dbb68ef00ce1bd SHA512 e665b8f0fe3b0ade1be1030acfd94de7df8f81d96a1051f15e01613be3dfc771798188450a3b16ea24b84effdd53e8e4181a4670c3f7b57415452c368e0b679c
+EBUILD chunky_png-1.3.10.ebuild 731 BLAKE2B fe32293bee795c1c2d17bb97fe6c2f15e193146e8b19f660b0309d35d98add4b1e1730f1fd5b6187bba13786ce0382fa44c8c8aac9a1fae1008d232c4b995cf1 SHA512 cccd8ea89597a44ff2f528fc73465efbc8f71675f6703fe9f8cc7e48eabc9848b4fe2d8bae802eb3aeee1555f1e73d80bb2422e29cfad4df2c7021fb8bc96cdc
 EBUILD chunky_png-1.3.8.ebuild 731 BLAKE2B b95a391393d98ea155206a8046cf9456615bea591dba51bfe47bb7ed861a8be1ff962974dc4718600c56cb57c48d8c6f0780e5ac2cb6e73a4789ec336044b9ef SHA512 fc39eac84acc399d50d4e207725b992a29695d9cee324c157f471446a9c7fc2b56ac21f1b9bcf87f053a0df198b66710fa9a1b1e5a2e9b666b16f0f25a60f083
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild
new file mode 100644
index 000000000000..f94b9a19988a
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.10.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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+	rm Gemfile* || die
+
+	# Avoid git dependency
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild
deleted file mode 100644
index 1662f8502fc9..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
deleted file mode 100644
index 20d1b94cad5e..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 6065899310d3..faedf8b62cd9 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,5 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-DIST coffee-script-source-1.9.3.gem 58880 BLAKE2B 2dfb9e88d9f3ff0486359282b0df6061b81f70432089fbd4c10bac01fa90baa4905fcfca38d63535b63aae5cfb085e411f7730559c060d21a476cc5676b8e6d3 SHA512 099a656499b72bd532d5c6d365f168f82dfdec91c79edb385ed939f9d78055926846c1a03084b41aa1e789f5b32873d5d86e8079bc081acb61654996371c829b
 EBUILD coffee-script-source-1.12.2.ebuild 459 BLAKE2B 179619e4211a71bd3a935af4ed20b4c412214bf13901f50eaad43413301790ef7d75df97ce70a6c775e5ab3b17aedb8c0cf5abf959e9500a7b90f6b77b637eeb SHA512 bcf4d62d4bcf14e524c0c8d047d1eeaa0880461495c000bf40ded9def795a8fdc7c4bf0e89a75d47c2d12f900d93584f88744aebdec6af5134313cdf072261db
-EBUILD coffee-script-source-1.9.3.ebuild 449 BLAKE2B 9e452ef7460425f4d06b31f740e82a4d59abd92ec732ac4b350a38ce2de2e04f603858f8a28676f31327e06d84661b887d6acd151893b6fd4c2af802e9421c58 SHA512 ce6b41ebcb2061ad91e95b62451ae705bb7f2cd20bc4195fa91807757b3e4ac3b389b70b2d6a6d80df911bbe12007db73eae174d052d01d0730a8f1f75d91f6e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
deleted file mode 100644
index 138110280a1b..000000000000
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="http://jashkenas.github.io/coffee-script/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
diff --git a/dev-ruby/compass-core/Manifest b/dev-ruby/compass-core/Manifest
index d3d88cc8516a..4e52aa84289b 100644
--- a/dev-ruby/compass-core/Manifest
+++ b/dev-ruby/compass-core/Manifest
@@ -1,3 +1,3 @@
 DIST compass-core-1.0.3.gem 137728 BLAKE2B c27a84f32973ee6f163129ff344019beb5658585b1567f5e7ac6a47108bced6da77537328f23f3c03e7f402db5387bb39fa41f726bb7e89f2b7b8f80f65b7132 SHA512 90ee9fbd2266fc3e437162c8920710e4885446333c8d4b5ae22c652c7572b93ce3071574fa74f432b0036795865f92c888a6d648ee20bf5618cf58fb7b2b1dd1
-EBUILD compass-core-1.0.3-r1.ebuild 574 BLAKE2B 0e90c1e238271adb680196be7964ca94fe0a9854a54a432a5b4667bc0b2ca56a7e2fdd85fc16cfff9f38a8f39c6953591a4232c7b1c49676afc03de4921e4ddf SHA512 1963288a863a2753167ec9ef18c7a3ab4430eef4e2b4e642e11d2b7b5f4a5dc298b7d139e498cd88e99aaa24d0007461cceaaecef6c1c1371d99c1b8810635a0
+EBUILD compass-core-1.0.3-r1.ebuild 567 BLAKE2B 2e3ac70e6776014fd89373662374d75698421ada670428718e1c8fe183e0c0421db6f01faec824099129b2189715a94c58672fdbe2ef61bd9a1cf93943d53ebd SHA512 c757fddb4abf05baa4994273f3b9512d4ff07f0a9f3b7a9053dd7057d8e9c73f80f6bb18bdb7b2eba5d2c300c496d73e46a6a33dcf3986ca1ab53f3c2818a6a7
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
index 1b3f59e82912..b1432f7ee1e3 100644
--- a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
+++ b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/compass-import-once/Manifest b/dev-ruby/compass-import-once/Manifest
index b1a17342a403..1c619ccc2ef0 100644
--- a/dev-ruby/compass-import-once/Manifest
+++ b/dev-ruby/compass-import-once/Manifest
@@ -1,3 +1,3 @@
 DIST compass-import-once-1.0.5.gem 9728 BLAKE2B 24a48d11427b30ca14ab27d34c3a9906c1fe9f9d363b910e4c9e3a2488890f4908ec8bdc4a3323a145cce81f8c2344b95302cd168266bf6a1b36d850a1412e59 SHA512 2ef723803341892b34a4bbe691b32ddd266a125c5e3faf8034c473566d70c7a8c0931f1a02abe64c243fe62f2a204cc8e53b951dd88c440eada4ec2dfc19856b
-EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B ad8f09f448439c58ec957dbfd05412cdc4235fafe68f1dbcf70d0068606f8b61fc1c60b0a0523e7b5154de215c2897a47dc8aa3f2da5ebc6dcff77e51bebee5a SHA512 0ca7f0051961fcc8a861ab612122a802871deabf55c4b0926bd5cce8b15fa2884104af9b4108110169641956ed8ff4d1a179e36cc63a23954878f6fb3628c476
+EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B 6918bc97924266e3937da0e781f009ba042f350a5900b1d3e09bd7840ad509c0b555b0b7ed1319be087e80a5dfc9b57f9b646fd688bcc31f0975dfc35674e82c SHA512 d082797e164fb978d90cd9d473e4b7c0f387bed7d2d0e73e5ea433effe0c7baa35302ad28fc7788692f86991c77ec4dc86ad60dea8f3af7688bd535ff2749b2d
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
index bab268b2e693..473d793e2a9d 100644
--- a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
+++ b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 # Skip tests since they depend on sass-globbing which does not have a
 # license and where the last version is known to be broken.
diff --git a/dev-ruby/compass/Manifest b/dev-ruby/compass/Manifest
index 2c702eff1ecf..1f2dfbfea1d6 100644
--- a/dev-ruby/compass/Manifest
+++ b/dev-ruby/compass/Manifest
@@ -1,3 +1,3 @@
 DIST compass-1.0.3.gem 378368 BLAKE2B 1c33f576ba0c1117d8ca3deeb4d422441fd50922df3443a68b4eeabdd45d804fe505461a687053b6a0ebf0a2aed2539482843eac786226d16ad5ea5fb51a5284 SHA512 bef1ca903cb982df39330a913051c1a330aa1ecad9abbe5a7644e335c7ed2d152901a4079cc5ee43e9f7ce85a671f1d5552a3c98cf40b04134de072a120deef6
-EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B a657ff0ea0c46488e0e840e1d2bbf72cf3adebbd3afd8569544dd12b2fcc0f1fc8856835df366269c09738aaa2e31b1faa6cfb6d52b0858ecacd44f31d06dc12 SHA512 312ddca9b3208ab48c7507c33aa4f55fcce465d98aecd43891ea231aec67dd3fd9c40d3a76dd1d63915ce10d5eb57e53e7d4259641c0010d412a4858bb2e3929
+EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B 00b808c1274cd109fa44d029f491cecc1e88716e19f897dc0fa091d9a747b2923ce5197c6b7da36fad93c10f1b3909c6674c89bc760776b6d1085222a0a4a57a SHA512 6dcb5b44c8dad0c8951b4d143d0931a6c0d01f60e39fe2129fdfd19af5767d9f49c5b9f2aff7785243f0b58ff18666c158525da4441f81fd20119ec29c646be7
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass/compass-1.0.3-r1.ebuild b/dev-ruby/compass/compass-1.0.3-r1.ebuild
index 35064a11d33a..8b15b5dbe22b 100644
--- a/dev-ruby/compass/compass-1.0.3-r1.ebuild
+++ b/dev-ruby/compass/compass-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 1de0275dc3b5..a3596cbfad2b 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,5 +1,3 @@
-DIST crack-0.4.2.gem 37376 BLAKE2B 9bf06d5cd918ed1490be511728b67e1bd51decbcf4a13b1a79f70483867dcf0372f1e63302f731b7eaf2ebc1a605b6bd9d063267878b0abf713bb8f8f8f175b4 SHA512 0c1adfe9cbcf6c5bdabba20819c7ed7dce0a8e360695564927bab447c3d66d786bd9267066efb08732b0fc4687d9dc3ac74c650eb8cec17575926aa9a24f7723
 DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
-EBUILD crack-0.4.2-r1.ebuild 1029 BLAKE2B 2fc0531a64c8a6fe18882078020fa5aa6ee86d4769d440ae11b575935afccc7b6ad20e981a490d9043de791add75430dd5c40eb67c0711a238638f4265077a30 SHA512 4b91b8f10d43108fc07a62d1027d1309311bf7d4e541b528ae12babed36ae5561d3ddde3e5c3138e7600db9357ee9c46c4ff4c11aee79fc5f573f1f229eca57d
-EBUILD crack-0.4.3-r1.ebuild 1049 BLAKE2B 6737a3336af4ac739076633b2491b43b2587d90fb0568350622525ed44d8130f79c33abdf40f98e026e343a01c1bfe87d4e1602fa075a3ae0b6e570b45da9778 SHA512 ced23d5dbc7e11b77db635365d7976e60a4c7a9593854192308f3c51a4ac40ac1163406a50f939bd0ed472afd66f235e7c4289722b711676a745e488d186d8a1
+EBUILD crack-0.4.3-r1.ebuild 1048 BLAKE2B 4cda36008da21797b0f610d9cf3c03e527d05f3a91ee22dd8b7b01ea6b04b1c0d398a8cfd9db06cbfa9354deb60daf8351a39d25a01b89a4ac9c22e250d1b397 SHA512 aa02e9d2e57fa58304fb7cfb5f131236dc740d3a0bb9e7144ca06b8e714deff58e062677bb23131b2eb694a6cc6907a2987f2220771e9ffac944452d3b13a3aa
 MISC metadata.xml 342 BLAKE2B bf1bf4fa826a68ba0c2344619bd3a18ea9f3944f41ee9edda5b0cdebb46d8790a39dd6ef738f996a3c15672a1fe7242c55132eefaf719f21725d9b4372eb4f07 SHA512 2f890aec4b5c1bf8a31bd079d8e0b8e17242e262b7ba2619e5f791da25e2e7510a52086b4103ed257726d0a47e999dd22d0b3c60f8dc77c515f5fc61b122f2a8
diff --git a/dev-ruby/crack/crack-0.4.2-r1.ebuild b/dev-ruby/crack/crack-0.4.2-r1.ebuild
deleted file mode 100644
index 44c674cc9607..000000000000
--- a/dev-ruby/crack/crack-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
-HOMEPAGE="https://github.com/jnunemaker/crack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/safe_yaml-1.0.0"
-
-each_ruby_prepare() {
-	# Remove tests which fail when run by portage but pass when run by hand
-	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
-}
diff --git a/dev-ruby/crack/crack-0.4.3-r1.ebuild b/dev-ruby/crack/crack-0.4.3-r1.ebuild
index f5754be064a4..71b36feaa94e 100644
--- a/dev-ruby/crack/crack-0.4.3-r1.ebuild
+++ b/dev-ruby/crack/crack-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jnunemaker/crack"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 8cefb5bca51d..30840469890a 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,9 +1,5 @@
 DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
-DIST daemons-1.2.4.tar.gz 27191 BLAKE2B 090aa40cb9ab12a94da24e2ecb2d2c6ca66102166a2a81ef19ca4cd8ae8a93a96a25af2b694412f30a068ee51eb5e230a32e7c56d1c0f74d3803521f1988236f SHA512 9b6f0202ad87704b441f150ae5c3f5086861ba220069b6e7219714b62c36711889fdd094cfc1de907e9fb4528e5f6bb42b5421b9bcc4ec286648349e78da280f
-DIST daemons-1.2.5.tar.gz 27475 BLAKE2B 0308c43efda4698bf0dd277dc45fde1fe67d907ef9b5447b855dbc93fc775d470f199e8e2e187f5c1bb809559288623b72c474f4d3994323a3466742f1099119 SHA512 5d3db8e5917eff5a3946c385a1ac6f561d1e9d1d6cd87c0deb4c4777bdab33a5e4f889300ee61a2e68df0200d51b3ddd0aa01d9f2841104d01a866f3ee8c09ac
 DIST daemons-1.2.6.tar.gz 27557 BLAKE2B 7c08b637ab37f764309fd260c4ea6c11402b89ea327eb47ea0af3860397ece795467a11c4ae5d8577972f5d8e2c6590f4d8112027f06db941b7181e33c158736 SHA512 8276685a684093252bf136c552a613a5208f4ab34f178be9425c62ea59fe1eebe671a7dd6c57d30744187b9ae58d7a7f1ebf58468e988565a30ca4417f2a90ea
 EBUILD daemons-1.2.3.ebuild 689 BLAKE2B b6481ed945f1d6d35089f5d0b630cae361da7e3bcf4ce39dca45540aef6ba93e87196abae160d7b9061d5d689270349b3de0260a6c0fbb194913287819e13383 SHA512 888620fe4d6e4d073b48028fae6d211e1c51fb81cb5556a8d49227f8d7fc42f21e77181da4b3396cf575cd90fea879416be3f773120df4c7a2a2d57e20a84e5d
-EBUILD daemons-1.2.4.ebuild 872 BLAKE2B 6f072cb71d7a087c2c2dcef08c7ea8c67b0d26711aafc1075dda42f844451fa6783b327db3ff41a37eb78b5c5febb27ab5fa4d3efb4d07144ad6dd6292e244d5 SHA512 d156400a5b403ec8d7a4f81046f3942bdf1e600268f940a3300267fc980e708622e0ec73f4566a7e8388e2163db6d9e85def59493b8698df624d4dbef8ad12c9
-EBUILD daemons-1.2.5.ebuild 865 BLAKE2B 582ac900363b3d32abbc0353b34ec3872a8eedbe1ea62bb95de32d2b83bf881efc17eccd6cb4da907529a118552adcf0fc9b3b9afa7147d209591ee23c790827 SHA512 f9d9f6d339b8157ddbabd42cc495d4ce874bbe9151fae2f17441884764a4aba9fe8ce77b65f3250272d5d967ef626757c0b1036860a6680e4e9a32568eda6da4
-EBUILD daemons-1.2.6.ebuild 865 BLAKE2B 582ac900363b3d32abbc0353b34ec3872a8eedbe1ea62bb95de32d2b83bf881efc17eccd6cb4da907529a118552adcf0fc9b3b9afa7147d209591ee23c790827 SHA512 f9d9f6d339b8157ddbabd42cc495d4ce874bbe9151fae2f17441884764a4aba9fe8ce77b65f3250272d5d967ef626757c0b1036860a6680e4e9a32568eda6da4
+EBUILD daemons-1.2.6.ebuild 883 BLAKE2B 232eaf318ab66e7877d3733ab51e7d5e296a92184d77308573bd2edba0bfe4e3cafbdc696aefa30c5b1762f57af50efd18e9243dcec277c34229ddd1db82658a SHA512 21fe7b84e3640603319b471d5cbdf77b4644facd6a65b8850084efcfd4de2250eb8bc91793d67ff12b5d43b6331efa1c3ae3607e5851607b8caab3e3f190e1a9
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.2.4.ebuild b/dev-ruby/daemons/daemons-1.2.4.ebuild
deleted file mode 100644
index af7191e4d5db..000000000000
--- a/dev-ruby/daemons/daemons-1.2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples || return
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.5.ebuild b/dev-ruby/daemons/daemons-1.2.5.ebuild
deleted file mode 100644
index 792eabef56a8..000000000000
--- a/dev-ruby/daemons/daemons-1.2.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples || return
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index 792eabef56a8..14452521fe30 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.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 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 2d390a1b6106..702ea038b04f 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,7 +1,7 @@
 DIST did_you_mean-1.0.2.gem 30720 BLAKE2B 8b61cecd66affedc4a730655d251f99581febad4e51f18e3b48f30a01f25fa9ed4897c9431d872d9daedf10f46310481979cd44cbf4640d7681bc7425f4df35d SHA512 a6b19dd909423505553759d6470266680056b6804f9c42452eecf9104a8de71a460a4baa53111ccfe830e3dbdc04bad9382d77f9098d1e114aecdc34a4ef57b6
 DIST did_you_mean-1.1.2.gem 30720 BLAKE2B c1fb841143928854854892e2c7890cb3952329ae3efd50401b43bb4bd327b0564ab2f0fb33a4bd23278e1a3570594f2e13ae6c0cb52ea244ccef392f68e79d09 SHA512 bd1f5eeaf6c527bd6a0ef79555aeee459f9e2fee82215e6f3a47e380535d366eea1f7b199ae99de2736125785c7fd76a1cd6e8bc7cd0599a8d4cc6c5184c85de
 DIST did_you_mean-1.2.0.gem 32768 BLAKE2B a73873f18c36d9e811e51a1c8b974ebb44f6029468c34a33b7af6c299b78025750e043d960f15baa5f5aad89df906df743196c5fdafa368c740f8112936c8655 SHA512 9b807d707f1931639b04cac485e0b58a2ae2cd6377d0782317f62e9d469c9394e4088fae16e7ec3ba45e7d2afaeeb2fe10358dd70f9660e08c30f51a4f2d0b8f
-EBUILD did_you_mean-1.0.2.ebuild 519 BLAKE2B 1b975a8ee8a9cc880a1a25038db51842bd2171a864196e5e86f2f9b1468959ef47ba1e2e00849b68c5bd315ca00ffea7a5044e47618883158e5e578f60f07866 SHA512 a93852a7e0ea15a86f184bc8ad8b10d58f09ce4751d4dad410aea70033da705fb03a1e2caf71e8f30214420e563c5ca55bb560150e54ef70c1b62b7a9bfc20dd
+EBUILD did_you_mean-1.0.2.ebuild 517 BLAKE2B fc6efeb4a32911f384f1760f5751e4a59be39b305cde96dbeea9ff7bd580db87347a6d021c7a145271ec6b7a8b1846a15ff1c6a2789cbca28100718222a6cc72 SHA512 18ec40985d2bf8c5f86e398080bc7951ef9f559c43831a3569b981eef70a37fd99804f73f742b98135bbff76c892040a83066936b6c8ab81a117763e06593bc4
 EBUILD did_you_mean-1.1.2.ebuild 613 BLAKE2B 285fe2790652d6d517d5546fcc000f763cb1c9c86829ae7bc82c67ef69700178984363dcaf0832a2d43e6e289b7089cdc51eb03a8ab143ee9237cb9adfe48418 SHA512 cdd1d7b556aa5b6204371b3a37f19c7d915aea7b28f40b516dbdb5cc437d880109ad19282d30c4d318e5671b16480aef3991d942def00da9b4d9d70f7aea4642
 EBUILD did_you_mean-1.2.0.ebuild 613 BLAKE2B 88c98094eefea99512c68f8a31066c2709d51ad0b141d09965a6b249e73ccd7c5519afeb7d793fcea7ca7ab6111426583944f6cadf87226937725f72cd6ee85a SHA512 281a345267c6a7bc40acd9db36a02d93e9706a6e2773acab7502b745503bbb6c16030ea83ac27ef73f67d3396a5f64e63f95eaa472afd363311912ba91d91fcf
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
index 09bc4c5f7cee..58ed4895aa1f 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 651f356e6a3c..4a402fdf1009 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,3 @@
 DIST domain_name-0.5.20170404.gem 120320 BLAKE2B c2dbb97c67e1303c272ff67f2c32314827513a5953ca3b9d49667828f6972904249ab98ee0541a380fddb7c6e3fcc3959f8e5f8746ae6b38a3915169ef6c0dc2 SHA512 3314d87ac3b04337dff047c423ded2f4b99a4b9300528c34388cbc30fbcc7e84ae884969624e046e0dcc1d856e0bb8246b1556ac2dc755a1b4917ccf975fece3
-DIST domain_name-0.5.24.gem 104448 BLAKE2B 7a2ad0838710da737ea259c797bfaba93728b3548561fee2fa31c52553d9c8d947b25fe6a5cc2a304146eeed376994d6557dc945fbde1e74dcbc7aea875500d3 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602
 EBUILD domain_name-0.5.20170404.ebuild 1100 BLAKE2B 24ea0a0b37c149c66b66125d21bc76abcca90d65e9ef34eaca9521f4587723e23c2a313f998d44817d45b4d16e1d02edd7209f8df8cf4db0d5ca2e2be7824138 SHA512 53e379cc0ea301f1e1113d3cbfd4152b4c89944e74c7678ca9a6e8aceeec2fab4dc9416721fba1970f848163d371c9709bbeebae1e88e6acad9019304b77ec95
-EBUILD domain_name-0.5.24.ebuild 1073 BLAKE2B ef7da3a3dfd7774811bb474c429dff83ad52af1abc8c5c4942d3694b31781ff9ba15e921c99f3323e27c0d179ce35ba13234708471493ef4b78b0dce74a6b07e SHA512 0c57d6f2c1ac8466042770cbe972690af01e1d5d7bbd253356f59e5bd5b65df87f08362c663e513fdd149a16464f427d7c48b888be814e7dd1261ef25bfde73c
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.24.ebuild b/dev-ruby/domain_name/domain_name-0.5.24.ebuild
deleted file mode 100644
index 8cd2c216e78c..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 82896d057fdf..c78945ffed04 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,10 +3,6 @@ AUX is-integer_fact-1624_3.6.5.patch 2220 BLAKE2B b8253f3d7eb654c944cce5d75715f7
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-2.5.1.gem 254464 BLAKE2B 7276e9c406c000e51e68a2a1c22d0636e294902d31bcaf58e922961a8e1dd99a362467b7046362a5f179fe72f6c077656d4d400e354ed40ed3a06c71de7f07cc SHA512 4fa4b5248bac64c7a76036e428f0f5fdb0b2173987fbaaf18d0130386126dabb083e23cea8cb4df37bae0ea5a883663f71bc6c04406c562bfb7adc23e0899f57
 DIST facter-3.1.8.tar.gz 324710 BLAKE2B 9b7ce93d7d0b2112771ea79df0cb35e7bb752e19e4a54d213161479c27c7ade79e148fe1fdbbb3c20d0d61462aac5f4b97b6e84fdca89623d9ba4911f286e9fd SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7
-DIST facter-3.6.3.tar.gz 370771 BLAKE2B 2c94f319e4f739fd750622e431239412726b193db26ea4f9a9eee79a5a1cf6db76721d343ae042b1ce9a5e6a8ff48461251ca088badedb6754e4a2d31f547e5d SHA512 cdcc6bd848c664f395f656d57e0bd28b62cccfdaeccdc9cd364d90a96693c6c8cdc079aa70409297f0ecfdee041c28bad52b3cb4b8981e66de2887bc5eb1bf33
-DIST facter-3.6.4.tar.gz 373722 BLAKE2B df6c38f0828010a2b9663fb66965e0b4c69ebce0e3d4bd9cbe424cf82ff0f47f6c60ece6206728d0420047f078cec96e37a16f0a41bd79274b2525d1d3d8b071 SHA512 d5e03bb40da448805a56accc2fb972569f686a1e8c8b343d4e0defb5a00a982665496049174c225a8b04abb4d09112bd2117a8a96c9360bb2e36e4d569d86337
-DIST facter-3.6.7.tar.gz 372697 BLAKE2B 1adddd0f118049e698048cb94544041d7a6feb3f530c62837e477deb0b0c4254efdf27a793a1ceb9182185a52e7dc277587834a80c9dbc8ec994e86cc12f36a3 SHA512 a9f2781b0e05d09240efaf88d79476786782df7afc5afa222df30f3cd69eb1712dca59bd33157c2be43e7c54ab940e8d8ef0642dc075c44ee86fc6fd89a102da
-DIST facter-3.6.8.tar.gz 378732 BLAKE2B d898e6ccab188fa90b867a337aa3c248dcb913d75318749b35639c429b192ceb9dd4cc20eef1f1e478540702b6f9487558bc8da865a7a40b851389d8da594e56 SHA512 f076819ce04aee404fb54e0f97423f39bf60ca56d8927bbd778972efaf650e2ffd0c75e5be0a3108738fd65242582269f17eca865fefc74dfef8f6a5bbec7f88
 DIST facter-3.7.1.tar.gz 374576 BLAKE2B 58f3a8f22c0a01bee1202fdb3f44a8f61a2f9bfed18585c6ccc8f0f3990fcde8c267540a0d06b805b91c538dcdee90e9b9dba3d618cd2df8e935d8d994134167 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee
 DIST facter-3.8.0.tar.gz 378859 BLAKE2B 3fe790c21211fe749727e6da7849911751c8deb51c5ef08ca9669ba385a1791a289c50d4696eb1ed72b06c934bdf385b6928ef04d20ae7b903090162e047b3c5 SHA512 e28771c7136c9b40e2f8b3509fbe07188d2640288705b5bd531521e476b8b8386e5003448b4c199c9d6cced8128ec113dcc9ae317cd4aa5319da906e605cfc4d
 DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7605234e3fef476e92ebb4d541d4b1b9148fc0350cc4b1854c1cb7888482120a3566fc579dabe033301791019 SHA512 ca818ba58fe232752a74faaa8377f706a49661e37ce85af7e6eaf735ecbcdcda4071618a6b8906b0444fea989b7b16cb85171b980a089cd57aaad37508a2b905
@@ -16,10 +12,6 @@ DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e668
 EBUILD facter-2.4.6.ebuild 1914 BLAKE2B b13ba79845f5a6ce0d27a8b66f034e12be1a7b522fe263c74760d65d3bf4565bf43fed49cf7e475afb673aaa57f579a5d9ad79b38219c8dfdf0ce32b15eb6536 SHA512 e1e6727b7b66fcf3b306f83563293c5bc7ac541efa775a1b4894c99fc0fa0fe00202cee368b25b389d4264ed868af57fa88489df6b4d8e0283fb0ada79d97440
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.1.8.ebuild 1833 BLAKE2B 35fb5f497db4c8285afef7c7448f67532a8dd6d180a6ea0d63faf8d87d2c09fb8d9ecb27ed40d1dded577205e7e1529035abf8dd0f268f22bc7686c09f8f091c SHA512 56425967d45ec216d15a8604d17688b6103d023587e6b806869372bc5b6ed0927d6503ba2be0da4010ad1400f6a475ad82a03bd8a39757c92da952eb599238f1
-EBUILD facter-3.6.3.ebuild 2062 BLAKE2B 1115b4d2beefbeba5d21b979a063a00ff12fd963e9aa023f4c59122823911f4375585313530a7f773e4a4e8ab5876b9e20c8022e96fe663eccdb08ea5f7a3676 SHA512 051f5a4e627e21cc58b31a98857ebb64b7cfba338db8b8e02a2a9b3a184cc663bc640666fab4c6934b45c299c73f04eba49b2b654680d7a71abe1cf75f22b554
-EBUILD facter-3.6.4.ebuild 2081 BLAKE2B 2697a165ff4ba354406c3835e7adc41f2b40a2c0eb974ea21e17a0905535cc8383a12810f5b78ebf568e8b3e4372a82622780b40a7d9b01284eccd9abedebe10 SHA512 818c8c1d376f143894e04bcb881797e5e2eb825be12b485495d1bafefd5fbb50981440e890a6f5b6477516407277bb2dd76caed1b208498665bd3dfc7ff5bfa9
-EBUILD facter-3.6.7.ebuild 2145 BLAKE2B a4c08b61b82387bac20006accc83d362c06778aca9233bdfb3844fcfdc7ddc6df3a16d482af978df1ba3d1ec218ff2a2fb9b787154c519f95f32b4454115c708 SHA512 06dcad1ffa7a6c262d54026666571aa99ccc2fea5d2f30b0c7690ef493cd8f2b39a83ad73b846ade930831dec236f5bd9cde017370a149076cc4d41eba348539
-EBUILD facter-3.6.8.ebuild 2145 BLAKE2B a4c08b61b82387bac20006accc83d362c06778aca9233bdfb3844fcfdc7ddc6df3a16d482af978df1ba3d1ec218ff2a2fb9b787154c519f95f32b4454115c708 SHA512 06dcad1ffa7a6c262d54026666571aa99ccc2fea5d2f30b0c7690ef493cd8f2b39a83ad73b846ade930831dec236f5bd9cde017370a149076cc4d41eba348539
 EBUILD facter-3.7.1.ebuild 2102 BLAKE2B 96a000c70aeabd1554b918c6c38b40097a4a5edeceaa93d57c8a53e7d9cf09988d00ee426d1618f98fb24aec5d6a2b04b199488af591771ddc563719c61cef6d SHA512 8111259a1c695acc9dd884f6dc19560fb18dcaf4412c924529312b288565d20efb010cb41c64a55594f32cce47071b1216a29df23e93df578cdfa047897736ad
 EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
diff --git a/dev-ruby/facter/facter-3.6.3.ebuild b/dev-ruby/facter/facter-3.6.3.ebuild
deleted file mode 100644
index ad8f6680f77f..000000000000
--- a/dev-ruby/facter/facter-3.6.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-0.9.3
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-	if [[ $(get_libdir) == lib64 ]]; then
-		dodir /usr/lib64
-		mv "${D}/usr/lib/"* "${D}/usr/lib64/"
-		rmdir "${D}/usr/lib"
-	fi
-	doenvd "${FILESDIR}"/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.4.ebuild b/dev-ruby/facter/facter-3.6.4.ebuild
deleted file mode 100644
index 6ba5e69df6da..000000000000
--- a/dev-ruby/facter/facter-3.6.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	>=dev-libs/leatherman-0.9.3
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.7.ebuild b/dev-ruby/facter/facter-3.6.7.ebuild
deleted file mode 100644
index b1ecb67c84c8..000000000000
--- a/dev-ruby/facter/facter-3.6.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch "${FILESDIR}/is-integer_fact-1624_3.6.5.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.8.ebuild b/dev-ruby/facter/facter-3.6.8.ebuild
deleted file mode 100644
index b1ecb67c84c8..000000000000
--- a/dev-ruby/facter/facter-3.6.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch "${FILESDIR}/is-integer_fact-1624_3.6.5.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 19470d0da787..0be7b622482f 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -3,6 +3,5 @@ DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e
 DIST faraday-0.9.2.tar.gz 57013 BLAKE2B b153188e32ab385c22b011a916125088f56e8dc4ddd5f5fec3b7d0b8fab23900dff4610c642dbe80db0989244952f938d3dfeac0a022493855d6e4ba778d2482 SHA512 12c4ead8dca6baf6292291943ea1aab1a534509bf92c6e0a621c1c69e3493480fced68aa529d8678847028f2fc2a7672411df7e4d09e65a5e764c957fed1ee72
 EBUILD faraday-0.11.0.ebuild 1894 BLAKE2B 42b66ab1eff06f53738c22f7bf0fa8fe4e0e1a170354fd5c9f4a9d7cfdcaf7a155b956e716bd3d5a5cb81c5170a5c67002410dc1061335d23a4c5af870b3a3ee SHA512 7effae5fbd3d5d896e246584cd405bad0e24a934c48955ca49e2dee5db7006560d2655cb74583f98493b2fbf0b7acd322bdfc7286a7c2f3fd12cdd28e74fd3d6
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
-EBUILD faraday-0.9.2-r1.ebuild 1845 BLAKE2B 605eaa1d214c621acb01ab3c580cd3e9863aad6805e4f136cca0e97d834d6e605090d63d69efb6736990a5495e0a75f9c0e0e58cfbe7bd9958c2ca42f040ed40 SHA512 4a977c5aa9ec0187a88b1a8804c5ad94ffaf485f5307c8ab45c01194efc4018bc8f59a8a896b26be15d74be4d94e2b3ee9f0bc5aa9f6636ba6467db01549be60
-EBUILD faraday-0.9.2-r2.ebuild 1842 BLAKE2B 23f7aa9286e6349f4b4ebf422fb03ceed30c91ccfafcef1655a7943dd281c741f09bdb2ee6a465347240f3b5078ad763540d81473fd2eced21dde4aa45c30a51 SHA512 3d67866fd7dbe5b51e1463fea1911833952ab3a9bf2ace4c0882252aa01c986156c47e7a76ed1582b1a3d8615233cab5d62e9995027b1d5f155ab7bb9ad7e0b1
+EBUILD faraday-0.9.2-r2.ebuild 1852 BLAKE2B 224eb26b782e7f9dd3ddb581e171327808a6de0f0d3b033043f795436e78320798ebe64894fe0fa94385d63eb3aa340ba2733383e2d722c4cf695c97b419c7ec SHA512 a3a63ff39b478748b03ecbf3ff3a59246d51b1f421655893c6432c3fb5f4da7218ab772ca6e8900a260d2d5e6d8a920edfd06d0656328a9f1b182a8a3314925b
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild b/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
deleted file mode 100644
index 7c79c02e334d..000000000000
--- a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild b/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
index 673d327b9a79..b30965657cf1 100644
--- a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
+++ b/dev-ruby/faraday/faraday-0.9.2-r2.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
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 95890819673d..350414e59617 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,4 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
 EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 983 BLAKE2B 52a0a44cd1d48b32fa9099c008444e8fc5ca75c30b6fdf7984b31272b83c241ff941b2c75a95e43971f53cdf48afb2e04ba4d87d062b084621f8bfdc40aaa9fe SHA512 c06f079f4f84ea266ba8f0693e4c12fcb4c4338b457907f164211a82543e07524946d13d44b5108c884327b492aada7b14bd95e98e6b65eb8faffec57e7ebb5c
-EBUILD faraday_middleware-multi_json-0.0.6.ebuild 988 BLAKE2B 11f33c8f7f2887ae083c3d6b6236c67f0a8768e64040c8334b89f3f2d2268376f199f3c8869c35cd3c597ebd89c6c8a5ff0cc063db90944f8ba7381f9be65a7e SHA512 5cea4319aea6f958292a651cd8cad182082392172c10c8b381c1cdf0a2b939b6acaf2ff953f872229ee59d73f6c97c4ce13536da92cf83351b037f1ef400b498
 MISC metadata.xml 623 BLAKE2B 7be969984baa0dbd08ae9c667ab8a6dc7144de07d5a54721a0f8630ee458b02f8e21f2a693d43224d860daae2464e5e88e43b437c62dc695cf2d2c61cea13e9d SHA512 df56fd21e8b99a769ea2e9c214a2720f90e32d410b78bf884c13fca5a4f79d84f3c3f02163e7b3f39d86f15aa54e6bf1fbabc15e0bbbd4bac8c516f241b0d2e7
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.ebuild
deleted file mode 100644
index 132577790567..000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
-HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday_middleware
-	dev-ruby/multi_json"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm -f Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	#sed -i -e 's:ruby:'${RUBY}':' script/* || die
-	:
-}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 906e98069ef0..25cba08665c4 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,9 +1,7 @@
-DIST faraday_middleware-0.10.0.tar.gz 22646 BLAKE2B c880dbfe73a33b3b2ab5b4f7211b5f095b203551fe3164f963ef06781be271580d3c43a6320ed189180191e0711ac61b8d7514456d87d1fc62d0a82ec97eb2d4 SHA512 f516f040a7be7b14635e8685d6d63647fd49ef595f31c655b6cd8e6b9443a80e1d4c68a516cd4088c129a73e411748d15d97b24cbcf321fd15953292ca3c7964
 DIST faraday_middleware-0.11.0.1.tar.gz 24349 BLAKE2B f2ce9ece102baa86c9ee763c51da2d7a7318a72d8e6b6f102baaef51ad7b13da32c525b7a67992fcab83d0a145e8cb40d3c4bf31ea1bcb18bd73ee54e327e6d9 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051
 DIST faraday_middleware-0.11.0.tar.gz 24345 BLAKE2B 43325e27d428a74b1b20eafbe99562442ed7d0f98d19cec3f96fea0ae63f810fab92eabb9a3deb586e4d5933db8d2e9bc1f8270bc99c76a4afd7035fa251f192 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13
 DIST faraday_middleware-0.12.0.tar.gz 24896 BLAKE2B 2a371a55baeafb86196cda66b4d36d1aee3d96c50c1e2550edfe70fe0512c2462739b19c3001bb4569d70d98fda2b27fb59fb466051f331a0839420494f564fe SHA512 e4867c122d69e3b8e8a405a85bc8be4c1489861f4acf42369f34ecda67ca0e821509ef522e742bc8b7a20fb0650a45866a04f4b4469829fbc50cd040cef374af
 DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c6b565bc2f5bbc3991d8543424dacb243f2176a066cdb4c7dd4fa66f7f90beb477aa66513538d7a6c2f84de56075c304d3caa SHA512 a93c6ad6a97da1c84e539ff5976f464e6126ea444b269be2f3bb3dab71ef6f46fd12cc0b4de7aa34842d4dcc274cca584ef879a8c1b80ca4557af4d4dafcd755
-EBUILD faraday_middleware-0.10.0.ebuild 1359 BLAKE2B 937e7b70937403f6dee197de470beca6893edf7757fdef5162eefd529c4fe5410d3eb790b149b9f9b1e499cac09c9f4a69978eb35db39e3d4b2fcb383e3fb2a6 SHA512 04d8a468b989f55420d00efceb59de17db39460d21954524f1a9c6eb4fab4c9182770860e57c121a509c295a4eb2965e8e79dd03ab71806d1ee0c77cae9ac5c9
 EBUILD faraday_middleware-0.11.0.1.ebuild 1623 BLAKE2B 46208c7e0f5096d71369491e6f2d8209e403a86d8f1030f602451753b5cf685834a9609fc76389177910bdc400452b9aeaf8c344e66e96f3077bd2521fef7abe SHA512 ebd707f39403687f73ae25857649c2206a803ac2266ae9ed6d833327288a472fba7dbdfce78fa67f9c3da5e7fab2e7f5fd8f2372ce1e686e0fdc4ce4cb6233ca
 EBUILD faraday_middleware-0.11.0.ebuild 1510 BLAKE2B 926dcb593631fa724d4bdf5ed00b3fe91f345c522f12558e24c06f93366c5c530bdb100fe954ecc2fd7529401c7d93ad8abfad3cce6f71731f8fe3f6ee2c9e5a SHA512 a749d71974bb80c4f4fdae02303d17dd4665abf27d9b430e54585546d22024377a3876cf471fb07ea109f8a4d62f45a10e7cbc87f87707e6bc8678c92fc71377
 EBUILD faraday_middleware-0.12.0.ebuild 1636 BLAKE2B 5af39ee600118af5981388488d9bb56a85ec5a6816ccc982e013f8ec8e47b411423c72372320323501b91d5f8f4ce70eaea0aac838843e5f27d6f92cd149cf20 SHA512 133c50770b3ca3c1a0845f18f47022af28b51ddbbd27f953ff4be7c97c3d83bb378da57750356487df7e28177a8d8251dc882adcc1ed42a84bd2ddbebfa2be81
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
deleted file mode 100644
index 7e358013e24f..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash-0.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash-0.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index be2dd865a874..0c5c252009c3 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,5 @@
 DIST fuubar-2.2.0.gem 13312 BLAKE2B 332fa172f5f029e26df90e622c78ebed2a58351f89c121016a7effb078508a064846945e3b915c51263a3d149f34308bfe21fbf5f3080a0a19fadaec0f0cdf04 SHA512 5d421fe61b2c28a30165beb10852b31d8eda71af0e8b62dbb4f4385f064a2a5ab2929933df41c7665e1fae6750763a13cfa016a506d93e7adc1bb03c227ad0e7
 DIST fuubar-2.3.1.gem 13824 BLAKE2B ad7c0de7dd75b6164045bab69cb8be12999828edbbe12157cdfcc9188cacf03a3528731d85918cd205e8659739f177908b3a635adf0f722bcdf78dfb6eb2c10d SHA512 e83b5474b6805f03e3a81e9b25d97e3a3819d7d3972c7f164dc4dc09bc163eb86457a3cfe5fd53df336f821846e5fd63739fe05c30200537c22aa329215c1900
 EBUILD fuubar-2.2.0.ebuild 716 BLAKE2B f4efba236c599d9fef7bc089eaa609534158882284e882de61fc3464599f959c44ef9f4fa0302545be209a697b51d69da4a9f72320f692f227b705c3870fdf20 SHA512 8c88572f677032f6968943fdad2d7535b1bfdd479d6ae8197158918b5ec99cd95c35f696b6842fe0664a89e9c6c69eb2e493b477a4634e9298c29469d34718b9
-EBUILD fuubar-2.3.1.ebuild 702 BLAKE2B f139f4b9baa9ea7714d7c8ffd58fe57212613a7fb0b74cc9b5708b80df1293266b7672eb6478263805a49ea759e70516555e873eb19273be55723af5119949b1 SHA512 4a6d0fda18b00cce9877bc19ffc47952f80bf3803e13a1e47ce56fcd4521dc445abfb07c93915c85a95b23cd41a41b7c22b13196b5da0394acb44b7b2d95d4ce
+EBUILD fuubar-2.3.1.ebuild 709 BLAKE2B 260d13ee5e2ae4ee0013d54d01300e99a6a467fa25de6bdc1e136b7692e97f5cbd3223c33f51df9a28c92d7d180c27334e4c355f695de8774110e8ce2808bb50 SHA512 58693eaca05edb17bf04019a223d28c8504857cd6bde5ceb047838d94757765225086bf2810fd0786c0de419e464b7e735bc37c8dd6eb3bad01b6eca281b8a76
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.3.1.ebuild b/dev-ruby/fuubar/fuubar-2.3.1.ebuild
index 87149eb80c57..7e4b4ab27341 100644
--- a/dev-ruby/fuubar/fuubar-2.3.1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/github_api/Manifest b/dev-ruby/github_api/Manifest
index 3a8f3f6a8807..c3e383504b75 100644
--- a/dev-ruby/github_api/Manifest
+++ b/dev-ruby/github_api/Manifest
@@ -1,9 +1,3 @@
-DIST github_api-0.14.5.tar.gz 2047231 BLAKE2B 3c44afacbb7c50908b553464266d1f66f50b71869987a43086fa8c88a9d038901790661c9515aa7eac54128fb9b946a77278f2cc129e0aeba120726c7b984fdb SHA512 c19b8364e627427ae0447810b7d56b5bf50f89030a02af9b19116abc906ac780149b47d54ae3a93d4e1a3f52461fd1b8fe969501fa5ec6e535db22749b8ecd89
-DIST github_api-0.17.0.tar.gz 2122803 BLAKE2B 66bc23ef31d2d7a4e45cadea0b20e64a451672d4ecac2822b01db166af9a4af92681d9c8ec79d05eb930e78935ddacc885d17f0f4db5e42166737467c6f33f02 SHA512 0b85b299fb85e8f5e48d5c0a18fbab1d6d43fc2a35bd3dc7d6517b06267c9daed6bd60fd1572b64d61c034be30729e7aeda38aad15f7749b40935761d3db7a98
-DIST github_api-0.18.1.tar.gz 2124835 BLAKE2B 23d0e884aeec023233d2be534a2de336ae6702ada6933d52572fd1695b1217a0cf7be062b233c614456def11014b182fba182585c8d8665a6f8e126d813bd9ef SHA512 92c0348807307d00d92d12cf72e736bfbd525b2db9cc6ccc0caa74753a88166941e0300db55f353a7b2d169fd0b409ada7eb76b505b902a949388b5bf24c0457
 DIST github_api-0.18.2.tar.gz 2124932 BLAKE2B 62ce868b5437262c3cbcac7cf8e3966288cdf5b78e4698f3d3e35d1da3e839f6445e582db74db47292749014a9532a0ad3077a7b5bd30e2148546348241e52a0 SHA512 ebc57fb86bf56b5af6f6ed96c3dab9190dc7695f37826851d35a7621f8f655c3aae5ef613e48fd6bc98e74e8cb6218a3cf425173feb98e6e054d7fced115ac14
-EBUILD github_api-0.14.5.ebuild 1543 BLAKE2B f3058b8b5877cec2b67a95e83e5d66bcdadbffaa4188418f47482c66e5a63ca9a5e16f62dd8fcab5b30dbc585a264e290d665f3b29bc1d55883094d910e7a00b SHA512 fdfefba7bbd00ba78e66396b26d37ef2141f6c0a05b748ebdad3406287e5c4dc3127401a6974b18014f4d68ae7d43722b5776b4bced82e55402e0ab3eb00f724
-EBUILD github_api-0.17.0.ebuild 914 BLAKE2B 86103fd2b772cc9f150415f0d71f850616fb3837ba16a406257d63c88c81d79e39dba5c3f14cbfa306c4d176470688292d334c88c411fff963f23b70f64984c8 SHA512 afeebf35d73ec2df3d15aa33fc2484949632af983e5b63619c29758f76a44d568d18f0d29b6d1319e412d022eda6f75e2e503065f469488e4d1d95e705a42ccc
-EBUILD github_api-0.18.1.ebuild 831 BLAKE2B 174ddf1d1b8525f6750209778ebae4dfb2768246623d4a526b88bae07a259cbab0ce3e49b00f37acbca448b7b1fa5da52e1474b2beb53e0b6002e9ee962f35b8 SHA512 ee6a0420d78b8c4ebd9ab9788a4982d55a028f4473e8f7a4c0fcb636f8ead94a54240de155667d98ef87dac678f16ea45bbbbc5f66e28b1d5a6777789a9f851e
 EBUILD github_api-0.18.2.ebuild 833 BLAKE2B 210f9586660f01b3dbcf14e8b7042f9a9aa17f9f39c5f0678927af6383b35e25b3d2f116aef1467ac3cfc5695a9e95ccdf5c9b35595c8c9c0a07b472da65eaa4 SHA512 4e2c70686d25551360e6fb4a302da9eea15aba57b84a55d7b8597bc1cb8b72799941565f12406dde4a12dfdc04796b3a9c47aacb5f2d9c14e06b860bb7ee62a8
 MISC metadata.xml 345 BLAKE2B 1ae3691e311b91be47dcaf3c085fc67853e1a70564fbbb8a99d53046e0e33f23cca172222528a87c46d82393c6854787790eb33b22dec23cc9d71917166c8dba SHA512 13a9b76087f805e0ef3cb5a1a115dc72d681d15899f0fec4e003583f29811e3b7cd690c4e6fa8f138c4d992c39551a6b40e71a25484017e0d647ebcc9c0602e6
diff --git a/dev-ruby/github_api/github_api-0.14.5.ebuild b/dev-ruby/github_api/github_api-0.14.5.ebuild
deleted file mode 100644
index 51ebdfb245b4..000000000000
--- a/dev-ruby/github_api/github_api-0.14.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.10
-	>=dev-ruby/hashie-3.4
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:0 )"
-
-all_ruby_prepare() {
-	# Work around or avoid webmock incompatibilities
-	sed -i -e '1igem "webmock", "~>1.17"' spec/spec_helper.rb || die
-	files=$(grep -R -l "with(inputs)" spec)
-	sed -i -e 's/\.with(inputs)//' \
-		-e 's/\.with(inputs.except(.*))//' ${files} || die
-	sed -i -e 's/.with(hub_inputs.*)//' spec/github/client/repos/pub_sub_hubbub/*subscribe* || die
-	sed -i -e 's/.with({})//i' spec/github/client/repos/{list,contributors}_spec.rb || die
-	sed -i -e 's/.with({.*})//' spec/unit/client/orgs/memberships/edit_spec.rb || die
-	rm -f spec/unit/error/service_error_spec.rb ./spec/unit/error/unprocessable_entity_spec.rb spec/github/client/authorizations/two_factor_spec.rb || die
-}
diff --git a/dev-ruby/github_api/github_api-0.17.0.ebuild b/dev-ruby/github_api/github_api-0.17.0.ebuild
deleted file mode 100644
index 3f81c5eddb54..000000000000
--- a/dev-ruby/github_api/github_api-0.17.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.10
-	>=dev-ruby/hashie-3.4
-	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-3:*
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:2 dev-ruby/vcr:3 )"
diff --git a/dev-ruby/github_api/github_api-0.18.1.ebuild b/dev-ruby/github_api/github_api-0.18.1.ebuild
deleted file mode 100644
index fd1ba6c6b751..000000000000
--- a/dev-ruby/github_api/github_api-0.18.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8:0
-	>=dev-ruby/hashie-3.4
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:2 dev-ruby/vcr:3 )"
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index 53c69f4e5e52..1a264bb9c4a8 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-gpgme-2.0.12.tar.gz 2414972 BLAKE2B 8890e01ffeda828468d4fd520a102a9bd9415a1503faa57b0b01f6f9f96b8f7d459ebf615f402e3b62583530bef71fc1c07ed859e9b2201657af4a487b70b794 SHA512 7c98defc69fbcee37af654d7f13110ca10663da15f40b2b558c32c1695caaa6b4ec2c65c9c6dcb1a60b9dc955d11226776d4ec7db978847b74638cda3274644e
 EBUILD gpgme-2.0.12-r1.ebuild 1432 BLAKE2B c7c7a499a550d6a6a4a9865f7a2c598834b2a5e49f4b51c4c10440d8f4b0bf75c82907847320dd2a9ebdb58bf718a2c80f710f9ad7ded52e60101d0095b1d70e SHA512 eb791978ee0bf94622528ca5e08226e427e4b8a949d9730704eb484c035175bd9947dfc10e716d5630d10287cfe2ee5936f16bda7296e184d1b40f2cd0178d12
-EBUILD gpgme-2.0.12.ebuild 1418 BLAKE2B 484d96e1ef24bf68d9abd2a7a3eaa3b034fbe9beb2d3dada4ba4d82a9c8d4abe625b7dc515949cd86bd2d45ccb8a747c0604793dc0697e1fc6d78d46c7cb5676 SHA512 0116ecccf754ec45e36b24f271eeaffd449901ff9de60ec0f2b784e7aa75ba9d28a4a2b019fdbda19961b3632627cfd1313987a447dba13483f8f60775719d7a
 MISC metadata.xml 467 BLAKE2B 43fb75477602eef095d6c69fcb8c54d00c41bbe84b8ab313dd0d7b0f5c2cb0164f61d9fe66da75c3b0e0c9dd2f01621bb65c9243242432e0ebe00d1980ac59b4 SHA512 ef3183e3a7feebe61f96efe8398b19502d57fc8595f6bbd7c0382c4c060003116648605f8ccdb193103f0433b321e98dda3f720da993a7840e7645f8911c0a79
diff --git a/dev-ruby/gpgme/gpgme-2.0.12.ebuild b/dev-ruby/gpgme/gpgme-2.0.12.ebuild
deleted file mode 100644
index 43dbeeacf695..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-ng ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=">=app-crypt/gpgme-1.1.3"
-RDEPEND+=">=app-crypt/gpgme-1.1.3"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	${RUBY} -C ext "${S}/ext/gpgme/extconf.rb" || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext archflag="${LDFLAGS}" || die "emake failed"
-	cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 6194b1fceeae..117431039515 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -2,5 +2,5 @@ AUX gruff-0.3.6-spider.patch 521 BLAKE2B 8b966f23a41ee914c87b2a8f699b62d64e6a8d5
 DIST gruff-0.6.0.gem 316416 BLAKE2B 717f46d94b4b0811f2edbe42fac9c79ed389e509aad9a4f166fb068a7bdd4c7fecfaf97059364505fa354755ce9e9f79c87452e55f1eb05dae1efe41b76e1915 SHA512 4771637157d11c85d437d41d63d018915d1214fd09dc7078b883c98f640821aec3ddc64fcd4516ca4bfd06c9523ee5a4b60dc6233903e03d7336ad10989613cb
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 EBUILD gruff-0.6.0.ebuild 1128 BLAKE2B 1fec7b730d7689370d733fc1461fb608cd54d608a584d05f86439a2419550b9b046197df9e0b0e4e8c0753f8051149efc8f223ca0c63d82e7ee8ca02f8bd4838 SHA512 e33695c234831924428d516d7b5d906f3c5a3becaa2e601db6bd81f3eeaadce508cce0d6a0c969b476c114953ad03fe74d6aa17a40a7db78e0b24219941dd2f9
-EBUILD gruff-0.7.0.ebuild 1212 BLAKE2B cc16a4d3629107f141e8111b1679fd2040569378b8a4ac135e97d04f5a56206ed231df56f34af6dcb6600bbf6bbb1ee547bcb9915a524eb64ed0b36b704de52f SHA512 5c6f3d902f94ffe94318cd265c0f2132f5ba1ec374c2334772db67e36006883d28cc41a04201da8c6889fceb570ea9f836e38e151ff5ae121f5ba3122d81b5ca
+EBUILD gruff-0.7.0.ebuild 1212 BLAKE2B e4dd20611be0f38e3ce80204a4a75c85350ebdcdec39f8620d7c19db128ac19b5817790e64eaabc18025b1e129e7f68d489d504cec6e3f33ee6c9445a031b31b SHA512 5d3232cb384426a3ff5b721c7788414c5e39ebee43b98d816a5050891b0387f313843221bfbc2c7f678bdfb1307f474549ae5e4338fcb12a5afb7b8d9c41fe7f
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
index f6eee6617f08..14e5a2b1e10c 100644
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 6fdda3d2e5fd..8c51b4a7d28a 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,5 +1,5 @@
 DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
 DIST haml-5.0.2.tar.gz 124000 BLAKE2B 852a674d0519ca785fdd448295c402f203d21e627e9dccbbbfe835ed51fe19d4110c908e14cb40c18644e758d609d3651dddd750df7208627e108832c2f06cc9 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e
-EBUILD haml-4.0.7-r1.ebuild 1270 BLAKE2B eee99c2870b4e17991a2d90a2b1002e5fba2d26ed3c9548988b4083c6f4dd5d0a203847a1154d9e99a2c9081954e7c534fe032906c13d02e85218760dba1b0bb SHA512 fa5712f9ec78c20f529dfba71bf40367bd9b1931fec46d424c3d8042c38da60ecd636951b2b8a337dcdcae116b493461ef738965e98fe1167e370ef3c4c6be7b
+EBUILD haml-4.0.7-r1.ebuild 1237 BLAKE2B 157a533f01c713c1c9afdc3c6cbc14d6dafeade63f2450835ed5156af7994eeeb476069e3f4b9f22fd19da6a25538fc203008802c7241299da413ea0d4e140d5 SHA512 4d085239c32be797b539414e36d25d944acccb937ca280c2c07e424d27b88d1df34cccafee98f309d66c5a9506afc443296d96c7644f82c83cba1d826436acb4
 EBUILD haml-5.0.2.ebuild 1569 BLAKE2B a762048a812e983a1997c699029dd2ddbc0029afc3e7778f461809adb5793c2b003f90f5a95eba2e8a833306de0c706b1ccefb09b74830e438ce9b49ffb5de9c SHA512 f6a0735c0263bb85484b5aabefba5c5e1ab83777073bd09b7acd5d5eca67d2777ffd1178635358eb00a843dca4ad5221604740d627b715d3bfc552b87274b66b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild
index 14564a4e5844..e57ebe24cda0 100644
--- a/dev-ruby/haml/haml-4.0.7-r1.ebuild
+++ b/dev-ruby/haml/haml-4.0.7-r1.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="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -31,6 +31,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest:5
 		dev-ruby/nokogiri
 		dev-ruby/rails:4.2
+		dev-ruby/bundler
 	)
 	doc? (
 		dev-ruby/yard
@@ -38,13 +39,9 @@ ruby_add_bdepend "
 	)"
 
 all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>4.2"'\
-		-e '1igem "activesupport", "~>4.2"'\
-		-e '1igem "railties", "~>4.2"'\
-		test/test_helper.rb || die
 	# Remove test that fails when RedCloth is available
 	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
 		test/filters_test.rb || die
+	# Avoid tests that are fragile for whitespace
+	sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^  end/ s:^:#:' test/helper_test.rb || die
 }
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index 2921dd6ef6fa..ce9c5a1adc56 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,4 +1,3 @@
 DIST hiera-eyaml-gpg-0.6.gem 9216 BLAKE2B 2578195d92d4edbfef9184ea8d9a72f2bea3c67a51ab95579292859c81f41a199ddb92a0168f209548354b3365c66593d48df1b9dacb9774df42c3439305f8da SHA512 bc66c5adbbb4e861ceab689f0695bc6d36b8fe5ecc9e42d03f2640c4264b65d93a19e829edae8aed531f101ac2f41dcccd676741323011a83f0e11944c5204cb
 EBUILD hiera-eyaml-gpg-0.6-r1.ebuild 506 BLAKE2B 58fc226b617fb57eb434e1f5a41f6e461fe76d8bc2533c0e1f6d78a5027814ba2bb160423e1eefae063228137807a2b1919da3148f15475760ddf212972c0f93 SHA512 71caf274361b14bf562577c1d22110a07571f964fe61f6b89f85a527c3fd9ef6440593c6fd0a3b5b18f90b9283105fa6840ace78de0d43d526105e35311185a1
-EBUILD hiera-eyaml-gpg-0.6.ebuild 492 BLAKE2B 9d4b3e3de9bb20c2ff3bd9940727f87f7a5ea7c5a266e11404bdba81c3ba31bc2d3389d4c30fed5d56e2764ead2c559141e4ec7c4f1fe14e4e8aa2dbf5b18809 SHA512 9b8669691d5f4e89e1e7880557e8a1c78b4bfc68e60ee500617931f44c1c1d2315db72f81290ed22af4e945f05e4115eee6191e2c91f6156e9f852bf8000b174
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
deleted file mode 100644
index cf6bf0057bc5..000000000000
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A GPG backend for hiera-eyaml"
-HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/hiera-eyaml-1.3.8'
-ruby_add_rdepend '>=dev-ruby/gpgme-2.0.0'
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index b4e69b864171..1ab4d9ee5e40 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,5 +1,3 @@
 DIST hiera-eyaml-2.1.0.tar.gz 46179 BLAKE2B a25eaf1e013af4add5c4628dab168daedfeb8763038f4e003d5e48b5e51ddc25dbbb8b01d024836163089106d0786d27af43113b3db950ecb302c3ec5a82d7a8 SHA512 b85de0de0cb4f4a7b381ec7e406e5b3858b1e93b5475830df6991fc679d1391a88dd988c0d266942e70fb4705ba47cb656fd732bd923f8290dd90a5bf6e4a5fb
-EBUILD hiera-eyaml-2.1.0-r1.ebuild 1367 BLAKE2B 8beee29507f3abef3e0f3236250d86552b1c187d34b586d5378cac6e51c086915148d16ea88b864cadade6e9841451314314f2a0d86095dc507f4f3b0082ce13 SHA512 be9963887cd38d58f5d813f708ca4ddb0a41e4e46be862e92c894756ced58541c9a63279714358b60e341db87581fc0d5ea85cf728ce18c80dd0aae72bd7fb1c
 EBUILD hiera-eyaml-2.1.0-r2.ebuild 1379 BLAKE2B 549d02bf177ca7829527913a7ad6ddea1041e442f2bb28d6d8a49d4365bdc780b7fffee3171c0bc14ebe1b3e2c56d819abc75265bead9a6f44f43e5635f6d6a6 SHA512 10a4d2f4dc4586619f2a96250106982676476908d706581cb45fef0550b503886e8be40b4d0ffcbf29c8304dd7a0c0b270af22247a20a474610e158ca7491c74
-EBUILD hiera-eyaml-2.1.0.ebuild 1372 BLAKE2B 3e54f5cea58e4ccb20da384e854a525c59d4966ce6ab99b7d50f4a84e8c8be6e98c8e3bd97e07d29ccc20e5145ef2c6ecad033f64e3736692a7b5e7479d7216f SHA512 d111b6c708f1139bb8644a38f59c0a53e0bb80bb39a0e4c13dd38281531a19ba5311f04b6d2cf9589f0541446ae017f20912fd4f8e430ad087e358be929d0be5
 MISC metadata.xml 474 BLAKE2B d527c2a402f1ccb95a35c7a75baa9f71710dee53d9f37e424f28827182fe5500cdddb7af8297be14fab4805ac430d92efcc564419940065bcb0bedd3b7252b84 SHA512 af80beefd80dfb83c5c95f9d1707cda077ef7323004785e420ba56f6a4ccf42181247adaec2d023857d410ed003b82919a72af2a5e024c9d76a0ee696009361e
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild
deleted file mode 100644
index 3a1c363d721d..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19"
-ruby_add_rdepend "dev-ruby/trollop:2"
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 app-admin/puppet dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/init.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/init.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
deleted file mode 100644
index 05be0dd4b982..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19"
-ruby_add_rdepend "dev-ruby/trollop:2"
-
-ruby_add_bdepend "test? ( dev-util/cucumber =dev-util/aruba-0.6.2 app-admin/puppet dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/init.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/init.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 166a9198032a..7a019eeceb66 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,3 @@
-DIST hoe-3.13.0.gem 130048 BLAKE2B 9b5c63b539e8bc2faa3bbeed4a706d413ea1305c2104e3b215fa7c2a00ed06dcc4e13dd10a81c697d1e66405711e0c187e09f01463a3f14450efb2a5ec6dac3c SHA512 0b6b109a063811651787ccf3d63eff2944024013a75c0c3362056d2fba6668141b7541fff8e53a9ef414899adc560546a98c452878aa5c53620a115fef7ce242
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
-EBUILD hoe-3.13.0-r1.ebuild 1451 BLAKE2B d11ea06a959d802d3715b2fb77923d6e59cb1204e1707a3204113fbd3ed3c6d683c57147283e188c8fabdcd082b1419d42de6a7d5bdb6e31ef2a2946fb722cbb SHA512 43628099f9f8480855fa9a60d82bc8379f732d6b06fae5b7ffa3066a01ea0e9b001f444b6c4cd3cebc9af12579b4ad926869f762c1ba821d2ac7e9eea0439013
 EBUILD hoe-3.16.0.ebuild 1519 BLAKE2B 764738ca5d9c9e9b5594d5ba663b9b4c8bf904dc586662b44e36d8a697e8abda3bc5b0ffd7aaf05ac0eb1abbac3bb85458d79b196217da6f9df81d5a6744831a SHA512 7d846277053b5fc31f3967388833cb16e7d95481857e2154798dcef672f8d335d729a89203bac1c45e8b0c6531c782d3bf0669854441ca929eaa3d743c273b90
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
deleted file mode 100644
index 10657938c0cf..000000000000
--- a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-ruby_add_bdepend ">=dev-ruby/rdoc-4.0" # Needed for rdoc call in compile, RDEPEND could have it merged too late.
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-4.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/Gem.bin_wrapper//' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-}
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index d53c913c3979..c6e0f24174de 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -3,5 +3,6 @@ DIST httparty-0.15.5.gem 87552 BLAKE2B b5505b08ec91986da860d998a49b277e86151cb4a
 DIST httparty-0.15.6.gem 87552 BLAKE2B edbaf27c17d423e8bcc13744f7b567953c4486e41fbd91442261bc2981a46385dcbcbf10b62c63a6ed713cf5ffb38287be6afcc1af1ebbde8365e1920eec9341 SHA512 2c38cd0a20cccd03c33e521ca683c4c2eaf487acef00d4cab244898bb227bf05e21e5f01a9641869635391ad052fc1d79d63c46fce0e09a96908b4e5aa8ec571
 EBUILD httparty-0.14.0-r1.ebuild 1046 BLAKE2B 114af3a01a68b18490e38a3aa08b154ba3fe4ca5789a515967b89ccb1cd9f4c89c7c353620069e00058f06badba819f0cb5dbf4fdaebfe1d8769431491474272 SHA512 1b3759dc601a16703f7c29afaa90b64562a4bf860738307429d359ed248ca64c02ec27ae36fea632092941170ea693b2dfd73b70d7c17d55d6b8bbaee27d856e
 EBUILD httparty-0.15.5.ebuild 1247 BLAKE2B 3d484c298569c5ebea6c090744a32d1574e68218ea5e5eacf0b3125978e35308f7208c6be86900038e4894791aed37b6b3bcb2c253103ce50673be78c40ac81c SHA512 b0bd04b9e6b7b1bfa46b2ec5839e438f293d0a4383d4436e9c12c070beabeb0d70ca484cd3b9212e1ef10d80428d17f5fb18008936410c2d6495ddeb392b2e8a
+EBUILD httparty-0.15.6-r1.ebuild 1242 BLAKE2B 329a8a7ff1acf5ef77c1a4ced10c99538a9e66505117c1cd0913f2ccc72d7a5b5a6fa9bb5552412ccfd561c3b7ae327f5386c164f6376feec61a98d94e2a23b9 SHA512 5cf24082c7cba284c1307abdf57e923b65a3986179f9d99ea494b642fb574674580d30bb77a67d3393cece44ec0a46c5a5e25f4c9324f97db41c7aad3adf0879
 EBUILD httparty-0.15.6.ebuild 1247 BLAKE2B 3d484c298569c5ebea6c090744a32d1574e68218ea5e5eacf0b3125978e35308f7208c6be86900038e4894791aed37b6b3bcb2c253103ce50673be78c40ac81c SHA512 b0bd04b9e6b7b1bfa46b2ec5839e438f293d0a4383d4436e9c12c070beabeb0d70ca484cd3b9212e1ef10d80428d17f5fb18008936410c2d6495ddeb392b2e8a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.15.6-r1.ebuild b/dev-ruby/httparty/httparty-0.15.6-r1.ebuild
new file mode 100644
index 000000000000..8d3f9cac0555
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.15.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
+HOMEPAGE="https://jnunemaker.github.com/httparty"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'test? ( dev-ruby/webmock )'
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid test dependency on cucumber. We can't run the features since
+	# they depend on mongrel which is no longer packaged.
+	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
+
+	# Avoid test that works standalone but fails in the suite
+	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index 38adfe5d6fa7..3a245767a896 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,9 +1,9 @@
 DIST jquery-ui-rails-4.2.1.gem 155136 BLAKE2B f5ae03a3ebf41ed8a588ea9572a4627701b9e93dd6af289582d0f96881cbac41d3f94c56596c31af42eddb477f892c47b9c0260e3027813d86b98da3c1b9300f SHA512 632ebd8994d8b045e303c591b778cf85de9ea666901761201caefb818af56ed8021152b95b50ecb0e25d10c512b6fb4846b382a21f2a220b9d3550be1c434375
 DIST jquery-ui-rails-5.0.5.gem 163840 BLAKE2B 6eb6b788c826da95143a2d739732e1d1c18a13e76a71a0666f5b4163ca882b4b2b68f273610ccb340352b13c0f6763348fa4ae80b1f6a79d5e6d85110a06a36a SHA512 1db2e47d6a70d4326a25e89d3ff297e39bcbffbe644ddd97b95a837c3d4af7ff812bf165858382e0448f73406a4edf2b7e9c0e1622c1fdae68c52b1a60f77ff5
-DIST jquery-ui-rails-6.0.0.gem 175104 BLAKE2B 844c61c2b30c90d8c8842afdec682c7abd53283b649627740781714df43cc9d8436ff922d8f824dcc5cc3e4743089c23f2d5c8c63cae61ceb8cfc4bfc208ec88 SHA512 c25049927bf806d37cf6f9015b0224e35ad65e5f425974c5a33a06994bed8c78a9d224650f462fd49db269355a3b434d11e7ceef4e00979f91f14fb042e3da50
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
 EBUILD jquery-ui-rails-4.2.1.ebuild 532 BLAKE2B 9db1daca2bc8dbfe61e63c5507d7260d7a741b96c16b80ee5dbe1b3d046841d77c37ca137e3ba8a131ceef230df7fabb8f2a7435e76a97c6ce615ec99f1b9cd6 SHA512 9bed0c661c0fa6ba65e216d226d1725620e75fa1f70db797ec64c396bc43fc0af4f1211703d1f775613453b5de7630e4ce365b4a4c7c0a35e6f765b4a4b8e66b
+EBUILD jquery-ui-rails-5.0.5-r1.ebuild 536 BLAKE2B c87671c12d00d4907ad8db26115677ba5a385843d42c212368cfffe6961435d9037c35258cb33d19b10f85c8093d6ae79db1a3d86fa019f979859e66d4f5ffec SHA512 fe57c3470316bcddec04159d0d2f50394fb51e9a3d13de897f953430ec84e855d37ddabe2a53b65d2a708e777b45ac00323796be9cb69b8fc931f932b1b92883
 EBUILD jquery-ui-rails-5.0.5.ebuild 541 BLAKE2B 31c302e7f3f27ae79027486a451c47e6da0b5dcb3bf40163df57e3cbbe9b8efec66317eedf2c7cc6c8f1757b183c5073fa709544d582f532d05b56524f390c9e SHA512 a58a99899a59f3ac868905d881295f823cd3aefff5d68bd3b0a204f84278c7abe369cfb8f81dbecb6ab913fdd66ae9ba85e6dc1200cf146c066fa15370142c18
-EBUILD jquery-ui-rails-6.0.0.ebuild 563 BLAKE2B 5a5a3f1a1fa6a23d1668d78f660b929b068180b77b0caf98985bc2dde1896bd39fb3575d89bae05110e79c8e228416844fa6b2f122ed3fb53c6cd37c0dc24845 SHA512 9f0060cf7ae928e6dc4a627d0d5008c0f5110bbe78522d1bdfd24c4ad33b1773f93aeb046d90425816bf1887e802407cf019b9a3d24d1dd24eb020c606929a4d
+EBUILD jquery-ui-rails-6.0.1-r1.ebuild 551 BLAKE2B f12a8a6b618b66e7a12587d1d1bd8f4da7ff3066f551ef567e95c1737500087472498e9c1015b6e11f8d8d64192f0b988a93e0ed1e5a9774c19a095970f0f6d1 SHA512 469a406f702a569e4da2f4af8e4ccd49c87f8f904dbff31a7dbfe8918a086e124d35eff0d9283782bba8ea5829c7ca8ef218e5ba50b5662502290b22372097da
 EBUILD jquery-ui-rails-6.0.1.ebuild 563 BLAKE2B 5a5a3f1a1fa6a23d1668d78f660b929b068180b77b0caf98985bc2dde1896bd39fb3575d89bae05110e79c8e228416844fa6b2f122ed3fb53c6cd37c0dc24845 SHA512 9f0060cf7ae928e6dc4a627d0d5008c0f5110bbe78522d1bdfd24c4ad33b1773f93aeb046d90425816bf1887e802407cf019b9a3d24d1dd24eb020c606929a4d
 MISC metadata.xml 338 BLAKE2B 6a200e9f8a3f4c11774a587a5b742e8acb4ae7651694adc7d27240aa86a8b38613598cdee1d38bbc9b5aaa4819c702aac8e638b1cf9650619f3b5bfeb7278a7e SHA512 6af21bcb48be71d72486aa079919f8fc18c54442b65598fc8500ff3fbbf0fd49f1d3d51b86ccaab4f625fba5ac07ebb44c69fa2d7e64a4821983d0eae49f53c1
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..98196abf825f
--- /dev/null
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x64-macos"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.0.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.0.ebuild
deleted file mode 100644
index 0dfad7c4bc70..000000000000
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
-HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
new file mode 100644
index 000000000000..12d543825ac3
--- /dev/null
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
+HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~x64-macos"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index e2e7cd7b7086..26d579add889 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,6 @@
 AUX json-1.8.6-heap-exposure.patch 2937 BLAKE2B 204f4c5a16df8fa99ea46e7d29c4a7e8790da9c11ff1dddfeba47b73a3bbf3e06a9243a48fa1d95fc029d21a1031e689b16a91295a1601d4e62a4c18cee2bb3b SHA512 42545c069c8c36b120b63e74b8276b8a6b57237e6cd8ccdeb0e6e9b9acd4f9213e5a4fc35b2f804300e8d00a12546c51b9ef944bde60d679567544de796c87e1
-DIST json-1.8.2.gem 152064 BLAKE2B 5d819cf6ca1811ff6b7cb171ecda005192c9c06955641251f4066436e9746071d04ac37dedb7b3f7938d3c910d5d894f040388b8887b2d08918b344673d1624f SHA512 5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1
 DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
 DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
-EBUILD json-1.8.2-r1.ebuild 2076 BLAKE2B 6b63ce42432a9285009398545c473ee71c1eefc67c2ed799c2a6eafa6423dc2ec66cba5514511c02cb3b1681423bbee9e17dfb632f493c349a5811f8ce87955d SHA512 99ce2593c742309f7b9d2d984f53eb6d71c6743fe59571e42a173a62040455ff8a46d5a2169a49784a40e8bfd3cf8b54d190281821c35fd6ba81b87640b3c0f3
 EBUILD json-1.8.6-r1.ebuild 2110 BLAKE2B 941953d1fcdcf4e5e289086cd019f4d99441563a396a944d67a64237d6b998fde4e120f40ee9061956813707bfa9639f0ab6439aac105676d74cf8a86c88bf18 SHA512 f2d5fb012fa39868622bc7e69e20b6ef4012abee3a2a690621e0f8995a644d6660f6c28ba0bcf3a3081fde8485dce78e3488ef381b6b8747e5c20df0986eb2d2
 EBUILD json-2.1.0.ebuild 2063 BLAKE2B a6858ead286219160db9a7f1ffb8ee078b3c2ab80bccbc4e79f8eb9e3d00e042813a3a99967b4ceaba58ba17bcef96fcb6f18014368b664656f7cca64b3a3c4d SHA512 02b679b5c90009dba80a4ee57ae1076ce8784c4b3a39ed5252555201f97522eed853c4756c6c06f8a8cdfd537b06d138f5bd06eaf56264fe65a599171fee5c02
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-1.8.2-r1.ebuild b/dev-ruby/json/json-1.8.2-r1.ebuild
deleted file mode 100644
index e15a6827e7db..000000000000
--- a/dev-ruby/json/json-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="|| ( Ruby GPL-2 )"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e 's| => :compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-}
-
-each_ruby_compile() {
-	# Since 1.5.0 a Java extension is provided but it does not compile.
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	JSON=pure \
-	${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		JSON=ext \
-		${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "ext ruby tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-	fi
-}
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index db6764c0b14f..8765c54adaf7 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,5 +1,5 @@
 DIST locale-2.1.0-git.tgz 99139 BLAKE2B d45adbc07795fb045e13ea62493c97b7b635093e61e7ca807bd5a63720a8ecef57cfc522fe9d5fd2d6cd8bc5c02aaccfc509bf191f0f9d7e8d0fbd70fdc84557 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb
 DIST locale-2.1.2-git.tgz 99433 BLAKE2B b735d913e4a2f1f09131eb9aabc17cee93cd4b28f10458928942a3edd159cd1cde71226d4ad9aa9e340f5df5ba52a298805d1a4e73cb8dbc83d00bcecb7ceb85 SHA512 62a0c60f2102cd2d144126985748f4ab186b8f582c9597f7f4080e782196a39d72b9947b90aaecf5b208ccad0175064ac90e816472fb374d19cb5209da0f7ff4
 EBUILD locale-2.1.0-r2.ebuild 1087 BLAKE2B b3a834d32116c0f5353add347abea7f59e9322effe414fb9f299f25ca67f867cb7a61e3ac060177f0063dce02eed20b7e29573f4df7dd6cce55af30afa97c870 SHA512 c23d691a26387359a82fc617a1a6e9824e3693e20f292096988b5869512bf54e7afef3f5a54c3ba3e97caf27b640501d7440857eb603a959b8736ddd8428458e
-EBUILD locale-2.1.2-r1.ebuild 1103 BLAKE2B d26661b6aa8eefe2082a2a372d26887f4d7a173bfa5b5f51b025fe1030c308d81d5d123682f690b4c03d6844193b1cf63cea0737a63b5178f979843c9286935c SHA512 35f44701b6ac3827b2d8ba31383ab2a02a42cae8cce2ed81d551ae22665a13724b53742b993a2594a195d0627722d522fb0e7aeb0e3d0285e41a38a90686d2a3
+EBUILD locale-2.1.2-r1.ebuild 1102 BLAKE2B 43ee224833d4e6614d4406f55e8b73e0bd5e0d172430c8c4a9988473b1b798bfa78a2bcd03fcab4d92b13945134046ed5f3c8533f38a4bb0fb090dd1648e1652 SHA512 903171405607a77b48e20c6606137163c499fd232f9a41d0f6ce8f447b8f6e5101aa8c38afd190fd63e7fdd2d6954bef5a58bfb96d22b6d5a4e808fd1bb79225
 MISC metadata.xml 345 BLAKE2B c2f8101d9e2cd59540e4e95827ac5fa503b0f76bec78ba5a73031b3b966ed1e3153a05aadad5dd563db931881ff3597d1cfb74e113eba53470da11de29eaa809 SHA512 1da3655a6dd1df21971ff6ef41e3fce230f17379bb936ca8a03d1fec427a6904fec717884fd4551d23a493fcec85beb1a9107907c01faadb63b02db8efa0d5af
diff --git a/dev-ruby/locale/locale-2.1.2-r1.ebuild b/dev-ruby/locale/locale-2.1.2-r1.ebuild
index 2a05ea204dc3..a9a7970b1b6c 100644
--- a/dev-ruby/locale/locale-2.1.2-r1.ebuild
+++ b/dev-ruby/locale/locale-2.1.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index fb79f2f166f1..63f7a2c5a409 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,6 +1,3 @@
-DIST mechanize-2.7.3.gem 133120 BLAKE2B 163b9e03d40f774bffe16459f027202f18d3b2c974ce7c0bc527021177ca47c38bfe25d87fe0b862ec85e73fdf6e39ce8ff3392f4f7ba557fedcf3c4e63cfe2c SHA512 5a06f1e7a1c97f985f3011358061c631bcc69e3092082959f738670c9491f734bc6dbbca321018fa484ee493f2f251b8af0cf17602fe381d491ff3e18663f2eb
 DIST mechanize-2.7.5.gem 137216 BLAKE2B 696b0fbb84b8f25e3d52d9d9f20267d53a4294e15ed64f6cefc87dd6d2a279c6f3c7608bfdbdbfbe6fc188cb16b06e219067c97838db4249f233ae12f047b9b8 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92
-EBUILD mechanize-2.7.3-r1.ebuild 963 BLAKE2B dd38b5100ace47096fe46413e843a749f4299daf5c3fe0280b9e5e0d0454202d39e43f2c4282c76fc8bf975a054b337295456fcbc18cd2deb0aac02547917158 SHA512 e58b0a49e0876f2ca06257dc6ee6a4721d3b83aeedff0290b659e2bb5634112a73187a3d5c0c251e1f0360a738839d6c894f38178ee8fc47f17a3f17c64fc997
-EBUILD mechanize-2.7.5-r2.ebuild 956 BLAKE2B 1ea0ad0e0e3eb15c0a5a83673823555b76fed02bd93ae398cce7914559f85e7d4fd992c9df3b97554150f85b6306433c1d4443e8ecdf1709fec658da354f54e1 SHA512 a9763542089b7000d37d38b1efd4012e64f4d0939ef37bf7f05d6b7730b91e2c8e843603228d346f7bcbca4277cc0f542809036ebf2048e5a500c832adb75bb5
-EBUILD mechanize-2.7.5.ebuild 963 BLAKE2B 00616fac39bfdd4426944e93d3e6c0806c8357856fa58a67d02d6575a1c8bf17d0892c0b8df42f0c1bc0a842a10a31f02c3adc8e0d99e0010bc42dfc25245f70 SHA512 c2b27d38c499616a3b44599f088936975f804cf49bad87f3087d88de922451e7f887e8b24d0831674e317dd5db265fbee6aa596a73fcc94a5775f31c68c0b097
+EBUILD mechanize-2.7.5-r2.ebuild 955 BLAKE2B f1f80baa609ce3038103c528da7cb084707c7f55573102538195bffc00f1987e24a573b9f9f65a349c81cab9f81cf76dfabdc96b155d79e03d12505c959b9a68 SHA512 8447d414b6689ac54445071bf07a6542bfc7cd8109670c1633af8c8d058e649e3badf992e03dd56e74cea042e03359a4e1e95c1cef3b71950b77e0e4de96610d
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild b/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
deleted file mode 100644
index bda76ad11ed5..000000000000
--- a/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4-r1
-	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
-	>=dev-ruby/ntlm-http-0.1.1
-	>=dev-ruby/webrobots-0.0.9
-	>=dev-ruby/http-cookie-1.0.2
-	>=dev-ruby/mime-types-2.0
-	>=dev-ruby/domain_name-0.5.1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild b/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
index de8b57ba64ab..e6dd626b63f0 100644
--- a/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.5-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=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/sparklemotion/mechanize"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.7
diff --git a/dev-ruby/mechanize/mechanize-2.7.5.ebuild b/dev-ruby/mechanize/mechanize-2.7.5.ebuild
deleted file mode 100644
index 4ebf8a556ca0..000000000000
--- a/dev-ruby/mechanize/mechanize-2.7.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
-	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
-	>=dev-ruby/ntlm-http-0.1.1
-	>=dev-ruby/webrobots-0.0.9
-	>=dev-ruby/http-cookie-1.0.2
-	>=dev-ruby/mime-types-1.17.2:*
-	>=dev-ruby/domain_name-0.5.1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 804134cb87c2..6f7e28e8b6d8 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -3,10 +3,9 @@ DIST mime-types-2.6.2.gem 190976 BLAKE2B 985ed336dd20e1dfe8603ef8e8ae1868c605ff9
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.0.gem 44032 BLAKE2B 68629be95467584e68bf265f48781d4c22de003c323fcbe80b423822aea6a76f50b675f2394f60ec0b39d76dafab9b67ba56471c6291d66176931a4e012b3d4f SHA512 762ad862714f31cf68c9f872f23efc9c85ab0ab4f451553dd4a7ec30ac5bfce804037a413ae05bad253f4a4f82ba6578e3f3e87aa11b5e525d3f237fdf547850
 DIST mime-types-3.1.gem 42496 BLAKE2B a586c6264e46fd45c5fa7bf79b8ca79e086d4ed23c0bfafb0c38f508b638df886b8b4e43d975955579fa24f19de6c90b16d1f0395a80f676b4c153e4431accd9 SHA512 1923ff7032aabbf83569497e0016ea0ff183a13751b0ba0a5b09a132e7c18154bbb19e7d3877adc2e1d21cdff612713201a465f954309794fa1d9b330975a112
-EBUILD mime-types-1.25.1.ebuild 923 BLAKE2B e93c47526f55fbced7f1f9f4089c023506ac78e59a2def4b2556af3bcf858afa515b19ef62bcc1ed66d495ca87ac91a420818d59a66dce4690b749c62ebd0775 SHA512 4e4d8b669caa5560ff15c6d8150583802d2842e79fe0d652971a9dcf37b7894ae05abdd22152ef5fa0608b28cfaeee5af4ff91e6861b3f3b606ad72701de5479
+EBUILD mime-types-1.25.1.ebuild 930 BLAKE2B 89306f2bc2bdc4acfa22985d105956a9cc446cd49f8ef3efcc8d6df307958e5e6dbd27192fd914799adecef52003c8dda784025a454a0b7c2b8e7ec994bf7aaa SHA512 38aef1f501418bce5c169ddc81c669bae21359c458e1c78d61a669c25d4fdeedb032631733191721b8b93a0b5f887f695d3e8c243f867d95af9a241d9f7c08cc
 EBUILD mime-types-2.6.2.ebuild 946 BLAKE2B 2988ff13f6e1c1e9d65cc6b1bb6d69d4db1bc5028e384445285bdedbbb7c7f035387f9bfa5e0902eb8eddc15d5895e9a64076c565a679b2e465d305b4bd02b15 SHA512 30885a365989359975affc1985f1bb0eca60640e7e7bad9a4ef8192e412ad8fa6894f37604ab42a082accd73ddab740cb8f66bde27eed5ff1622db37d0f6cf7e
 EBUILD mime-types-2.99.2.ebuild 987 BLAKE2B 1c2f734ef41404c9c92067ce614915f462f30766fee3544915d6fd661aa724df56198902fa3452100250d0b132aa9d0bf4d614a7f83711d679f0fd313af1dcec SHA512 0239e618bfd9f264d42817e3607ccd441775fd329f6ca229988c3276aaf6b75d3210d838e820ec83089c494613b24ec9d76e25339121df6f65bfca84db23db18
-EBUILD mime-types-3.0-r1.ebuild 964 BLAKE2B ebbedf055c2eaf4154d99b47bde52a50265fe4db579ead0d820822816195f2da173b2496d7f5f14b737faa359c6f3b72ec9b8df4180b937570382af178682a04 SHA512 b481a12187d21275a9868d75f7ff6e61f912d0a6b35da911699005d435a024a3278adb1c3a5b7fd235354b92e14268144c5bbfb10d5702614408c10bc33a22bf
 EBUILD mime-types-3.0.ebuild 905 BLAKE2B 3925f33cac886ee367e84983fe769ace8764ce516c771e48240dd6abdd5cb83fdb3354ea71b30a0104ca7133822b51919af5ef5041db21f4845dfb3a44321c38 SHA512 c203c79f414e871a057356d94a6f28d0bb557959f0c4bfea721a079d1444d6f4876f37bf8dae2a55f368c5808d4dc6cb2723def874638c93a265e71892e5640f
 EBUILD mime-types-3.1.ebuild 908 BLAKE2B 1015467053edf70801e75aa4ce9cb6a32f08766d4ebc6a91f07c39ce3dc01d2332fc4aae7ce1633e3f105da8c678a3265e844ae972236a3a0ecc2e304f7a41f1 SHA512 36198382535a550d994d4ebfb9812f6934c1148365bd311cba909043376b8c8c02ebffddd92fcdb84a654c204ceab44ab2687f29d011ff468881b926e9749be4
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index 199fdd466ab3..e6db30968360 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
@@ -1,9 +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
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/mime-types/mime-types-3.0-r1.ebuild b/dev-ruby/mime-types/mime-types-3.0-r1.ebuild
deleted file mode 100644
index ddf3a4c8152d..000000000000
--- a/dev-ruby/mime-types/mime-types-3.0-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=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 )"
-
-ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
-
-all_ruby_prepare() {
-	# Avoid unneeded developer-only dependencies.
-	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
-		-e 's:fivemat/::' test/minitest_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index f96dfa4c740b..ceedd80b1e95 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,7 +5,6 @@ DIST minitest-5.11.1.gem 79360 BLAKE2B 97066b398d04a840327bbcc0cfdf71d7945450f97
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
-EBUILD minitest-4.7.5-r1.ebuild 755 BLAKE2B 8bbc1e959aaa032aa41c151bf19a294229421d3e0f3ff8491411f65c4a0bbea3be5d0e925277fd70c797865795cb58feca6ae2a9828e3384220d6dec88fb6fb1 SHA512 3af943e583afb74c7006994e2e93f5386b1b0f3d16c66489f28f9580694e28b0b59d7af5829135460552ab38b7483286688602a695cb8125496f4b3510df114c
 EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17cabf18960356ac67986def2416f774f8a7f5f7b44ef7c2d9dc1c293fc5a2f6412e36c9ae507466dc4881dc8f04df1 SHA512 76b836e2e763bc224add765ece794d0c23f986c2b136fd3d762f5165134518a213f2f7477031be6f03e349bfaa329f38ad5e6700bb453f3ba3e5e95c1caf7a82
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B ba232bd0de4eecddba4e56dd4254a594e379f8cae03fa9f503665d898cc2ee395ea75dfd69ae45c41439bfee275b883e0160b71cba71702b8282384c2245ad36 SHA512 e61c3fc6f57eadaa35bd70dd8539f6445a66867d129ef960c77a6a4c996c57f81c861aa9b93afa447a9fd0c0446104d795bddbd4a18c95a73fcde552d9f9bbd9
diff --git a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild
deleted file mode 100644
index e93ccde1f786..000000000000
--- a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:bin:test:. -S testrb-2 test || die
-}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 06f9776e934a..c0b0c920fc49 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -4,16 +4,12 @@ DIST mocha-0.12.10.gem 77312 BLAKE2B b71ddfa79149d33d7a5c21655e2bbd7b80aa1296c08
 DIST mocha-0.13.3.gem 82432 BLAKE2B e5d8f495db5df3b51b2be9d294f2c9354de979d2547e1cb1d6e70cda4a36b0170cd934b3e17e8d3fa38d4a380a12ccdb49ddf2d34662dc0dc8029faae4463d8c SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
-DIST mocha-1.2.0.gem 90112 BLAKE2B afbf191380cb36b84dca7ceb9b1d638112797f64d9a8c03421123b5804313f322f542e94fc46b2057eb7ed87ae8dd9a974a27d0858e843449129bea24e39f895 SHA512 cedbbafb095ebc54b74cdb848d11acddaf44333c6f844282fc217906c551f1ec7f0d33bc881e1c410e59917bcfc0b2b7d15d8c549d56ef9c6663907d0d7c0a87
-DIST mocha-1.2.1.gem 90624 BLAKE2B 6c543c2e0d2f86cc6d4353308871486ad7a4e288e43d5c0c9f66159b021281ce964070a6857b3859729f3a3c367b79baeba542ec7d07a499884c5b03e2bd0a24 SHA512 318fc7275b7ef14b6839ce68beb4a6dcd2a06325bcc5e69d82bd6842dc39c78b8a09d6d06d36dbf0f43e59bbcf441be9a6b1d3037f0cbde25be9d04ae44b2aed
 DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
-EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B 87c937da8dce9992d985727e3640ba5fae32fd5011c605f40c2cb4383653156d68a02c7b0980603265db84386a0007a1c2f543fa052e4f11cdbb932824fce6a5 SHA512 96a13c3e12a67666ed519a8371c0fd93fb4ed42c492e066de3664351bc730df5c8aebb94c157d666c039a9c01976f5ccc4840101324a0128c1f5a6dec789c158
-EBUILD mocha-0.11.4-r1.ebuild 1102 BLAKE2B be117388abc6d74944b1308649feb1559f5efa16ff51f81973cb9a7991fb3d4ff0c61d8730ef6a584102bfe6fb7ac8e3adaa2458e8fea91adfcfaad32e249d70 SHA512 df891065ba65d4949305b4fcbc017f48728569a15375aa8d073e70369f7f596710ac0fb67513e78d3be86cc33b9645deeb8bc99461bce8c238af2585c040a247
+EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
+EBUILD mocha-0.11.4-r1.ebuild 1104 BLAKE2B 56408bd162417ec1ddca77d6c16ab99be2ef67337bfa0e0e268e1e7874c23a565b8526a6ba83c06e631902e0fb61de7b6bdefdd19ed646d9d4b63d82b0779e1a SHA512 8239c9d49d50a3a9636c215099dc3917db1eccd7cef08c96a7a34352cf2885ae78652dbe30928dd6d393cb831d9312c88a959ca8b982421eaa237d9dc66d274e
 EBUILD mocha-0.12.10-r1.ebuild 1150 BLAKE2B d24d4aa4b07c2aa432c609b9d94939c26ce8a551fb9698af0c91a7b9909c88d966770966eebb0a641626b2aa617f0ad4a2c2ac1d2b2d6396c87fff87b6cfb58b SHA512 a832c6e25857b6aea86be90bffeedd9ef22431a11d97185388428488196569a10a70c2085d545f55a50512120b64edfaf3b66b6c8eb125beeb5ba8678a30d3b0
 EBUILD mocha-0.13.3-r2.ebuild 970 BLAKE2B 44c99d61d386231f1c5b1cf0bbcae7942d7c4a1d74ccb20ae3a4567430c2a4f7e9c7c974cdb59b83bb0a725676f6577e3da45bce054f02dafb0ee25b0e748d2c SHA512 da30332becf147dd12ab3939dad77185c9b650009404bd6e299e744a06a759bbba3ec70c9b2b88a35495e0bbd7143345647a874f3e069721f3ae99de71930a86
 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.2.0.ebuild 861 BLAKE2B 691cd0dacacde916d60069b7097f60dfab5d25e79d335eba1eadbc94b98dbc39f37f57f14f0450b72178b26c86ebeba8954085e19047b58116d190a3ebf5f7ef SHA512 0be815d7e7d31f89732cc995c98106a753e0b5421b573968c60ffd38261a58c762dd936cfdde63541b8f7169bfad7a53616a5cf53a9f4f0a0c32be153091c9d3
-EBUILD mocha-1.2.1.ebuild 868 BLAKE2B c04f1cb6204c30149ddf48e1b66adb55ab00fd8be2c37dbf9ef0adf19238f7e0aae11142bfae6db77a188b10279556c4288f7217fc5959a87e7daa5811be8bec SHA512 3c152d838a7faeb2aa722eb0bdcb34e7141fbc4eb681b4edee722a8efcc940e49a6b0f0dc7dc1f716c5633b95cf628e89c3b5f3f123350cd5bcb594ee4a25790
 EBUILD mocha-1.3.0.ebuild 861 BLAKE2B 087b553954eae1c73a77ddd5fb50d96951e58a42ac35f5c76de92606f49253eb64aaba9822709402501f7f88d0a1d5498a60033e81bb14fcb3750712ffc35ae7 SHA512 f06e0d7a05935b6605b4e2a9916b684d0fbe12e25b73d6042fc8185a870f07982f8f0088fc0fc17cdeff9aa73e00d9044f95c721f3de1d453193c8eb628524c0
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
index ad0f32c8ab58..1c5367b78581 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
index 7c9fe8d25c01..8b18f1331b27 100644
--- a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
@@ -37,7 +37,7 @@ all_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/unit/* || die
+	${RUBY} -Ilib -S testrb-2 test/unit/* || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/mocha/mocha-1.2.0.ebuild b/dev-ruby/mocha/mocha-1.2.0.ebuild
deleted file mode 100644
index 49b6731baf92..000000000000
--- a/dev-ruby/mocha/mocha-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_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 ~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/mocha/mocha-1.2.1.ebuild b/dev-ruby/mocha/mocha-1.2.1.ebuild
deleted file mode 100644
index cb3828914f50..000000000000
--- a/dev-ruby/mocha/mocha-1.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="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/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index d5b35624929e..7008b4c0ff6f 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,9 @@
 DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
 DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
 DIST multi_json-1.13.0.tar.gz 25954 BLAKE2B 22a2f2ff2f1291a45613f456661a1735fc41ad80f28ee7d2c9b97109f0637da4e60439686cfc29b7ced501c32d2fe9236c9acc25acc0f55e57ec0bfe53331f37 SHA512 b168b2a093865f48f1a4d1941e8cfead8b3efba73bcd59660dae581a77ab7149f0f452f1280e69061187f35c84b6eeff70144f815f9f669db03dba49100143aa
+DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
 EBUILD multi_json-1.12.1.ebuild 1926 BLAKE2B f392a89f6f23033080a4ec1fa22b638f41a44f00638a0ccf1fbe34dc70150082b0e3eaa5b926df620efd7676bab3f31fd197ea0f99496cddc918d93ef4abada3 SHA512 9cc52c4e92ef2c398bc05ae8dd53ba440dd3713b3713972bb44ae6aa5881e13b7b79a382b16abf64e75da531f35871b0a98ae8470fab1e9b6b4cdc7c6c3442d3
 EBUILD multi_json-1.12.2.ebuild 1922 BLAKE2B 338cbc039830d46a7cebb61b82ee7fcce1b6722a7de17a9cff0ff1372c12c7157d01bf0c8b1fe05cf81d2f5a4b51aaecaf807ee6563b84ce31e843963e78c992 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc
 EBUILD multi_json-1.13.0.ebuild 1922 BLAKE2B c909ef211d008b8f12d400319e89674f79cc556d4f3aeea0d5b76c7c43ec671f2a4e6e48fd3f1861f7c157668778a86cbdf151f77bdf64392f0be4a859aa0695 SHA512 170aa5bb583feeef39ca4600bdfba839e7b640a4ac376de56e42641eec72650b536ccc16a1fc8065c843ffaddf2b1655bac68608804abc669f5b67be7146c39c
+EBUILD multi_json-1.13.1.ebuild 1929 BLAKE2B b68b75b0af496028c629a650422714877a3b8fb15866c00472e1b450752c51a67136cebd2baa019dea4012abc58498502f8a3293d7b1b7fe0a3e6a07d5caf8fe SHA512 e7b31df3ac6a0e7c9794dc9eb143f6ed7148301f8d26b53497403de21cabe9e6de52175d4ceb346d5e8f739b4158b35be73d809e44dc9dba3e586c7188265fdf
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
new file mode 100644
index 000000000000..c6f124cf97f5
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 9602349cb06a..fc33b56a0e41 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,7 +1,5 @@
-DIST multi_xml-0.5.4.gem 20992 BLAKE2B 2ed4fd154a44ff7717e702c03d29ab06cd688d6950861bd02b6f57a1b78daae94ab6b3c6d30f15cfa9f6516758a29df5d35d1b31427188378203e7c0ea8e0b76 SHA512 d78ae3c401741c4d396bed6074efd24e8712cd70d9b9ef7008abb3ff662edc2292be42dfbd101be384aaf2ce207271004eb7b7cadccba746b9afe385a9fbdb7a
 DIST multi_xml-0.5.5.gem 20992 BLAKE2B 8dbd35ca1cf2209850e2c694c435e7bddfc204a15663091d005c6f45faf85c91e8331b2b1fc37ead4f28732a5f73d878c50f13ec7d4681c3ac598a230d4f34b2 SHA512 692f55908ec5e9ee27bec858325ff9a0b15037a6563d5a21bd742ec3c959f3dbc04f1a232782f20827c9af49f3dd14fd725a0c19dbacb3708067c19dedf427ba
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
-EBUILD multi_xml-0.5.4-r2.ebuild 702 BLAKE2B 75d7cc40c71f5a779bfbd7ab7c97237d051be17cdc3a0b76c6f6b504a3743670f0a24ddaecafc7854f5b89d90347b0a4408ee43a9fd282dbe01dbb6e3998502a SHA512 6780f4a6962474000b3e05f9bc69e6031f060f89bb97789dc53216cc1f13ebfe7d02d861e8644585d1126e673a6282d12724fce45bdb7dc927813ca68829d356
 EBUILD multi_xml-0.5.5.ebuild 745 BLAKE2B f55d89d13c5b497f3b6e62bd89b2eb62afac93cb19331dac7eeacd434a6103738b2d859b8c73e8541b41b9cc52b1ef25c4d710f42e9265529ce2544b48654ffc SHA512 5631174dfc19f5e492752bdc8dd63ab5ed8e624a49074072c2ef07a4aa7a49f3b59f9768013a129c17fb7636c270e948fb4f4a82f627ff5955ee00f30cd6f31d
 EBUILD multi_xml-0.6.0.ebuild 887 BLAKE2B 6f1d208c684cb16d2e5a973a85c33e22702cead0d56cd0d05b730bc652213e0d859eb1d98d1098d024bc6eb53800152553ea9a93cd3d9b26cac517e624b714a9 SHA512 73fa7f1d63a050b60de4ea41178147a68dd7c802437de2f1ec304fed45f3f3ad7b9767300fb739db994233375bd19f2538f8d42d4bc4b132cb003c7b394ca1c9
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild
deleted file mode 100644
index 1effd90c7a2e..000000000000
--- a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="doc:yard"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generic swappable back-end for XML parsing"
-HOMEPAGE="http://rdoc.info/gems/multi_xml"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index eeb7ef0c1a5c..a61872dddef6 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,5 +1,5 @@
 DIST narray-0.6.1.1.tar.gz 68536 BLAKE2B 07aaa85ed719da6e5d78f1783e93bf5a46574e2fc8461a75f7a20aad56234c973ec3e5267888e94b505baab2401a210368f93bd003db2e57ac41d4ac5f54875f SHA512 1c9983d29c774cb61b7f8ec53290d427c123b648d88407ff4a2e2aef1a289267050d4846adfc00c075629cb228ed5b3d4f9f5ded4cded0b84ec1a5532cbb49ff
 DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
 EBUILD narray-0.6.1.1.ebuild 1311 BLAKE2B dee780e2aab194ad6f7275a5422a9219b76d2f97fb5a74fe2fd5360372da2f1074b9dab7b883017d6cb7c13b27c301d3f835f274da8fb8b409cd889a2561eee7 SHA512 6cf6b52fa5bede49559f0348e85f8da12a3140cf9c75b4ccf6f21cf82169ea8b51135d2f6cf06896434a3b20a676d93e72525c16091c43ef4ba96386a8fce7de
-EBUILD narray-0.6.1.2.ebuild 1293 BLAKE2B 24cd036d3d5a95eb3b6e16f5391a2a0b3450ac1812a86a748e1ba788811d73d4d8546e9ae97a88151a71e80cc2eda16e95c797b45ccff64585a757c2a045a1de SHA512 77d6551f965b8b7d888edfa60f9d7182b90363d86533b342c2703036061491cc1800814d923b7b5cc59254440d38bb71c1da1493c917f2e66e4851f54bb5f5db
+EBUILD narray-0.6.1.2.ebuild 1293 BLAKE2B 89792d4a2b34f00fa7ea5d5ced4d44afb10ada44b182bd500a60161279cd4763023848c9e178b1c3937c8d8d189dfed406f9b2c9f84535aefd75ae0dcd818582 SHA512 fd3d2e44d70cfa0574e536b66102baf0f07507703a9fe4ace5ed22f3e68463b04f402724971899d00b29ca7a6e7dc73010d6d72354247fd70f7161932b247289
 MISC metadata.xml 339 BLAKE2B 9337a45d749879673fc180a12d5e7d27326fdfcf326f86ccc45fc2ad10b7eff1c4575c1379fb6b634f1482b7adb40531f78cc0b556148fdd622b9807e11122b6 SHA512 47c9372c3fa2a28f5d728cd9d3df7b030c2e0bb2378099c287018cd55324a188eb2ef8c901b52acfd87d278c4990752a4860a7281e062f4209bf92c10bdc36e2
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index af3971c34406..c0ed314c4f5f 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.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_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index 4de5b4dec909..dae64dcb9d6b 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,3 @@
 DIST net-telnet-0.1.1.tar.gz 12794 BLAKE2B 5a82e62e47cb9153b17dd6042c7e5c767ae3a9cbe0739ad769aab2fe798c7766819b89bc325f148791ce37a55ae267eb5854142d2fcb7d387fd29c32e118c169 SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d
-EBUILD net-telnet-0.1.1-r1.ebuild 904 BLAKE2B dda59f10c0d8413e42c8f9373b1809aaae34d49c0931620516b59c85726ed3b72854ba78bc9f6d289cf722f5387cb4884e31cf592ae8d3b596a83dbee7a1d841 SHA512 ee493e32909f2bd2637efc14ef698eaff3f66da959b28d389e4ae4ea9969950010c99f5838197b3d0ae47d6f5e2afe1bfadcaf4f671932508bb5bc8ca743f279
+EBUILD net-telnet-0.1.1-r1.ebuild 902 BLAKE2B 7c440fec89762571aaf7d327c3306e877a58e65bd618095a46fb096fd48b7aee3b51792e886af886c5cf494a1f343613f4008d59f2b21356cd3ee0d824a28c4b SHA512 0aa24ba88d89dfa17a5e6a4b11da03588928e45089f3cbeef29c7d88bcb9841bcf16e1789d16769760612c1a9e758a5585d6a7e70dde4067572ca67edd785b8e
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 4af31427d5c4..202fdb700089 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index 7afca3fd2ca8..1ee808b769ca 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,5 +1,5 @@
 DIST parallel-1.12.0.tar.gz 20472 BLAKE2B b6e998588f94e07194c19d4bf38964aa5e846b7f62c7a267041473a237a9d8fdebb4dc501695b00902c852021ce7817b24bfe01dcf4c0e18445b46d46c7cb42b SHA512 8ca41cf577ee4743ef50abe693d0040eaab12b61eca17c3d6c33d3720c38563e2df9a0eb5af0fe9d8c34c3b910f1c626ce141fd2eb7d2edfbe5abbcb9f54191b
 DIST parallel-1.12.1.tar.gz 20499 BLAKE2B f0fa25b9fe65e44804854f703dd2d80e53572e64c2072c418d0462922bd04f89cff0e023caf4293d8a1504ad66a2a29ebbdd01920fc6fe400837859da0f0eb78 SHA512 f0ab332dfa60bb3190bba8275dbdf7b54d3de205ab76099d11f0a64e1fc28e1ba7e72d1a242bd615015c2d09a3f08df01c382869fd6990b854b01fe182245857
 EBUILD parallel-1.12.0.ebuild 1703 BLAKE2B ba3bce20cf9bf46583d7f86a96672e7634d2b41db785589b8048dd56452ff6b3f1b215638a3d189d677b9e597278ca5462b907179650ec49005f5d5345b16ac4 SHA512 da3a7ed5449817d475ab381949bf8e55d32abe4b319a0000960c3cdc38b5c62f909dc40c9a8ff8b18b75072429fb9da1c48754779c565f13aaafafac9ce9179d
-EBUILD parallel-1.12.1.ebuild 1719 BLAKE2B 623bca5065f52cf4cacaff1826493d2edbe268b9f540e4d877941843f05a237a0a9c37fa4e8ef729fcd714c7d76a042aecebf17647d97010cda40496e3384758 SHA512 6973d3bef49c096ee20093fb7e3860c72c319e02480dbeb4dd528336b751ecac2fc7688210a856558c94daa6b510f622335d8e918955f930dbb98a98deb80030
+EBUILD parallel-1.12.1.ebuild 1704 BLAKE2B 8b686ca1ce60df0b706f20e425b27693b8c1b93b0065bcbc4eb580e0527f35d9b6a9ce981d4ecf3a8a9f1c23e1200b5758ee9a817f66529780b8cc7b15615677 SHA512 c8496b23a1c7a6945d82eaf9e85cec0f36bf95c8e9d4b7f1178dae58f24e9d8046288b11cc9182fb8331a0caaa5fa812dfd91be5c907dbf3d4af507bcf168e01
 MISC metadata.xml 342 BLAKE2B 0860273d70423cb92207369335e1f684ea623e1217d7aaf4d016d9aff9c02b0b8dc9af3654b523f77cbd8d92f7043887a97ff87abb79d3c65b66b0e6b40082fb SHA512 805eaecfea071b1d632ade7da42ed63717d2f829c4c99e29a4600b26a81e87c4032d7ee441b865d86f37faa13f455c9f2888dc8099178cf6211ae13d3e3e1835
diff --git a/dev-ruby/parallel/parallel-1.12.1.ebuild b/dev-ruby/parallel/parallel-1.12.1.ebuild
index 1bd63afc39f0..db82a8f90f7a 100644
--- a/dev-ruby/parallel/parallel-1.12.1.ebuild
+++ b/dev-ruby/parallel/parallel-1.12.1.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
 
-# ruby24: fails specs
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index dffa2a7f2f27..a74970c5c092 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,5 +1,3 @@
 DIST patron-0.10.0.gem 59904 BLAKE2B f4ec8c81e4c0c13f3d3b5e0696955c01c8ff962980a8ed83ca7aaca722c422b0466a806af9b2c36f0183c16767f5b3f37dae4ae4a8801866592c8f861ba9778d SHA512 bfe5fabbcbfa3d1c73ef6f79d100547de7e4121bcbd1f427423a127f0bc698bb8b6ade06c0e2eb1f529d1524e95fc36245b8be9d6e2c12b7e8d18b5f03ae6606
-DIST patron-0.4.18.gem 35840 BLAKE2B a8018495aecbf5a158a3964147d6f12138d8288fe48a0162a15837a7e10e2b77bf7bbe91cb8b9b25f790ff15f3153647104e47afd4f33fd5c7b7277ed306b118 SHA512 0069f42378b0dfe03e6f86003b7927b099fd15be4d4b5eeba51958774380bf7a9ddbd8a83b30942d02e95b923f9ae0a1c1abf5bcda8ca8490671208e0ae8ecb4
-EBUILD patron-0.10.0.ebuild 1194 BLAKE2B 9c29851e6ff707c142500e3ca45472a8815e3eccea2529d3be08b065b7891ed5519918691618998f0bb76868a769f59eae937a71f31b7d8cf2edabdf067e8e17 SHA512 1f80c2d91e9af59a23610d34aebfa00509ea4dc20d451785b50450ae398985fecbbe35e467bd1ea447b5dcadfd8419b5ad8832e5be1a153097b4cd1448a37f48
-EBUILD patron-0.4.18-r2.ebuild 1014 BLAKE2B 7baf6a25d0c627b3fbbd3c29f0a752142480c5b4701a42e42e696e21cc6e083adfe94fe7e7ecce9d8c27ca97f7f3d7304cdf0547c2b6d21b4e62082382f8333d SHA512 75c6f465de351589c89bfc0df0b702fa4a3c1d8b305500b2e2c55dabcfe9738d8a55e28a07b6b6044082eb7ae91af17ec2ffd77c66d645583c325d8b7c816b9c
+EBUILD patron-0.10.0.ebuild 1193 BLAKE2B a18a6cef196b85099e550f6dbd7f572b18439c3a40e849827827557c4cc6f0428dc539ed51bdccc6c0501a2bef1233921e4262b307d53288407c72b4f209d899 SHA512 8f1e79bc3256b5383233956a8584f363ee84f619ca3d5d2dc0bb303e7655e5075744681e56f0f6ad57eea87b71cb4e98a2b6b397095b30ed874bf06388b30b21
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.10.0.ebuild b/dev-ruby/patron/patron-0.10.0.ebuild
index bc6943546a3d..4e7e3ff39b0e 100644
--- a/dev-ruby/patron/patron-0.10.0.ebuild
+++ b/dev-ruby/patron/patron-0.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/patron/patron-0.4.18-r2.ebuild b/dev-ruby/patron/patron-0.4.18-r2.ebuild
deleted file mode 100644
index 7657ca907a8e..000000000000
--- a/dev-ruby/patron/patron-0.4.18-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_EXTRADOC="README.txt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
-HOMEPAGE="https://toland.github.com/patron/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-#ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
-
-DEPEND+=" net-misc/curl"
-RDEPEND+=" net-misc/curl"
-
-# Tests require a live web service that is not included in the distribution.
-RESTRICT="test"
-
-all_ruby_prepare() {
-	# Fix rake deprecation
-	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/patron extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/patron V=1
-	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
-}
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index 81d2224fe03a..ec18b8a318e3 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,7 +1,5 @@
 DIST pcaprub-0.11.3.gem 32768 BLAKE2B 88ed94a8f767e25374fd1692007d5d2c3cee00bbcf12a911a7039ec60e8281c8329a02ac3fb8d5df03a1d9993e42b580fdcf59b8ce2e2220d981bf4afbb4940d SHA512 0ac8b5b2be85a2e17dd9f253ae3705a9faca390cefbaeae737ba20a23a3e2d95a6d492d5f7b3ecac611361a264db43cc79fddfbab58056e7de8e075fb1d1ef4f
-DIST pcaprub-0.12.1.gem 36352 BLAKE2B 259bd2c30595ea18d958e1939105148b7248a985ff67cb23ecc85c9e3147c55c5bae00b15b4427b24c540e06b7628ca3ac0d937da4f7b7e2ea732c3377e3b139 SHA512 afbffd6453339cc5208ed81db120b3a32e449fb73cbeaba5dde4acebcc9be853e73c7331f49ba8a1e0165ccff4fdb7d21ece5ed834eea6871607d19ca46be0df
 DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
 EBUILD pcaprub-0.11.3-r2.ebuild 752 BLAKE2B 175ae572b62b16a592b689a11e20108b492de6cca4b5a818ce3e01e77cf2a4783e38f5cb7e3995ce0c8fa39886a0168fbaedf0317c2099fe110c9a3a23170281 SHA512 ed31780dfc4bcb81a50d5939d0ade5780cbc67beeeea6e1abd772b5ef13f4fa17158d95d11b9fa3cb2bab273678e33c4425f152d314b34c173e2791fc43a704b
-EBUILD pcaprub-0.12.1.ebuild 775 BLAKE2B 19463a21fcff811efbee8f0cf92962dab848628c2eb03b93336e222c313e99c872cd31c07ce1e0eb73acb12cbbb8b7a36bfa30d93d6d5ec61084abeae06f8347 SHA512 4e0d0c31dffadc549e8642a598d2df6c5423a53bb1d85a362111603f448b208b3dd685517cd7e0b8f2cf164d6077e05b145eff576299c0f623fab8dea099fe1c
-EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B 19463a21fcff811efbee8f0cf92962dab848628c2eb03b93336e222c313e99c872cd31c07ce1e0eb73acb12cbbb8b7a36bfa30d93d6d5ec61084abeae06f8347 SHA512 4e0d0c31dffadc549e8642a598d2df6c5423a53bb1d85a362111603f448b208b3dd685517cd7e0b8f2cf164d6077e05b145eff576299c0f623fab8dea099fe1c
+EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.1.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.1.ebuild
deleted file mode 100644
index b97d9f2ab252..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.12.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
-inherit multilib ruby-fakegem versionator
-
-DESCRIPTION="Libpcap bindings for ruby compat"
-HOMEPAGE="https://rubygems.org/gems/pcaprub"
-
-LICENSE="LGPL-2.1"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND+="net-libs/libpcap"
-RDEPEND+="net-libs/libpcap"
-
-# Tests require live access to a network device as root.
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext/pcaprub_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/pcaprub_c V=1
-	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
-}
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
index b97d9f2ab252..0583d22c61a2 100644
--- a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
+++ b/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
@@ -1,9 +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
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index 180d12b8b50a..5fa81e4b76b3 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,6 +1,3 @@
-DIST pdf-core-0.6.1.gem 43008 BLAKE2B 886026bc56e808768bdd9a3926902c110b4e037e5d0e83b8ab660d0058333090c5e80b47e266b45c2097cdb031da0d9da688ea6abdda6be0c80de4e88d4d805c SHA512 dc9074658cb4037fc1ab4f51a19bd67396c31ef18ac5c89e94563711eced8a7a6ec642e907564c92453cac08cd7a09f6da6f6da87536475cce8238cef087467a
 DIST pdf-core-0.7.0.tar.gz 43382 BLAKE2B 55116d0d997d5e76d94fab0be9bbea273bcd677fee951a71e3209bd764560c4f14fcd55ccb11748041582a12d4a06819a6203453f0e440718533a92287dfcad7 SHA512 c99409284e9f7f929902d88ff7943b3dc6b37c32d67ceaa15ad79e1f9a02b561af59889dae4344a1a7749edbb6705e06f6ca356f08ca38742a2623168d53d29d
-EBUILD pdf-core-0.6.1-r1.ebuild 640 BLAKE2B b7ba72d5d2f4706ed41c2911e8fdda08b5845f2e5e1368052d2b6c1596cdb92cf57970a4597b13229ec9d39cd8cf622d00c3b0ceb92898decddfe633836e6831 SHA512 51f0334367c29045a814d32a436584c2b999e732f0983b973ccd846b9241fab380d9530eea781091914be54d6ce2c565280777d30a420edf5e7cf18d312b3ee2
-EBUILD pdf-core-0.6.1.ebuild 655 BLAKE2B d954e4c325b6f092a8d5b4d7c7f6abf3038024ee49c382de1ecdb285a6fc248da50b5244452d40ff288989105b40b87fd63414246967036efe429d8cd0578783 SHA512 eac8a193ee16cbaaca593930536c7644039de48a875c6d30c325fff865cdc91b300bc41a99ddf3947475376364eceb3ab701cb6eb24ca61756e37353688a213f
-EBUILD pdf-core-0.7.0.ebuild 768 BLAKE2B 6f808655bffa39a0c0568121462f002eae970c807ff855652f997afe821f6054b9e4623d3ae579b5af448929860b861bc759d52ed3cbe9696da98cc6cfb1e7d6 SHA512 4366f859eacdb0c3a218c5af164e2b7a58702e1370f67b59da2e50a9249ede7269caf9285e8b921754d8b16ddf1dbf78553991448f3ffd166220ea4375fe8348
+EBUILD pdf-core-0.7.0.ebuild 781 BLAKE2B f31e7d4da53405993432ad164ee20773c554dac7f978fd40111f6cecb741fe699ee611275dd11c4b0473b88c1ca56d888fb451806f9487c65fc8bf2014a4e981 SHA512 50566560de7c886a7d5d2dfd37c36863427adea65cd730579a5c4af511007b2e89d3199d00375e52fea038579de87464eddb8fa206c388889932ed3cd19ccad4
 MISC metadata.xml 343 BLAKE2B 1c70f6275d3aec7f1414e408ec97c954da1bc047b76c39efb2a4d984dd0af20a0410235c74615be73f33bb8018d244f3a267ec3897763632672216ed13a39ae8 SHA512 def6cce805afe3c3ebaa7db7003f7f4c62f9a7bdae71dbfb9f4ec7ee39947b85952a5a49b8dc473fddf03b26aeace6a0e711ae4d0bd94d2d9d49881ffc9086c9
diff --git a/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild
deleted file mode 100644
index 38f456979189..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
deleted file mode 100644
index 98728e049c49..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
index 2744a4634289..9ab89907a6d5 100644
--- a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.7.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="|| ( Ruby GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
diff --git a/dev-ruby/pdf-inspector/Manifest b/dev-ruby/pdf-inspector/Manifest
index 11d8aa38fa16..14769216cdba 100644
--- a/dev-ruby/pdf-inspector/Manifest
+++ b/dev-ruby/pdf-inspector/Manifest
@@ -1,8 +1,3 @@
-DIST pdf-inspector-1.1.0.gem 25600 BLAKE2B b7ffe20df96098c8be00021a067e228a432b4109e35557ed7535a26229f47666912a50d70a8b0631bb05fbc6b03c608829044df353b2c15cc68e44b4da44ac1e SHA512 71c8af4275421f952711bcc945c52adb6d19b153606fc067325951092cec58998e56373819aa55fa8c0e1cc4736204e3e11f03c3bc3ec121f5eb4e1327a48779
-DIST pdf-inspector-1.2.1.gem 26112 BLAKE2B 614365b2f6046b6aca1be8e75cf1d25fc5ae1479561c385f4ae36f52e81d5bbfa9c20c9e424dc076c080d61a33f4fadf807dd16371fa083b2942cb859928d45f SHA512 75a0bb0c18ecbfc944b958e50c4641ba8bd7e659e0655644c3deb84a116798089fcbc8fd6f7de96c8cd3485db45af0d2c6e9b1c5eef9420f1dc1a323c1203457
 DIST pdf-inspector-1.3.0.gem 30720 BLAKE2B b3c6b2a4085ebfcf64901a8a0edb8fe762b00db648c74c37ca3ca80b645ab65b006eaf875e1cee109f6a7d30f97617053d0f7c548360281d21acf316f496eb7a SHA512 7c89f8656908d70495fd03e3ab2faf9b133d34c607ea63978731088d8b954d29e1e6e907b1e0d81bfbc35ecfa394badbd0e2c996ff94d6bbc7e78f4d7082d115
-EBUILD pdf-inspector-1.1.0-r1.ebuild 528 BLAKE2B 9080770b90694d7790e6483adc5e328a556a4c53fb5c78b20bb7eb383994d57b4458d1a612bfa36dbe21295dbc20be308cb40dca95469a92bbb233af932bc6da SHA512 5bd0bc3ea587780a2f0d8639e3e56fa54c046514e90587601b4988de950ae65bb7ab226c96b1564cf7e3e6af820e33f8ef4f60f8a37295662f6ab9f08e5445a9
-EBUILD pdf-inspector-1.2.1-r1.ebuild 524 BLAKE2B 5e76dbda80b5a8c4bb51ea3591d0fd8c6289bf2e1e5a3087484e795fdf4dcae07f245127ba58112980670a9677a6e74acbb74292ac4dc6c5cec197d69dfcc2fd SHA512 89219e8250cbee31f380e90744158b163bdcba5324d2dab94a6564cbf04e4e647d1c54f9eadf580791310c69194aa0a6d6ff0a32f314643dfcc5f951ad321519
-EBUILD pdf-inspector-1.2.1.ebuild 531 BLAKE2B fe8d44193c384ce0ef573208b9624bc6031ad47ff00a2931cd7f7e3029a8c55026786ec664b7f15e70003acabdfda6cf5f387f9008f7bd268a40737c47728f2f SHA512 c8e5698bc26981970142b274e5ad0e341fbd814c3d14abe6c26f956932647a7174e5b850b143a3edf9475f84ccf06837addcb543460577cee5dedddde65137d8
-EBUILD pdf-inspector-1.3.0.ebuild 567 BLAKE2B 73c6c659d12d8752c117c035f3e3120f4854e67a645ee887bfdcc7c137dfdb421fb5628c9d0cbb88f72f00e36fa64d6e249264126562265d979e99c0e72a2486 SHA512 dc24f5df1edbe53e451324fdf04215b53ed51216ba299fc79269fccb81115744321d401730265ca6ff8ffe9cde471b9937cce8beddca6569802b75d9217f0b78
+EBUILD pdf-inspector-1.3.0.ebuild 574 BLAKE2B bf5ab57d15cc1e6c00e6c7ca32c875bc6bacd6035d3fe2b4a85d161da0683dd2320090ab8e16328e4d8899ecd57dba38eb17eb00b9eef49c12523b452827f4db SHA512 0376b688d7ff048ddf4822812d988bfa2df5e8859c03c1512be5f89028470c5e0cc43c17aac44e553f0f16a46a15d914fd292eae18f5c3085e4ebc231c6dac8b
 MISC metadata.xml 348 BLAKE2B b95aed5527a27abf9b1c2bbe3983352dd8dab98143efef18192cff25c3e918e72c73790f834585b821863fd6c8dc72d90fefc0eb6b7789612b4b4b10ca07e148 SHA512 3cccb98b2df5b3e0c8b8b35c21824537a4f355e7bd6d51aa40fbf5a9acb4cc8e7e73b22cd30a20bb6a26568280a4891fe4cc396b35ff29ec9755ba1b4946ba2b
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild
deleted file mode 100644
index 6dff48b225d7..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild
deleted file mode 100644
index 2942577dc38c..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild
deleted file mode 100644
index 7bc10601c7ef..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
index f0f2686e196c..2b5f7c6c48c4 100644
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
+++ b/dev-ruby/pdf-inspector/pdf-inspector-1.3.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
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
 
 LICENSE="|| ( Ruby GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0:* <dev-ruby/pdf-reader-3:*"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 2c8061fd6172..153533746e97 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,6 +1,5 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
 DIST pdf-reader-2.0.0.tar.gz 10382893 BLAKE2B 2b3c6b6b43f6a100e0affb4593361b37c6ed1120d1a94ad408919a16d35c7065fb4f8bed851fefff3996ccb6ab5a49d26f557cbe48052e20584c427bb52c02b9 SHA512 29a0e4ad83f2ef603ac60e4bf2a2fdc71e816e9c5b4bac052bd47322bfb91b2da6fb97901fbf0318ffa5cb3b43161978ffd2c08e72c658ee36802b8f5bbf88bd
-EBUILD pdf-reader-1.4.1-r1.ebuild 1063 BLAKE2B 1f2f2fae3a83ef1cef1306a70da03111dcd490608d9bb67e167708739ecfcedba8507434ae6e96239ebd566f5a3803d120eb81c770267b4299f54d75109d64f6 SHA512 4818538cb54fa86d77db5183919eaba13c7f702d5c4e5f820c2a2c875c8814a68fb755f2b0ec325a3e855f8866f5c0228a9addf74e8f087bf8917d1fd9bb6c3b
-EBUILD pdf-reader-1.4.1.ebuild 1063 BLAKE2B 81b158f45b1fd1edd222738acfd88db404c188a2ef3938c6963e686da70af4e30923a7b7fb29654a10c0fc8f804bbfbb91b9061318aa701dfaed8fa3f3c76c49 SHA512 c09d9886f9d5ffb6dc4ec91e92515f8df1156ab790ddd18904399802d05461c84bc2822183a74b3c3b386a8ae8305815f288e4f5ffe399b346a7d773684552b0
-EBUILD pdf-reader-2.0.0.ebuild 1055 BLAKE2B 8c4be8f7f4c16ae5e7d3619b7544543501e7835e0849762e6b725a825917cec6c5732bca9578922cf1d62f4086a2e3ebe7393be8f0d81023068a6d60e26cc9a0 SHA512 ea089e8e2370b1a20c2ae913b8192b74e5b684dc17509fc3855e7a2e1bab5e42ce30fa3fb3ec9be89d9a6ae55dc5ff12234ea2a8e8741a5e41474f364c1396f6
+EBUILD pdf-reader-1.4.1-r1.ebuild 1070 BLAKE2B a546817d8e8c5dd8b9bc562463646fc4a24fb1e7545bbbdd17659ddf2e9c7fb325e09ac2d00f58fb4677bbe09254c2416289609bcf065314f8bda78f84e42539 SHA512 262276bb26d603b4766d19e599ae8cceb152265849dd7837ae89ea1d53cbc59dc840065d438dc2626a7d54a00b7115f827f5ddf30147fe2bac99f7046a5a33c9
+EBUILD pdf-reader-2.0.0.ebuild 1068 BLAKE2B 0e81fa21e1e3de743b70f8d77b4a58043ed533e367ca458be546853516fb5ffdf0be5e2408ec0c928ceb2f2f48feea176a2b4e5248c30ef98faae6940e08608c SHA512 dadf19bd996622f6c50a6466a88489cedc9b527daaff329bd1307d71430dd39abca3e6d02d1f9deb680d579213c975120279833fedefeac028d302e29de5df1a
 MISC metadata.xml 340 BLAKE2B 870883ff3971c347d1b9a28f228629d1c972c8a7e1695d77755316a864b74a8b65190d6b1cb07e55e8138321b91a6d9afca61872434ad9c13d081ce47e75d3b6 SHA512 8746d7bf7de89f49d161945c3dd434efa275799aac66d981edabec64ee789ca5864d69f3bae738b3c5ff26cc54b1d824f7aa35b2b9c9624e07339794b56d029b
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
index 905e599d2b61..4fec367c7723 100644
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.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=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/afm-0.2.1
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild
deleted file mode 100644
index ce83fbe9ee2e..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild
index fa2ff90cf440..7f8d8bef0c3d 100644
--- a/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-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=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/afm-0.2.1
diff --git a/dev-ruby/poltergeist/Manifest b/dev-ruby/poltergeist/Manifest
index c82c854db01c..35fab2466de0 100644
--- a/dev-ruby/poltergeist/Manifest
+++ b/dev-ruby/poltergeist/Manifest
@@ -1,7 +1,3 @@
-DIST poltergeist-1.10.0.tar.gz 179598 BLAKE2B f4a65b567ef7969dc42971482542443438edac46ea8866ca5f856694146e2c4e3187d3e29b08fc7177f53cc8feeaa251a35ddc863270436b136c7323ff23eede SHA512 d81f06e45eb0fd8a7d89dea7799b6e2c85dbc34c6220f57acf9bfa4ade8ef464157204dfd76bbd53e65aa62edaecedc80f375de4c47ab9af2bab2a3b96c5fae8
 DIST poltergeist-1.14.0.tar.gz 185946 BLAKE2B 0f5d95437ad5c2509264ef0230624ac257e8901e98bd4494576c3dc6895fc38c64572b287eb9842c8af2ddbaf0b3c48ecb0a1fb4a2cb72711abba40646dcaeec SHA512 82ab8aec7e5e091fa2924765e077d8b9816319833d438d9246f8ef3d0045d158de6bce1d14e929cc5cb8d0970ea380d44a51511b17623479f3cd64853580ce71
-DIST poltergeist-1.9.0.tar.gz 175912 BLAKE2B 26635a1ed66742e07439a90019df92b72e7670242f2d9bd5883d66e051e365862e66be89c59052f78dd830f65ec5c28997d940d27a88321a215e2030a5219724 SHA512 667fab321bd8718f604496119efcdd6e3bd88da89b45afca13df53727a4b7a01ab2ca70710afdb3479d4c68ecb155f0136901aaf405bc26cb0430838558c69d1
-EBUILD poltergeist-1.10.0.ebuild 1345 BLAKE2B b49bd953eb43e099e781a58253ec60811ed07bc1985d0d7b38012e23a9c9a12c21b343e962a568e6c2092235174a0e2c886060f46b40571e64b1e768e6ab2012 SHA512 0f95dace8e145a6ecedbb97af04cf48d556467b66d322385b287b4d0ea4a9b6291542cd7508ed85dfa4bce72aba95470cc1a52d3e4aa5da35c9d9d756b388434
 EBUILD poltergeist-1.14.0.ebuild 1345 BLAKE2B b49bd953eb43e099e781a58253ec60811ed07bc1985d0d7b38012e23a9c9a12c21b343e962a568e6c2092235174a0e2c886060f46b40571e64b1e768e6ab2012 SHA512 0f95dace8e145a6ecedbb97af04cf48d556467b66d322385b287b4d0ea4a9b6291542cd7508ed85dfa4bce72aba95470cc1a52d3e4aa5da35c9d9d756b388434
-EBUILD poltergeist-1.9.0.ebuild 1231 BLAKE2B 17a3a4a873df6414a97eaaefeff718e9f8eec3c855c1af1337e93ded98f547706a65adb30a9fd3801ba278cbfbaa3d587b5c7b3f6ae9dc3759fdceed2f6faa30 SHA512 58cd33424283f0dada0116526739f39363f452cb0bcac0448751a74b7d1da9c1200b97ef3a65c97d2d2bb01329075e1b02a499fe376826a252c2966dd3cc4ab6
 MISC metadata.xml 349 BLAKE2B ba01777e28c1a91f01caba2ce123ed0f6fbd72ad3c97a750a2d88c558b18c8cbace1db9fce79748e0ba3670b47cadff8294344e15c428e28f290263bee293fb5 SHA512 c15725416d3f3cfce40980ed3eb7b39c4afc2dbb1cdeac0f612656cc387e55a3ec1756c9cb54b0162c5fdb6e51e91537d40df4a5e782b4ec38bccebff29964d0
diff --git a/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild b/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild
deleted file mode 100644
index 4dfa4cf7439d..000000000000
--- a/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-# There are tests but they require several unpackaged dependencies.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A PhantomJS driver for Capybara"
-HOMEPAGE="https://github.com/jonleighton/poltergeist"
-SRC_URI="https://github.com/jonleighton/poltergeist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" www-client/phantomjs"
-
-ruby_add_rdepend ">=dev-ruby/cliver-0.3.1
-	>=dev-ruby/capybara-2.1
-	>=dev-ruby/websocket-driver-0.2.0"
-
-ruby_add_bdepend "test? ( dev-ruby/sinatra:0 )"
-
-all_ruby_prepare() {
-	# Fix cliver versioning to accept all 0.x versions
-	sed -i -e 's/0.3.1/0.3/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '2igem "sinatra", "~>1.0"; gem "rack", "~>1.5"' spec/spec_helper.rb || die
-
-	# Remove integration tests for now since they require additional dependencies.
-	rm -rf spec/integration
-
-	# Avoid a spec failing only in our ebuild test environment
-	sed -i -e '/can pause indefinitely/,/^      end/ s:^:#:' spec/unit/driver_spec.rb || die
-}
diff --git a/dev-ruby/poltergeist/poltergeist-1.9.0.ebuild b/dev-ruby/poltergeist/poltergeist-1.9.0.ebuild
deleted file mode 100644
index 173857eddbcd..000000000000
--- a/dev-ruby/poltergeist/poltergeist-1.9.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-# There are tests but they require several unpackaged dependencies.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A PhantomJS driver for Capybara"
-HOMEPAGE="https://github.com/jonleighton/poltergeist"
-SRC_URI="https://github.com/jonleighton/poltergeist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" www-client/phantomjs"
-
-ruby_add_rdepend ">=dev-ruby/cliver-0.3.1
-	dev-ruby/multi_json
-	>=dev-ruby/capybara-2.1
-	>=dev-ruby/websocket-driver-0.2.0"
-
-all_ruby_prepare() {
-	# Fix cliver versioning to accept all 0.x versions
-	sed -i -e 's/0.3.1/0.3/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Remove integration tests for now since they require additional dependencies.
-	rm -rf spec/integration
-
-	# Avoid a spec failing only in our ebuild test environment
-	sed -i -e '/can pause indefinitely/,/^      end/ s:^:#:' spec/unit/driver_spec.rb || die
-}
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index 04ec619c85af..0f34e758c7b6 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1,5 +1,3 @@
-DIST prawn-2.1.0.tar.gz 4687290 BLAKE2B 25b544078fe540cc3cd7f223e15da92e2b8b3de6751821f24fb81547a49c1bda27a2b0403fd61747294229deb5a693695ceb1939c64dea9b9e1d59aaab2fdf0f SHA512 2fcc3261899e2c88a877901840e49261ff3da1924f3319cc65fa028ec0d550df595c98ae206fd645bcacd983cbd69cafa6ecd33f66f8a516c82ad13578a6796e
 DIST prawn-2.2.0.tar.gz 5215662 BLAKE2B 7130aaa4e9e9de2f15148f9c3a7a713ebb9808047e59fc156566f3a44705055b907284ce6690ff2e803702ddc3eb304b32e8f8c0049badda348bf4242df7e14c SHA512 a714f3cf47439d2603afda66cf4202ab9fdda0b6aaec120fd65df4e29d4b26155d95392487131c16d451ebe8f774aa6d64227670fad7b151cd0a514d3ed40b06
-EBUILD prawn-2.1.0.ebuild 1113 BLAKE2B 7abb58dcc56240ef7159a4f54ed50fcd438e69b494d3bb296eaf5699deeeba2f92bd39b53b6474becb83301670de7695d7553ed2274214886725ef80d46a6d74 SHA512 1f56d75f71137105aa93f4d6d57feda83f7692c34461a84f38715dcd4569567eba48464a785495cf951645f2c1405b0a0457201c45214d2582a3179a9e654b06
-EBUILD prawn-2.2.0.ebuild 899 BLAKE2B ee3d74cf15cc0a9092155130eb76608b0cb65a47e9268e8591a330d834b7e6449c728482e14124f8fe674b20581f5530c8f46899e71d7f97b84ef4ee21c1c40e SHA512 d4d47a782f99474a08ba4a3bff2af2ddc09baf356e3b6d6c2875144d424123a8d906d77ae8da48eed9de6a07f1baa98357e2d85b29c468a6ab2ea4c768ff5dc7
+EBUILD prawn-2.2.0.ebuild 912 BLAKE2B dec3d1149a87141adcdca8d062852eecec5e45c2d0ef8e4bdb3e5854b9f197d0db97a8619651faec78643c517913d92202a799d75a8ce9639df013c2e49e65f6 SHA512 a5b5013f1b818735b4fd080c7ec9d4f37f1430fb909a231f36f346e38bfef225a7790a19b1cec48eeb1134b873f13db74d91e6dea5941271e5a3575318f868ab
 MISC metadata.xml 340 BLAKE2B 4d87947e53d3063f83e9cd52f2c11eaee8b5460d3272302eaa91b93c572bd536e69c38d69dab0f94cef4507a6cadc48f4c81d2b98ca4787a02541657e3f370bd SHA512 ce287fd4dc9d9442611b519fa8c8607b37072965c8d1902f25e9444a375c9b6907850a9d9f3bb3ccae31a7994bae05a6235bada27837dc28fe045c12cde61358
diff --git a/dev-ruby/prawn/prawn-2.1.0.ebuild b/dev-ruby/prawn/prawn-2.1.0.ebuild
deleted file mode 100644
index 7ca5b1a6414c..000000000000
--- a/dev-ruby/prawn/prawn-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
-HOMEPAGE="http://prawn.majesticseacreature.com/"
-SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-core-0.6.1
-	>=dev-ruby/ttfunk-1.4.0"
-ruby_add_bdepend "test? ( dev-ruby/coderay
-	>=dev-ruby/pdf-inspector-1.2.1
-	>=dev-ruby/pdf-reader-1.2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
-	# Remove failing tests
-	# https://github.com/prawnpdf/prawn/pull/693
-	# https://github.com/prawnpdf/prawn/issues/603
-	sed -i -e "/should process UTF-8 chars/,+9 s/^/#/" spec/line_wrap_spec.rb || die
-	sed -i -e "/shrink_to_fit with special utf-8 text/,+12 s/^/#/" spec/text_spec.rb || die
-}
diff --git a/dev-ruby/prawn/prawn-2.2.0.ebuild b/dev-ruby/prawn/prawn-2.2.0.ebuild
index b62d908568e7..e898bbb6be5e 100644
--- a/dev-ruby/prawn/prawn-2.2.0.ebuild
+++ b/dev-ruby/prawn/prawn-2.2.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
@@ -15,7 +15,7 @@ HOMEPAGE="http://prawn.majesticseacreature.com/"
 SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pdf-core-0.7.0
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 0e0df88f4c3e..714817bb6f5d 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,5 @@
-DIST puppetdb-termini_4.3.0-1puppetlabs1_all.deb 18522 BLAKE2B 399f67bae5de0ad601e22f952f7d4cbd169a8a3400a768ac4a00ab80eb15955e37267bce088d9573d0f0cfc253d9fe4ddf39c2f09cedfea7a64f10dc423b9515 SHA512 088ed402df9d8fed0827cdca47c782690a7ab767e2fc786dd94a1019cd84c5dd70168bddac43963031c89bc3a1a545d81554952c9fdc999f52d49e2b6212f9ef
 DIST puppetdb-termini_5.0.1-1puppetlabs1_all.deb 18888 BLAKE2B 9d1aaea64459d8e22ab293237fd1c3c1047dab4eb926f039b742aafe751a9f6eef60cc4ad784cf10f95dbfe278175aa69c56ca09f069aba9c642ff26bbc8b823 SHA512 513155a86b23b52b30eea49da49562bf1fce513f1fc58d4c026a61542e4c197d4806cc51548ceaf98bb5a9b88a6b0166575852858f0c7144437372644d32f962
 DIST puppetdb-termini_5.1.3-1xenial_all.deb 20458 BLAKE2B 1b8f4b26640cc06d0cd805bdc2900640de0b20d13e3137becf764340e71bd8b75944be5ad86573e7d78d89f69e08e3b9c3d2b2eab0d8110bf97beb34214ea0cc SHA512 37cfee272865fde1fa2bd8a66c6b64639df01ba34ba9b5903efed1d8b3c82c2658887f0dfe9e6b154f9b4cc16396d06ffdeab521d675864b259059fe53fe3304
-EBUILD puppetdb-termini-4.3.0.ebuild 655 BLAKE2B 2427c128c79dcd32a93bc69959db285e467697501a900896a7418f2e0b5c604760197462800978983c7b005ed044db7a1a54d965a34aca53edbcb984c9cb40ac SHA512 2edae70c952b13e7ccea10527657e3687fc14f2def16f288b90257817c3b0289578c3bce5b75ad3c546eaa5591b90a68cb23c6e869b66ba52186a7e444b0f3d7
 EBUILD puppetdb-termini-5.0.1.ebuild 666 BLAKE2B 395cd65740e6b3dd653b9b5d9b49ceba1e762c55c883add4b8d6bcb003ff11d3388ccecbac5a5ba7550e3c05479968f85952b2ed9d16dcaaffa32a549e515108 SHA512 443997fe58e91618ba56b3d53922d5fbca8f90593439db1ba786fa4afcb3a7268c9d878c54856b4abf5971d0c531456b86f68f50f86599b68773fe896206c6e3
 EBUILD puppetdb-termini-5.1.3.ebuild 657 BLAKE2B a2e0ab10e0149811b284b6d5e37660a79e7a09a54c5462ba912856d8cbc1bd6e47de5c3a4aff3b8cffb637fd460040835f113a61f4e0d1e743460b55f34faa00 SHA512 8afaf0f31dcdae4fda4dc81f5f7256dc2e3e1275f50b195698b7229a1c3264e7ed27211b043e33f8fbafd062a77f4b7742d1afa3a3d680f2ba4c95f79aa21b86
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.0.ebuild
deleted file mode 100644
index e3bb0af8b51e..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.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=5
-
-USE_RUBY="ruby21 ruby22"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/puppetdb/${PN}_${PV}-1puppetlabs1_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 61969ab7f840..339ea88e54bd 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,5 +1,5 @@
 DIST racc-1.4.11.gem 113664 BLAKE2B 4068da68e1579fb2034c454ef0d19e00d1f7e48eba9a1e1646eecd4e75410d9bdb2ab84a9f40b3446fc686014f87042d843cd7c4726acf24632b5f208e34ee9b SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c
 DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
 EBUILD racc-1.4.11.ebuild 1827 BLAKE2B 1cdcfc9468a2abcc1aceca319b6825946ebe518e8259fa567ae63c55a3ed3aaae60ecd6885f7ee7a1b06178deccdd8e8295599ce8cb89e19de4916161b71e9ac SHA512 4504b57d06984bad7069c431d9634c43adafbb93d3ec00b25d30aa643006439df0e918fdf71cb8cde4e7949e16acf9791e4ed0b0a2075f517f3215507c3ae8cd
-EBUILD racc-1.4.14.ebuild 1840 BLAKE2B 48473d5ff3e73cc20bdda0710fba6facdd9307052bed728a0b7dc9db83ea5328d58c804d75fa577f417a23b2d2a63882f34f9a165d4359ae1de844e036a597b7 SHA512 eee514f4ba5fb07bfe411724234f6873f353254fc8e43b3552022b60b308fa3e1824ccfa40879be77d17f2933c8d7bc2d2c6e60d7be962e3f4e588f14ba61575
+EBUILD racc-1.4.14.ebuild 1838 BLAKE2B cb0e8b539f1c2dd0c4068c16ad1ca644a604550b8b600882390f238412342bc8069295b263a743f6708015b8e55060ae558c4954986e499edc9b01b2761986eb SHA512 567b77d42645b98022a9cfb4d6bacc2bdbc5ff4ed5452c725612d10be5b3b95e3e11fc3ba4f6577bb885578e9064329c6f1c3fbba63f0155811b6a23a397a933
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index a3b38186497a..bd74491651e2 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 10a6722325df..7c2264e8953a 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,12 +1,10 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
-DIST rake-0.9.6.gem 123904 BLAKE2B 501823948aca339130fabc1cd303c8f30c5afa864fa4178def77514ffab1ed0a372284535324c8d66c331b60a2f1a6e74df2338312770974ef9cab8f5163fc54 SHA512 9ea3b7bd96db7e96f8bf5a00db710003d39ffeea6eabfde4b9a8afead0e6f6a8fa7740f42a61d77a4322f64ab0338b19af8c63d0178624dc7c0e787e11b0b6f3
 DIST rake-10.5.0.gem 130560 BLAKE2B 05ae87d68641d5afbdc16c36d33c5cef626c8290abe5131f93f84e85861f0175f0b72a62f1b42076dd42a546a08c6efaa9400cf46707a2d4adca6bbff407b769 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf
 DIST rake-11.3.0.tar.gz 134863 BLAKE2B 0c4bccabdf98bd90c9121af20d892243ae283e8f15b6798cb0525d2c8a60d0cb796b94d7d673c4780b1f83f209fde136021b78b413ca670bba1b6744092ae47e SHA512 705c4b1979bdf8042acdc6cea403b2886ac9c589ed0eba7c258d0ce5c46104b7d6556415e82a26b5cd9559954ee53a0bd9f4e0373fd2601bb3b3338a426b3e5c
 DIST rake-12.0.0.tar.gz 117571 BLAKE2B 529dae3997b033aab8c117f02d41d2cd19df253b4b6dec391940e28b2849823976c3b0d5b302a3941c892354b14bebf10031c7eb63a05f0865bf928c8c0ca41b SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c
 DIST rake-12.1.0.tar.gz 118891 BLAKE2B 122aeaac6e5e5dc78ff5098a5f5001a747e72237286ecd3f9de5225139d9e7515ce1ac1cdb499d6acf6c6521af466811a6023b9c886b18131ac2dcf4346d7e56 SHA512 931161e9c220bb18b913c7a2aeff5bb4711cb6a4ff5ab1850aae307e6ab38ac0dd9d0aaaaba4510c27006def6734a8debf8e500a5de8d6f827c3c954832ff136
 DIST rake-12.2.1.tar.gz 119660 BLAKE2B 8807cb9c085cc61df6f6a88d4dcc2e3f21764aa9269d9667ea21baec7fa0f4331695fe985264fa08eadb5a7277a1d88ac9e18d8c319f141bfacf775031d80cbd SHA512 930e2d82f0b5a3250cc0e8357bad60a7ad5f01fed06884e746b72cab60065a326c84d78410943836a698ee8cac1b291d162350d8304a4abcb7e8c930c026af4f
 DIST rake-12.3.0.tar.gz 119742 BLAKE2B e8850fa4afe1c27f3502ec32738258823295bae992a7e6ee2d88fa53d13c9213509db48736874cc30f0610285272ace33c91a147a1891774f2f26b6b022dbbbd SHA512 a4768530d484dd2a1abd19c1d89b33ae31da54d59a8719f7559c586abb1c4eb7f6dc3cd05f85ad136137ad3395f57a121ebcc693da2d35e4cc1d70c1f64b666f
-EBUILD rake-0.9.6-r1.ebuild 1652 BLAKE2B 12d15696c6a7a96adffceccef1887362054e2d0e6efe1681f0e6e131b11813265861eaed2998df470dd785a13d843d91e05c7de3c3ce1d7498ca1fd1949c2b1f SHA512 2bade0e1137fcef57b593440604ddffa7cbf8ceb12c1f7eccc3f91abc05a01b86090dafcffc807dc47f46ab17b1fbdd68fde456cc7d8c06753efd79e50af7f97
 EBUILD rake-10.5.0.ebuild 1194 BLAKE2B f8d764db98d3c976571a492c59c420bee4a5a6b459b79938de3e8a63090e85234fffadc7bc8151a8fb8365bd2ffaed4df11029b7997961fc4bc878d272957d38 SHA512 c818bfed0c41931bbd39066dcb3a82e80c0f1c0e21752d038e9fe6c0059679176fc34e537f1458ac48252798496304a40c310648ead421fcbdab3ed0387aea61
 EBUILD rake-11.3.0.ebuild 1301 BLAKE2B d45fdbf2ade4b863f22caac24f2c946bf7fd71b847aaea3229064423969d33a1283d38e5b944e1d4a15be5d9e3ad60792ec565379770739159dc739b2500eae1 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd
 EBUILD rake-12.0.0.ebuild 1308 BLAKE2B 9d9cf580af743e4e9de4fe4e63d5ed9369048ea54c2188cffcaa8b6880ec883a2201679f6d88a70325431cf12183ca92c49533a103c138e52ed04805b70cc6bc SHA512 95125011cdd74c8b6b1befe9378e65b46d8c8af66776e427ab4f4b8f7dfe96059db06717b43911c066c35dce1607c58c739b72c409bbd0299bdb9885f27433ea
diff --git a/dev-ruby/rake/rake-0.9.6-r1.ebuild b/dev-ruby/rake/rake-0.9.6-r1.ebuild
deleted file mode 100644
index a5f937717f03..000000000000
--- a/dev-ruby/rake/rake-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/jimweirich/rake"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="${DEPEND} app-arch/gzip"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( virtual/ruby-minitest )"
-
-all_ruby_prepare() {
-	# Comment out unimportant test which failes on ruby18 at least.
-	sed -i -e '/def test_classic_namespace/,/^  end/ s:^:#:' test/test_rake_application_options.rb || die
-
-	# Avoid tests which can't work in bootstrapping because the test runs
-	# in a directory that can't access the file being loaded.
-	rm test/test_rake_clean.rb || die
-	sed -i -e '/test_run_code_rake/,/^  end/ s:^:#:' test/test_rake_test_task.rb || die
-
-	# Decompress the file. The compressed version has errors, ignore them.
-	zcat doc/rake.1.gz > doc/rake.1
-}
-
-all_ruby_compile() {
-	if use doc; then
-		ruby -Ilib bin/rake rdoc || die "doc generation failed"
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb-2 test/test_*.rb || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dohtml -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index de6f22d53d86..efbe3d1921c1 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,3 @@
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
-DIST rb-inotify-0.9.5.gem 14336 BLAKE2B ad43d1da83addc34128b324c2b190e30889ca3ae7cb04181c9cd67b716e1192e9b5e5fe648212e98f670cd953b700c3b5f704c989ac4ff38e6ceeb95f2521d51 SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60
-EBUILD rb-inotify-0.9.10.ebuild 968 BLAKE2B 6d9884650f63f4531471b169d7a8716daedf140f70779762945562514468d4c9d81f561b83e467275bb7f197cfd985d80ee581302c8f81526216a619d63369f6 SHA512 2641b4443d151e13b11aab553482da732a6fc301d123331b428fc94939a8f26493c19e1fe3016693ad2c367fa86d4bf35b68ed8e3abeb5e997f04353f586f66e
-EBUILD rb-inotify-0.9.5-r1.ebuild 954 BLAKE2B 3cfd94029abfd7584575cb2019ff5efd634cdde007a9975c675b37ce19a3c1d0f4d777b08e29a5f20bb9f8eda1aaaaa02ac5e2bc33129b8a758a757f2d59cd21 SHA512 0678ff1fb02154d1a3a306f7c804de99090af0d2f19bac5b9bb17f6aa50771aec5be8cfc5ce381221e8734d999536506d9dda0efed1e5ab09bc7aa86bd1adef3
+EBUILD rb-inotify-0.9.10.ebuild 967 BLAKE2B 869f4bf9bd834357a60a38fd9089683a4156bbcb9373faaee043ffb399256347bbec07a9363d2540834a37e8d27235cbb49c464449c29fd9d7f40733b8f6c9fc SHA512 835e3be6628017ba94c7a22fda09429a4217cabd1b02550b4c28ad6f4d554f16bb18ab4a3a75be4a0267ea2473e8c4ec28b93050f8e41bcbd7c45fb1e254178b
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
index 6e726129b110..cb297e346792 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.10.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,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ffi"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild
deleted file mode 100644
index fae330afc84c..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 48bf110ea2be..a6561f7a5faf 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -6,7 +6,7 @@ DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2
 DIST rdoc-6.0.0.tar.gz 696677 BLAKE2B d12ce5a22462b797252182244bbd2d1089c557a77f901224b06bc75bbffc9c50055ea0de5808a2055293730e0e79632bd2361a814eb5370b05c33a225c2e0d2a SHA512 18669123b3d712f73f901599a3ae903914369dc3c985651b7bc7ff6e1893a834e6c5688ced97ea6324e6af13050d151bee5d62f44e7a4a1cb8d314acac77b50d
 DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
 EBUILD rdoc-4.2.0.ebuild 2795 BLAKE2B 16e9effdd9566dac3c83e730e28c9a0733c7c5bf6e88c8b01e9c8215185c1eeef7887772bf4497ac96312f1e6bafa8d9f536bda7224ff7da1435a5c1135a7754 SHA512 cab2ba0cd1eca5ebc32d5bf73d37afc19f12b3509f51286081fe733da8dfd18933acf494e9d6c9feabfe771aeb2ca11b72e5cc3f9218cc4d16d493e477226624
-EBUILD rdoc-4.3.0.ebuild 2706 BLAKE2B 34f70b6b4178a1f99542898714f04c3f34a9d5a6a1f4eda2361d3aa4bf023913999881bc026502fb59f2dd97a68ae75fcec7a846c5b859ac1d76eb121b9dc411 SHA512 9ab33c22b5bda724a2e8f207df7edc38b1add039a6599a5a1ae3aa47a8a8e592541bb126ed27c565ad72645b6ed420c68a656b4979c5636a5cf26d1454d65ea6
+EBUILD rdoc-4.3.0.ebuild 2704 BLAKE2B bbcd2708a52c49868c6718260b1dd90e8c26195effeef291ab1277f4ff456f785dedb1d2ebca8d84067c0c385e8ceac6079766dbf6dfb67832806c92abf33c95 SHA512 d51a9f66268f196e26eb2314d423f124503f78fd80986c5cf3cf7029c00f7600032c1fa480cdbf753cb3707ad20de0ac8ab4feb4342d94462697ecd67ebcea73
 EBUILD rdoc-5.0.0-r3.ebuild 2484 BLAKE2B 31647ada85763217c1f1d5dde63a26dcd3d31bf2d08dd6ef81c9b6611bf8a1a1e038ca67d20d8a64ab1027156667586c9a8007f96451a9c161b8ba8a761dc86c SHA512 1f5e26c651945069ba5e20ba7b1941b44a39d93253a57c36974ef2e486e1f5f60be9b134e80b83d9a661e90b12083045778a231751436188fde1f2b8bb401d52
 EBUILD rdoc-5.1.0.ebuild 2575 BLAKE2B 3c3c26b0395e376710b616112c1e4fc476582fb6c1d01ab3aee9b3b316e76bf691a9acde559c26ce5b1b9d098c661999de883385a9e277a3531f8a036a7fa99f SHA512 3e2ad90adcd556d8c834878c2ae82de6b7a52c8849f74712fed888e2663c1285e32c25c025477e3cbd833e311c4705ac3c064371ebb8c2d51ed6e2bcf2f79881
 EBUILD rdoc-6.0.0.ebuild 2526 BLAKE2B e1d77770cb608be2408df290838585bb7694c2d90a6406717d0bd280349173eb1e13407fefd9f9289a30f4a6d62f1280542d64934be6a0a3752c3d232d317d57 SHA512 97b278f2d205b5041c2af33fdc934f17605cf6e4a6cb2aa46f99147f73d8462a84b636d1ed1dd6cb3dbb3cd0e113060a579d73d68acaaec17bc8961a58dbd0fa
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
index 23748ae36d77..49d59beed562 100644
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 
 LICENSE="Ruby MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 697b213ab872..630db77158ec 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,6 +1,4 @@
 AUX redcloth-4.2.9-cve-2012-6684.patch 1996 BLAKE2B 1f5a41654fb270de4769991c911c9a66c74fea59b55faff50216ea0d0c3b40050d57ce9484a564c40074bc43b56f70a3c451acef9381cdb1550879160cb7c395 SHA512 17ea6052abf651c41091df3a1799bb33ad2161abd5a78f2d6db4629eb57a0413f4341ad87ca065391e5cc3e083bd65000d3d68d1fa53d0d15e5a73f5962a1498
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-DIST RedCloth-git-4.2.9.tgz 96897 BLAKE2B e575c1fa247efb26265b44c50315d1449db3b84a1feaff349f2872c80b9abfc5fc767b09fbc741f9924f70901c73d9a7474b6d4fc3145d3e1842a34ea6e2be13 SHA512 646f7a1a88ab9b3ff078016df706a1c9d991bf21d86ef1dd4c0a0ee6b946f94276b52499218bca222461eb003510e84b81f44b08899c5b36ac115137193e968a
-EBUILD redcloth-4.2.9-r4.ebuild 1527 BLAKE2B b2cd7736fc902ae21dd7703f2a0447df44ab1030cc3d954669058c95b8eb1dc961a1f0f874c1eafb4fe7b06f4b271ceaf1bba75bf08b6163e9f98d9574dba7ee SHA512 2575190f72f7a0161bab7f142915b779594c822806a99c7d9253209dc9d61eb62f4c1ec828e07f9959af780c14869164b45defa43b14c6ba8dd39ace6a17351a
-EBUILD redcloth-4.3.2.ebuild 1475 BLAKE2B eac5dc18d169566a3f66d5850d7615d290656dba69c6e7d2dd44181190a2dc6129df9266bdd5523f236e700ea2de9e40cb475d4e451b337d193dc432cbbb85dc SHA512 1b7c2bc9b1d861a3e3de604a99d124c15df4d98e90696e0326f4b7f8ca148a0dac6bd8c4f5d9ee6a4c8bd062725bd99d5cc9f5289aeee0b1826420069929432a
+EBUILD redcloth-4.3.2.ebuild 1474 BLAKE2B 43418d646ecfd7b5e7e3fb20339fe60dc5190bd9c140602ae29ab7286089d91aa59ff6dfcb72f0881359fe8dea104134b762ae571a7dc81f61a33132edd1bbe1 SHA512 f3318341074ecca90684f87ad8163952c8e0d12d96d66b5ceefe3380cbea8fe8fadc3e0d448c24cb6c0b14b2777ca03edcfea54976aab65518d3893e824bdb4b
 MISC metadata.xml 342 BLAKE2B f28d0e6234cfbeb3d398315b38e8dcc614b32aed150b047e61e7d99b2f6083abbabc36515de2cd2aa4d451dd3372dfc15018c1d8ad02cf64ff8e87b147a441da SHA512 7a6f73a77cda62ea21a2d2fdfcf0bf848ffdd90e7272e0b06aef67a8147e5a6ae14e871d216750ce20d12e18823d3e3d36e60a99972019fde7195a2350480791
diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
deleted file mode 100644
index 58f1b6463547..000000000000
--- a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/tarball/v${PV} -> ${RUBY_FAKEGEM_NAME}-git-${PV}.tgz"
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-
-	# Export the VERBOSE variable to avoid remapping of stdout and
-	# stderr, and that breaks because of bad interactions between
-	# echoe, Ruby and Gentoo.
-	export VERBOSE=1
-}
-
-RUBY_PATCHES=( ${P}-cve-2012-6684.patch )
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm tasks/{release,gems,rspec}.rake || die
-}
-
-each_ruby_compile() {
-	# We cannot run this manually easily, because Ragel re-generation
-	# is a mess
-	${RUBY} -S rake compile || die "rake compile failed"
-}
diff --git a/dev-ruby/redcloth/redcloth-4.3.2.ebuild b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
index 68aecf0095ac..d10c52cbb740 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.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=5
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${R
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/right_http_connection/Manifest b/dev-ruby/right_http_connection/Manifest
index b303a7a2710b..47b5a7db9b28 100644
--- a/dev-ruby/right_http_connection/Manifest
+++ b/dev-ruby/right_http_connection/Manifest
@@ -1,5 +1,3 @@
-DIST right_http_connection-1.3.0.tgz 113955 BLAKE2B 3b734f84b973cbd683e291a27a1e75dbe7a1d926461761d1d2f5346553e785087c98ecb9614c313b9be9a7040b6f50ff8c2573493a7458e75556e14ef426aee8 SHA512 f119c23d815514ad1724581d150271128fdb603962961bcb637c3d16d157c9ecd588e1b1dfb51adb58108f72164dbefa2f59a408e5800654aa79cb30ebb868c4
 DIST right_http_connection-1.5.0.tgz 120451 BLAKE2B 83b44f205ee418548b6bc70342cf0cb0429a21d624d65ee5bffe447e1aef8e286ce634dfce3bda0c1f5e480bb98dfe1f061eff40ed8b8360bae3d864577c3ee7 SHA512 7db0e85ba8140343ef06bbfce2d9ee5f6ce6823fdcfee71875c74a609e77de043a0e5d6fced18ee2bd111ea6a8a592d3855e1547dc2bfec0e963e446c366aef7
-EBUILD right_http_connection-1.3.0-r1.ebuild 892 BLAKE2B 43f01a16b2c5b1ec19614da503baa98dfe967af03b17ddf762e2dca4b030e0b127697c2af52462b15cd33268975c38de872f5c61b15f3cba4a5932024b7b246e SHA512 0e6aeaacef2adb09810d97b7cdae9b7bf4988cacb73d8c26209ed1df83072eedb95581cac3f3cb153229a4e319e5b94693814f43ee88b051f99e0607add195c4
 EBUILD right_http_connection-1.5.0.ebuild 1206 BLAKE2B 433b4c3441e66fd29a4a5866eee8efc7e576c579514193b02dffad3036b15c7102751a0b4571e46c344a46378ccf73d474f8bd9be34fdcb4eb6933f554a64ab8 SHA512 e6bf6588f53fe61dc8ef22bb49706e5f53053d23535950ee2e0028fb75a0802fc821869ec4840d2c455a4b920d18e818a0a22991a09797d187048257107a607a
 MISC metadata.xml 358 BLAKE2B 026d47f4d3e9a72f0a1844180a323ab3ca5baea82a7a6445c103ccb4ab9ec1330d559cc84c23df690aabe74f09401f980691799030afa8be49db553c27056a87 SHA512 eb21d48f5932674ee17f589e29644b8c87cfc530244bd8423fc71261c45b5b85b44f481812929d03e99b4d5bc99e37c30f052dec7eae954e5fe93520d83ea35a
diff --git a/dev-ruby/right_http_connection/right_http_connection-1.3.0-r1.ebuild b/dev-ruby/right_http_connection/right_http_connection-1.3.0-r1.ebuild
deleted file mode 100644
index 3d374267127a..000000000000
--- a/dev-ruby/right_http_connection/right_http_connection-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-RUBY_FAKEGEM_TASK_TEST="cucumber"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RightScale's robust HTTP/S connection module"
-HOMEPAGE="http://rightscale.rubyforge.org/"
-SRC_URI="https://github.com/rightscale/right_http_connection/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="rightscale-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
-#USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-util/cucumber )"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-	sed -i -e '/bundler/ s:^:#:' features/support/env.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby19)
-			;;
-		*)
-			${RUBY} -S cucumber features || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 5e45182ecc75..bf0f904da80a 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,11 +1,9 @@
-DIST rspec-core-2.14.8-git.tgz 195949 BLAKE2B c249da4a6a46019a96cf67428bbf73d9033f98d8f3bae19f9cecc8fa183249e7987f52b01aed3e2b7067a6f7b671e1e23cf78922d0a0d827e4f537395dcdf9a9 SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382afc5caddfeebeea6e547554d240d030639f9edb00f5c101a843adb18992ed5cd9430a20e5a3d9783557ff62f1def6b2 SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef
 DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
-EBUILD rspec-core-2.14.8-r4.ebuild 2764 BLAKE2B d8a6bda7260cf9657695ad47473edea4d49efb97dc8e591b7ae642b971c93d5df370a254e0831bd422cb80e10314e25169fc09ed82f601faa63fc5f11411a95c SHA512 3c53e284b1c11850a610dd956b31aa0e6cedaf7925d346c95198a1cd9cfdd3a2c23f9b14aef382d3b9c6551241b20980a2f563ce9f11264048daa649ded2e694
 EBUILD rspec-core-2.99.2-r2.ebuild 3049 BLAKE2B 1f226c2e6afc8a60409c1db0a9ec26cdda2573d5d6d2e6115cb04c7173e87ce3a0c75c91c331a3e3907aaa8c237a47e7fe11f1869c6d91f04e80a12d1ec0170b SHA512 7ece50dacf7e887c6a10ed2c143cdc05c41e5d70a6331dc1021dfc43acf97a73e93fd9b6393b0c923fa90f75f96d844fc493040bcdb4c3f77e3413f6c6eca23f
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
deleted file mode 100644
index e06222659137..000000000000
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-2.14.0:2
-		>=dev-ruby/rspec-mocks-2.12.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Cover all released versions of ruby 2.1.x. This should be reported
-	# upstream since ruby 2.1.x uses semantic versioning and the file
-	# should not have the full version number.
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.9.html|| die
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.10.html|| die
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.2.6.html|| die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/aruba/ s:^:#:' -e '104,106 s:^:#:' spec/spec_helper.rb || die
-	rm spec/command_line/order_spec.rb || die
-
-	# Avoid testing issues with rspec 3 installed
-	sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"'
-}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 709a62866153..bb8a0d3d857e 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-expectations-2.14.5-git.tgz 93680 BLAKE2B 124e33b9c3b2c9f872dd6e2bcde6fcf74a93c05a7dcce25c3de72f371c86469d2df277f2cc74e0f0aeec852b252698543177bf1b5d616378db926b9ed9884ebc SHA512 237ed56cd185bc5d0d60ed14e20ded1840ef10711693c43ffaa20ec65cdd6b891aba3a6f1f38bb6962c31d51364758d1898e3bcba14a95c4abc73dff4dac1b65
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.5.0-git.tgz 187600 BLAKE2B 607dabc38e077ed82e18cdc690900f7fef86e6bb30a8004534992804717f8430a132b8f7d882226557e8c83832a1a8f43a32e9791b19869919c9b0aa8cfead8f SHA512 e6077549a028de0e34cdd50d93552ca3ee0f30bb550e9df20d391f287beb57070dcb3a5104627e7adb55689e7b102c91b7d3a3b944b8c4ff1235761140f2dce0
 DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416ab0e05aefed8a129058ceaf1a80d3068b41e81abc9fd85576433fd1577e6114ccc65130734b850997f89310b80b549f80d679 SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
-EBUILD rspec-expectations-2.14.5-r1.ebuild 1297 BLAKE2B 44073a50314b9266ef24f132115479ee4f7ac0f019e5118e3a97ad90e324fe8f946d91df46547c6e146ae1b566c075a030f02191a50dadd4130c6166c269568b SHA512 63879f846e1c7066e242f3c90071997f835bd76dd6c9933a8eb7ba6d3e4f9a1316315e57ba0f5760783d265ec7ee101866cf1c5972d7ff23dbccd819f9340b28
 EBUILD rspec-expectations-2.99.2.ebuild 1689 BLAKE2B 2c072804b36d612a4e709b0bdf1c47cc11e51bf030be65f72a383d889649a841c5e8fa3c3ad79b517a4e026a1fbe9d1c3918952cfff4289cb876617d9c59c00b SHA512 080cd89e298abfdb613dc5d0209525a6604e71d19703218843baa2d929a40a0c4f8ca874919b3d091ad9f13ff19b5b4a774fd44e546ce3c952d9e51e2aff563c
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1338 BLAKE2B d4765508dd978b7ea89b083e78edd24891c91c6172e6ec91615764b226866c3492f3e6e35b1b092e35c186fe4e2e7bfe1de8c38de82b50e003fa430ef66a1b5a SHA512 8bbe1d874c4b3132c9c3bfc2516857e5ed3330c7afae46b561c5ab5c0cf5b4f1a024958a76ae5fce112a5eb193c98b80c5f647792d0265a726e8320684be7ab3
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
deleted file mode 100644
index 1480dd4b11dd..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-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=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-core-2.11.0:2
-		>=dev-ruby/rspec-mocks-2.14.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 5bc9b94c242d..821c1ba2deb1 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-mocks-2.14.6-git.tgz 94286 BLAKE2B ce41ac9aba47e94d00d4dd6583e6a8bfa06ee13918077860ca5babb3ebf850183a356af43e729db675082aa15b567e0330b5b4cc7b890173430aa8ff61c33ff7 SHA512 a079c0b860c7ca4b4da366fa131617ddcb636918cd0c065ef3d8d585938228f442bb58ab5fcd2cd84b590bf6ab468d637fa7ab0181864a59c131f0a890e46702
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.5.0-git.tgz 186806 BLAKE2B e412feafba03cfe8c0efb68dc778885f0603c3b5fa415568c11e7b31168c57ea11245048fb78c34688b65d5cca95bc0a90aeb18afa19fef0a575219441fbaccd SHA512 b7dcb4ce0eac894d6652be45fea981cb7ade47a739ad926a87aa41d8a34fa9deffc45f5718d1634f03fbedaba82a77005466fa83155dc433fed6a19f8a897c4d
 DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9b1e269b739bbd41a87f4839468fe5e4bd3298d2a63aa315d87422a9f30aaf1a776cb9b90ee1fd58ca05b5a08ea032e SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
-EBUILD rspec-mocks-2.14.6-r1.ebuild 1285 BLAKE2B a404deaf1d6344bb9ef7b72bdcb1c82a81b7ad71973af40f0b8fe63f516cc9a133993b65763e080eb7da7a881d8d5e841a8206e60a91fc4290ea9652f7cf32a1 SHA512 f515fe9492f41766c77a8b57bb4bc37d60f2d7c053a877a9c497e49b80df61320b4f01dd6ede5fbe4e4686304327d9657518ed06d820becdac5e2d1234126e36
 EBUILD rspec-mocks-2.99.2.ebuild 1482 BLAKE2B 81bf6a7597f277ca89dd840351750a671ff63536ac419c8be339c6baac6a99e2d0e6ea940406fa6dedc8796c0e53f69c2603f64292e467a6344268c4ab845d1e SHA512 b2ecb999259c9fad854c785dc8f472e063f0e2ec5016ad934c30689480929a9ad8a0f701875e02db6562d46438a2f70ac0aa02dcb16c15be0515a64cfa0382c0
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
 EBUILD rspec-mocks-3.6.0.ebuild 1362 BLAKE2B 3fc2e04dcdb7dbcacbd5b6f0981fe90e0d54c5f200ab7c8fb4239052aa1e22443dda36cba957e1b9d85883b0469a03c47694e7a18ac75ec06f205468ba59393a SHA512 f49e16adab91e07ce5b38a1efe4d85c4a510946807d169e004d741fa9094df240ad2dc2733e1811bfd33227d21119b196b9e5f6568a04ade81ca019f2e1f8066
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
deleted file mode 100644
index e0b891c02b04..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-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=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-2.10.0:2
-		dev-ruby/rspec-expectations:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby22|*ruby23)
-			# Psych and Syck are not supported by default anymore on ruby22.
-			rm spec/rspec/mocks/serialization_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 064596f06604..79f87e0f25c1 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,13 +1,9 @@
 DIST rspec-rails-2.99.0.tar.gz 78448 BLAKE2B 242df5d1540de8516bec8f6fbf1c2072278489add524b526f6f125e55401c7fa6c80d8a6ef11faa7d908765b25c43ca826c8cc1aa71ed2599706ba8793105f6e SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4
 DIST rspec-rails-3.5.2.tar.gz 123642 BLAKE2B 7580846be34bfdf542f2c15f83e4dcdea98929b5d2feb04c645b905497522f5ee050ada800ceab975204c9671e8833b9c3fb978e4b55d6cc75b2291a96a1fd60 SHA512 4f7f03c740d7215591f9ac4fc9fb77f8d747b6446a831580518db2974b07806eab8ed29ade78afbdd981236f3c64b0d933f04be7cccf72c5e57fb85795dc7df4
-DIST rspec-rails-3.6.0.tar.gz 127171 BLAKE2B 05a9e486840f724b15bf61bb72b870a27fca47ce28d242b9613e15f006293865d8c25e964896195b5fadbf7b73267ea7d1c6e6e3d17fb7016928b951dc28ae40 SHA512 f093c96d2d0c5b75ca055bfd1e7dfb990a66288a84293c6b3bd4622dfad52716b4b60553eb83878fb566c2e4d8b25b91da2071727ef54e6dd8aa11babeb80f81
 DIST rspec-rails-3.6.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
-DIST rspec-rails-3.7.1.tar.gz 128940 BLAKE2B 8a5f707ca83970cd6c97f80c945b7f297fc86ba4ccbf2390d00ec0f8f0a5bc11d7eee822bae333d33d3f6acc2de7dc23f100eb59015861cc7265b2426a054676 SHA512 080d26297d722baf796463ecbb1aec29c925eddcb1e09a82479090d5b1d64c0320b0f370e4c0063ae0bddc3f7bc377d8cc5764b0464a8bc65300ec7ed78202d6
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
 EBUILD rspec-rails-2.99.0.ebuild 1276 BLAKE2B 9e89cf804b918dae0e5ffef95b225770b93518a9d99731af80f968e7dcf7b86b4c1dd273efaf8f9d51f6fa496b93e2417f47963306a7089fe5088d51d5916ac7 SHA512 bfd59985e24aaf911efb4238078cc306b6d73c5eedd6ee67189dca581b8b32d941d0c699b4b873c1fefb89184632eb20897c525089856874f1d796e9d93c6728
 EBUILD rspec-rails-3.5.2-r1.ebuild 1448 BLAKE2B 3b208f678509b6812b5bc2bfd7dcc6cb9480848d71ba4a0d01646e4e09a7fca274926d1dbfc5ba207301d444a2c0ccd54c070649b94da7eb6675b5b2b5bf434d SHA512 92ce74b24b1a330b83132f2c9c79829c1a172709a96b8735279688a015178e98c3979385b86ebf4ca6c1841dd744be23947e5b5951964559ea512df0fcf18e18
-EBUILD rspec-rails-3.6.0.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
-EBUILD rspec-rails-3.7.1.ebuild 1441 BLAKE2B 3cf794cb4a3501ed6882defcce32e0d3e9be1fd78ab5b13e20cb5e8fd67801697a61f730fb51fada29bbfae36fa552e2553a541e085d06a06bee619591ef7e0d SHA512 a416bfe0d389d18d8881cd0eec566e57325401929d8497194dda1ef31dd20905bb5000804c5f5baefdaffa3dd2dd90e15a09dd0ba99a814efe07c4635404d481
-EBUILD rspec-rails-3.7.2.ebuild 1441 BLAKE2B 3cf794cb4a3501ed6882defcce32e0d3e9be1fd78ab5b13e20cb5e8fd67801697a61f730fb51fada29bbfae36fa552e2553a541e085d06a06bee619591ef7e0d SHA512 a416bfe0d389d18d8881cd0eec566e57325401929d8497194dda1ef31dd20905bb5000804c5f5baefdaffa3dd2dd90e15a09dd0ba99a814efe07c4635404d481
+EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild
deleted file mode 100644
index 3bd3af117184..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.7.1.ebuild
deleted file mode 100644
index 3ed686593009..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
index 3ed686593009..bb19436f8e13 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.7.2.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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 5da36533e2be..9b6c7c0793ee 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-2.14.1.gem 4608 BLAKE2B 99889bb3f46f2a337ba3fed678920f56583d75e873f80f97afc06bf6eea826994575fd8f1c25841089efde7e7c10d200cd6085d23c2fc8c47ab7d34954d418fb SHA512 cb5f7b720860c7a0f9f3aabf08b2b6ebf0a6cd220fb019c4b9a03368b9fd5b8049c3a374dff1251d261f6d0046f120e574f59b16f3775a478c04bb691785f720
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
 DIST rspec-3.5.0.gem 10752 BLAKE2B 8c28574420f7beea0a8ff2a2c0237ea84c83dadee14edba229e8215e8620d801be941d5474cfd53357552f4210907cb15ba853bb88e3ad9b72d35b86c617c3f4 SHA512 0500f09e46244746967f5efebcfbc96d4cef14c5f68e6ad3d510e151ed83c865a3478ae6e42dec0f0793db7db52ae2394768b6b331ea5ca8d30bc19523cad5b0
 DIST rspec-3.6.0.gem 10240 BLAKE2B 334fb89dcc8926b264999dcdae231916dcf9c45515192b9a053a22a240a2da3830b46cb87430bc3f4a7368bbd0788e987f992e0f4dac3872233ad7d0e7f3fc6b SHA512 ff0208209fffe205038e75ea410d0a0c140d35f9dcf46b699d9359bb17b8d6e92c4c3643b8f99d741921dd4a4b9bc62e639f5d48f46e4e9c656dcab0f62fdbb2
 DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
-EBUILD rspec-2.14.1-r1.ebuild 783 BLAKE2B bb6ac53a0910d5a1da5d87e760d31692122803df0e04528f189355af98907f788c445f983fb0ae9fcda7f855c31708039c86230a51ae2c5f8a3bf4626fd0a13b SHA512 67fc73cd59e23f941fb56d27e03f800ccdd142bf52e27f8e5340843594f5855945de4a5ec11188e75786d35f8811c2e2105d8cb87727ec0e2dd7a31def01cb11
 EBUILD rspec-2.99.0.ebuild 797 BLAKE2B b868c665fca20f11f39eaf7a09afc7161e83ca3a8d437b2d809ede732a525d588da0673a5f99915162b7df54a98ddeac9ab13d41d00e9c4baeba303dd5538440 SHA512 74d8478777daf6cc609d632cc88b8f072ff5ddb5ec68286e84342c499b11d54494ead22d6a683ef09a10fe1ca976c1d9a28008db4a3fc1c5028f59871556f08a
 EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
 EBUILD rspec-3.6.0.ebuild 683 BLAKE2B ad7450fa20c0e8fd44ba9e63989c3bdc55ccbc945ca920c5f74aba3daf0ee836584781788f0ca8d0e7f0fc47341773fc55d379f4ffd7f242614866a93c0ac2d9 SHA512 2199c21070ef4dcff406764e7320a4e7fb1e4fe6c76c52e7486122ca3555931ccf108490cbc1abc928fc4c0d72830d2cbce0b5b41fe29f4ff2736880971046d2
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
deleted file mode 100644
index 7181cfac6447..000000000000
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index f184fe261232..09fe536eb47c 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,3 +1,3 @@
 DIST rspectacular-0.70.7.gem 16384 BLAKE2B 61783b9a6cfd4b8f190237590205e913074941ef65caa7a7f8e66e90ba7fd28553bc4168cc83fbe01ea526308b0adb8e885ee1786d6339d42e70406494cddf45 SHA512 dab67e89dd88cfb8741be10c385d58b3437245c623700f0d651dd4e96bcf28f063a9dd952098eb574bbadaeb077ebe7e0f9db7d6e83648c1de9a4f0c390fe567
-EBUILD rspectacular-0.70.7.ebuild 656 BLAKE2B 2f1246d3767f37eee9c7160f26b1a3b325b6829c9eb67f4f8e2d36fd324f565a82150021430f308e470fa8b7c33771c55319836dedc9658c1da5cbc5b0b23958 SHA512 bacba6d8faf53390753d1af1ad18348bdace0c3c94c4091c0f46c89fcac90cb49bf57874217f9d1d0db370e67274aedca6e3878b3aec882b9f3023c5aa94d53c
+EBUILD rspectacular-0.70.7.ebuild 649 BLAKE2B 10aa191b4587f8d171a3e4891af1620ae1c46f28802172957d3078545f622e13f7fb88d96c4ecc8b6ddf584cb85997da9c3f0a34316d4efbeef23932215ce5e4 SHA512 83e633aea3e32e53e1352a4c9075f5bd05bd4ce003248d4b413e76a06b4f76b01074cb9b4cfcb4e195ed3ceb99dd413dc7ac9448e3f814406bef6cc6ac6833e8
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild
index 675f377b7356..bfd32a92abeb 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 43842860fd56..8e051070f77c 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,7 +1,5 @@
-DIST ruby-oci8-2.1.8.gem 249856 BLAKE2B 7c75953da2b5418fe03ee6e576e94db0c58d18f2fb078ae30d29879befacb4357ea4153ec511dda3be1b5628353e32cffe903a57ca54f4ba80be27c840afe85e SHA512 897e5b86106b45e12bf359b8ed379a36a1c457daa1de9e7a8431f409ec25b12b20e30ed254a2bc77ab1abc0731f1c45e93860a36e0e6903c6fc7573a9ceeef9e
-DIST ruby-oci8-2.2.3.gem 317952 BLAKE2B 13d49364c6ee3f46dd8b54062584ca2bf32c236e2f4429f1fa1bec46c0ece220f3fbb214d739703565e0356581a6a9ee657d46413c14f76c97e10b22887b8ffa SHA512 67323ba01bb30f5e405f8b4b4e0d1749cb8c96a7b158cdd77079936e73ac651e27e1df2c0417cb20ec69fcd997a92113757c697b4e5e0b2f498c2a18da400fc4
 DIST ruby-oci8-2.2.4.1.gem 325120 BLAKE2B adb8eb38a1368b0ed305c9173c9e68f60845f454c618ba54b64c95bd6f7d1f9507c38419e5c334cbebca67ce38e7d4edba1dc4778a742147ff512bf32edf4d30 SHA512 54323843ebd3f7252b6d96cd1136752172f879bb6a67842c38e3a84effae18fddb2350be2ed4257c1db5ee54bf7678a098e2b1424508d3e597778e874bcbf20f
-EBUILD ruby-oci8-2.1.8.ebuild 974 BLAKE2B ac4a846c860d161d79ce5a57a909f4a9d82109a1512431db6c64e89308c8c4c5816bfe2e0ac6b9e9e500c2a65ebbd45d348003bc4c449af273da32eb38e1bc26 SHA512 c1f0583fe4cdf89b7b391b6a5f6fa4fdcd2374dbdeb38f161a2331a7446dde80fcd01ffcc122857e1284bd39ee01f061bc90a3366ecb49bf6abce37beb736cb6
-EBUILD ruby-oci8-2.2.3.ebuild 982 BLAKE2B 1768fc6d237e381ceb3b85a5eb0fb17917abb1cdde89db3d53e662388facce293ce943e424cba046662d55a40ea43fa91648ac4bc3f7929da957c8fd41504849 SHA512 4e4535bd56d1a3754287a784de43019788854274391828d04ecdcbdb41837c3e233879bbf19faa7b9caf8e95345fe67cbd3996d2e764f9863c8f343a8ee6ee8f
-EBUILD ruby-oci8-2.2.4.1.ebuild 982 BLAKE2B 05abf067285338211de9b2648cb1b66969300a6d7ddec9f3fa1e8a14a2497344366d2e5a28a99a09334b038885cc8f9b9fe8120d4b8071513347484c907696cf SHA512 9abef225cbea9efe169e1ee12f5709b43d9b77a3b76ac85e2778e93642c93f6defc5c22f6bd6a9d179bebf5ae728e2a92380f5ae80b86f87979b77f1e32005e6
+DIST ruby-oci8-2.2.5.1.gem 329728 BLAKE2B e235d2b252673962618d8a7840b10c62944407a08bef02a47cbd3fa091fc41404b682d9f89ff42592f16b990ff0e051d0a1b4c87409bbd2429ced488a8e67696 SHA512 e868fae291155f3fdeff2acd948fcf3e56d9dfc5ea9c60e40cc9c742a82fc924999f788b2765088d31fb680c9e192e37e6d12c6dcedd2ed1f6aeef4c8c9bfe7a
+EBUILD ruby-oci8-2.2.4.1.ebuild 981 BLAKE2B c694bdf96e4c931cd5795cb2643dea9824290ddd33663a8624dad91a88a602829e05c11eb7474b0063976f4ec26e476f8f3dd3f8a78504113730cc0e440a7e4a SHA512 fe5735116572e937e2520cbb71c9bff3a325c72f646993f5c793611ac9312944d2409c5ad156875c95f02a7b7436ba0dc8248c447034fdee16391ed8f6fa5f06
+EBUILD ruby-oci8-2.2.5.1.ebuild 975 BLAKE2B ddd511ccc9356d7a6d9a64f28702dcb9684562970213ca2a3f9dd5a8497cc2b3cc6ece84b920e062a78e5920c7d125b5542490f33ce61cf9b4644b9a0e403ba4 SHA512 d9dc71c3b3e2127dc72861c60ccb62c479effb179267f7ff41b5073656276199692a4da1d631687fa759f6d689df2243e3ff97e081e551114198cb42cd6ba313
 MISC metadata.xml 651 BLAKE2B 4ac983df534d442e63e0d6b9e664b51b2ebda1be8345721c684d683acf5a7cad953e73fc1064a7706cf43406e4439cb5f09f749a6e3efdf3face5edfae0fc61a SHA512 596959885bbdf6aa103b16ac124de1929f7d52a7df1bcbb9d28ea9442e693cf44780dcff0605d256461c70e7d2c183f5dbb930a2f9e498ed3602b3a0aa9151fc
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
deleted file mode 100644
index 9988c947a842..000000000000
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-DESCRIPTION="A Ruby library for Oracle OCI8"
-HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-db/oracle-instantclient-basic"
-DEPEND+=" dev-db/oracle-instantclient-basic"
-
-EXT_DIR="ext/oci8"
-
-each_ruby_configure() {
-	# configure the native libraries
-	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
-}
-
-each_ruby_compile() {
-	# compile the native libraries
-	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
-}
-
-each_ruby_install() {
-	# install the native libraries
-	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
-	# install the gem files
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.3.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.3.ebuild
deleted file mode 100644
index 34f8c9297913..000000000000
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-DESCRIPTION="A Ruby library for Oracle OCI8"
-HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-db/oracle-instantclient-basic"
-DEPEND+=" dev-db/oracle-instantclient-basic"
-
-EXT_DIR="ext/oci8"
-
-each_ruby_configure() {
-	# configure the native libraries
-	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
-}
-
-each_ruby_compile() {
-	# compile the native libraries
-	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
-}
-
-each_ruby_install() {
-	# install the native libraries
-	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
-	# install the gem files
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
index e46cef4cfdd8..9427db0ba0c0 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-db/oracle-instantclient-basic"
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
new file mode 100644
index 000000000000..6d4c7da62af7
--- /dev/null
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+DESCRIPTION="A Ruby library for Oracle OCI8"
+HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-db/oracle-instantclient-basic"
+DEPEND+=" dev-db/oracle-instantclient-basic"
+
+EXT_DIR="ext/oci8"
+
+each_ruby_configure() {
+	# configure the native libraries
+	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
+}
+
+each_ruby_compile() {
+	# compile the native libraries
+	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
+}
+
+each_ruby_install() {
+	# install the native libraries
+	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
+	# install the gem files
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 5e690ec51c2d..4dee8a0dca40 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,9 +1,7 @@
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
-DIST ruby-progressbar-1.7.5.gem 21504 BLAKE2B abb50406df3b952327bbacdb4600a66751772ab3c22053a172150618cfb36e9aa567461ea31772ae74372d9b3df4d13419994fd8597c9f0f10ea090251493e6d SHA512 1a5cb4b8ca9a9669bdaa60fcf3f01bec347b4ac1aefe737a7c6014bf40166c72d74ab0f489638c12ffd5245cc2b0a19186f7ab440bd7629579bf00d5155a8741
 DIST ruby-progressbar-1.8.1.gem 26112 BLAKE2B 2e4a8406328f07b2be0b59b5d08e8f56e17d4e5ae43325b4fadd563427aabde1e354fb05e6e67403c9f00c17e0f8e3239cdc3d0cb40d4c8cc6520306214289b3 SHA512 bded41f29ed3386b83b0c4fe208813de330cb6be527c4b91cbf436f44d0efe58cb717a783d104f32b697fe1d9b71eeec500c8a72a9a5b34fc416c86e7565bc01
 DIST ruby-progressbar-1.8.3.tar.gz 44706 BLAKE2B ef0b7bc2647da5af777e4ee88b85632ad47d7bee3a1b5f3ade57108362b663a66a78b023080039a94bb452694b41be3e6d52da1e322d1e6d86a2f28ff8aa7fc3 SHA512 c8394c9be76e00692e3e51b27be92b0aac9baede288ae514a2656a7880df61fde44f07cf16395c69a5215c3cdeb6474cce106af054be9c6ecdfd5887150c111b
 EBUILD ruby-progressbar-1.4.2-r1.ebuild 593 BLAKE2B b5d824fcbc3b51ed8b09b13290b89c3a5b09e885a605c4a7a82b1ba444362863f571b38259779cf4e6f7ff4b92b8918eb5f57fe30be725b0e58eb1e2a320cfc0 SHA512 638efd6eb6d6658f278f7d6232c913ce70782caa0e10bc44ea2c722d3e2b9cb14d6eb5787a2a958a128916c0a30713a0e8b5bcfb1ae5c3d528c6432f16c5926d
-EBUILD ruby-progressbar-1.7.5.ebuild 932 BLAKE2B 539600a2ddcb82f42e9b19c237d2eefa015f30217477ea483c95d57a5cf91205efd4babf342a907918a209295deadb462859f7375206dd661bd0eea8d95f21ca SHA512 4ec40d880be60ddd0e5df11342fa00b29b0fe97ad25d6c589a21357a53c3429df4f17be45e22b755f0646ac539baa57be000183958352c3344d082902c5c7ac9
 EBUILD ruby-progressbar-1.8.1.ebuild 723 BLAKE2B 32793da1bc5542cd0e22d250a37a9ac44310afb012a1a1c02a639d03c22a642462fc7fce55dd0024cf55d5b612a39348278ec038af36723ca2ac44e52d862d02 SHA512 c556256ab587d6f01eda25c6eb3cb48066ea15d82a35bca82d5fa36a98b2c75839da2f5a7d3e84ac0da30d81beef7f3eb80990e16e507bb8c3ac4b65a974e199
-EBUILD ruby-progressbar-1.8.3-r1.ebuild 885 BLAKE2B 41d8f0a6fa50c9cc2dde061e5064a4354fda3e1b75ea2d6df21b907aa1bd6c0340fbc19afd939eb0b254f4db214189ea6d404216fa004c7329d7515c5cdfc24f SHA512 e2ca16e101bf6e00d3111feb7eff7dba21e49ddd6920a0b97c549c15d751e685c64d643ed30a74e9cb8213d5c9829bda4f735974786250b6dae0111456431a30
+EBUILD ruby-progressbar-1.8.3-r1.ebuild 892 BLAKE2B eabe9a1b6cf1e6ab5fb51d460fd094e182e1510529905c515bd37bae25fc7ceeeea4c6b69c4d56f964e8846211ade9607535451aa1f75c79187940a0193bc020 SHA512 8a90c3af4c45e40d5d5820655ea4e0b73cf0056bc500b54878675625d56cdec9c2cffd91940c4ae793d3d656413929d1995fc772bc940ae31f8a610f4df8b233
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
deleted file mode 100644
index 3d5a68f380d9..000000000000
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspectacular )"
-
-all_ruby_prepare() {
-	sed -i -e '/warning_filter/ s:^:#:' \
-		spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby20)
-			# Skip specs since rspectacular doesn't work with ruby 2.0:
-			# https://github.com/thekompanee/rspectacular/issues/4
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
index c18decbf5958..80a4fba0aa66 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 8ce0667c8092..5dd998c61ec1 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,7 +1,5 @@
 DIST sass-rails-4.0.5.gem 92672 BLAKE2B a10dc27ff95122bb2e4518c927c5a81d4a5116bb70d60e68a6c697a7dc10d2781e2b2b702e8b0fe79d7b4562126c0f9d4c0172f5a8a604ea525027c1c8853465 SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5
-DIST sass-rails-5.0.6.tar.gz 89862 BLAKE2B 2626331eea22031d767b235d0187c3d8f4b12b0a74682bcab8fbeac46aa62d8021baca247442519056b6c0617a76b76f917dae38ec5026cb98e14d04ca61d6d2 SHA512 97b48e3b928c4323007b7df7f6e51d5a1c1f16c5f9276786bdb6b3a4f293ec73c4c18037cd3cd5d0bbdfa3ec92f44a8793606aba9cd23f5518b637cdee58c915
 DIST sass-rails-5.0.7.tar.gz 90425 BLAKE2B 8aceff670ba2e4993597858b74362a02307e39ac967a331005f21d384644d0dbdd414560abaa88e60d35358b47d65c146baa72f37c879a2f13178e187cc1f79b SHA512 491a1618a75becf6095b102c996e50d25fe701d3a6c1b6c6fadff81c6c09260c3ee6ff9c84abf7bc62779fa7034d54d7c0d9a7c4148d3cc741d83efda87ec0a0
 EBUILD sass-rails-4.0.5.ebuild 842 BLAKE2B c475aaaa4b5a5601639f79b1750c182e43246afff86e34043a324b172ccfe5a174e3b7ad08c0207c360951e771c371ba7721aa2532d1d95b850e523ae3c4d3db SHA512 39f80de84f307ebf5b2973e07ef994b07fe621a13123fa4ea61eb056ead7a0cb469e3b75766ec8d56ffcbe04d92bb28e0e3a6641cf6f053f73fced6765da10a6
-EBUILD sass-rails-5.0.6-r1.ebuild 1134 BLAKE2B f417c4833a1276539bd32164328f98271bec994d74021046ee4ae5b87459b525683dd36563e6dfff35e75302518e15f9da13bddb06ac0ad27786f2b1ebfcdd59 SHA512 9c11b70d9096f51f9c095c925f8e7c9f7ed9c0d726f789a5979169e6ab980dc7ebfdc75014bd737fc5a28cb6e8f1d5e0ab307a5faceffad6adec2e615c4535ee
 EBUILD sass-rails-5.0.7.ebuild 1127 BLAKE2B 5cc36c6263cb67f01e789166dcbe54d98e3f49f44099fb4af4b222b9e003d331e15198796384a0dea89c0017dded0b9b2a47294425ad3dbe6572514313c647fa SHA512 e7a209a46f779b5a662bde8c0e2abe8d4ba965387ea5a5ff02b543b5ed987b7ccdbdac56e0e5da165aab43f6097bfa23005b3f8684c99e9583405661490bde2a
 MISC metadata.xml 342 BLAKE2B ada4b20d7341b3ce1b6062b13b4e2e3bbeabd0d5c1532a1d488ba4d25b4de5b940e2632a84ba7a4fddaa02439308dd0c39d993991a3f29f45d4e6bb5a2c66a84 SHA512 92d0e35a64810351db2a1d71d32b1c93cefd2689eee3bc4eb275c9fd016aad8fdfaeb0ece230a5da7d2158f720d6715d2f15b14bf3c7e80c0211ffc895863920
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild
deleted file mode 100644
index bcdf529dc670..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
-	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
-	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 3996c313a760..7aef3e9ef454 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,3 +1,3 @@
 DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
-EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 2d5d5ffbfed3191efe887cd2d2648ec6f259ce2b7d93afb07d2dec2e7d1eacaeb0b36e75be6de42f2afde5995913183deefa5569ca5f2adcd8ab4e46988b1143 SHA512 85435547215b50920ed7643e72a8a037d55672fbcb3198c38453befdd0337a31f552048271df916094f1b238a1300f99da649282590bc99558148f0b6d66251e
+EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 080f280d4ea39662e789caa9b1ccb3d0eaf877434a907355eb6de26d1770af35419c1b26ef0b0f318cd4e0067bb0f89a8b189befdf0f703aa41d3fa97c3ce425 SHA512 120c103ce8195837a26d7ebabf9ad143b67058eecf70a188a030d86f6be8837f4194fa60e534249b52c65c970da4a5c552d795cea6151f1e364108e29942195f
 MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
index f98ac74dab1f..c7fb7102e591 100644
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ b/dev-ruby/sfl/sfl-2.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 6ee1360cb109..71399ce93253 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,7 +1,3 @@
-DIST simplecov-0.13.0.gem 55808 BLAKE2B eebc4d6dd7ecbe6ade922bcdf81b74a4c159f5987b46925f71a3dfdb17d11a228b6c97a4a0a4258be03163a16a1786949701d92904d58f580b613fb06c0710c4 SHA512 9cc7f88e1a8b793d69e4fc92610805202d68f1c883cdddc7ae9426d250ebd68d72b61879801897748e26750db04f51d3dd0332fe807dab6ec0b2c982b8693d69
-DIST simplecov-0.14.0.gem 58368 BLAKE2B c70c72b9a8275564427df0f7c9bf4590359ecb62ee53994c328facffbaf041548f78f02be28f556d5b815ddba52947d9eb355b54ef4f1be6b2528024a96ae22b SHA512 ce0c1960f65f15c6271d9ad75553332e3ae256ba4c28d5c4255eaf6ceb5f0222be1bd79b7773373ac30549fa9ee9fb7f471ff69eaa81359c019f96f525856cad
 DIST simplecov-0.14.1.gem 58880 BLAKE2B 61882c34341555ce47df82f8931a8c457d0c6d69a143fa4c9999ff0b3aafb8510d2957627e1dfa9e3819c1509670fdc0a062021eb6655914cc935f9abbd584a1 SHA512 7b62fef6df1d3b395b03a5444d65430ae645aca7c13e6694f4377b35a82c0b4503e5d53a94512ff06e634a6d81331a8bce31787dba793517ecd3e502220afbaf
-EBUILD simplecov-0.13.0.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
-EBUILD simplecov-0.14.0.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
-EBUILD simplecov-0.14.1.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
+EBUILD simplecov-0.14.1.ebuild 999 BLAKE2B dfaad6b5f99b81d6f084baced7a1e663fbd355218ce2c5a73865ae8a43c227c8da1911520ce19c57f155ab5bb5a7fe11ebd5838a9212d82837b2bb9ba701e0bf SHA512 dcc3b1db6df4cec60c4fa9d1f61e57e95c19a5ae7361905577a84e50ce393b36a5616814b10bf164a228e72d8b2cf4b899fb34694b03d6f29ee33cb84205587d
 MISC metadata.xml 345 BLAKE2B b1b086ff87954b47674d7c4ea2e3179d43c10fab22383c937600b0b83675a9dba5434dc9425a1dd1bfff27c8bb81d36fc558523a0b80ed818a37ff9585dc094f SHA512 ca0ae8784caca2cc0091622a5bfa3796600239a0d81bc5338eb36f743db99f36ba7b50866b1de1cd2ae541f2c2dff96c648f5cdb0661ab766501f4c757d2ddd5
diff --git a/dev-ruby/simplecov/simplecov-0.13.0.ebuild b/dev-ruby/simplecov/simplecov-0.13.0.ebuild
deleted file mode 100644
index ec401c929eae..000000000000
--- a/dev-ruby/simplecov/simplecov-0.13.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Code coverage with a configuration library and merging across test suites"
-HOMEPAGE="https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0.8"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
-	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/test-unit:2
-)"
-
-# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/helper.rb features/support/env.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
-}
diff --git a/dev-ruby/simplecov/simplecov-0.14.0.ebuild b/dev-ruby/simplecov/simplecov-0.14.0.ebuild
deleted file mode 100644
index ec401c929eae..000000000000
--- a/dev-ruby/simplecov/simplecov-0.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Code coverage with a configuration library and merging across test suites"
-HOMEPAGE="https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0.8"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
-	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/test-unit:2
-)"
-
-# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/helper.rb features/support/env.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
-}
diff --git a/dev-ruby/simplecov/simplecov-0.14.1.ebuild b/dev-ruby/simplecov/simplecov-0.14.1.ebuild
index ec401c929eae..f654c61a46c8 100644
--- a/dev-ruby/simplecov/simplecov-0.14.1.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.14.1.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -21,7 +21,7 @@ IUSE="doc"
 
 ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
 	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
+	=dev-ruby/docile-1.1*"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 561c87661dfb..6b9e6d5642d0 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,5 @@
 DIST sinatra-1.4.7.gem 369664 BLAKE2B 6b397a440c0ba2016127c38534fc3dde2198d286b2627b8333024d6df10c2a0c28ae0c8b49ead224f0b473699d331fa8993ecaa022b372bb2710e33c4ee9b3db SHA512 f13531390af95e0bb42f7c5cc350e3aee7136c1bb81b487ef71cc194ed6675722a1c23ff6b65ac0e3b2c1a0986bfa733c4a0f24cf9bbe0168a18cd4d18d8a13a
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
 EBUILD sinatra-1.4.7.ebuild 1144 BLAKE2B 762fdaa83a90765a87c265699daad1d2bb97aed7c20e996ebae625e38b0d72e9fea90e6e7e639ff418c7fa45ae03b51dc633f2a889a93decab1deb7e9758fe76 SHA512 13e8ed290ba2d06d6d2fa0cc60e6a51bdef831827b23ccd5e220f019adebaedfe39ea6f57487a1e3bff5286b479ea3890181e9cf62c1547295f9cc79a63e17b4
-EBUILD sinatra-1.4.8.ebuild 1272 BLAKE2B c1987fd4ca29272dde927759a6697fe70a7db4e40a6578bab8323dd20367f67f8e25a338bc01d39867e8ba3d1f7de7059edc0880d3471ed0c275dcbd636a79ec SHA512 1f43db891e4461f403937ee5ea807131060b7c92a65065b729fef267006fcf92cff4e071949f39a15e7eea93b0e6df4631fce9362b821d829c204b3a46777455
+EBUILD sinatra-1.4.8.ebuild 1271 BLAKE2B b1b32083183a8cbcf51c91fc6d152d8df6caab59c19e7437cddf378ad2bc4332e7f457b7ce390227a4d3191a204037f5abac6ec3ea4116f8953446cb66ea1fd3 SHA512 cdbe55ac9a8045233bbaceee9f004cdef4584195dd241db54be18360b39221c51a0e31f2ad02b5ef75ab4987b4b52b04e2727da93ed940efc4b900c2e286fb57
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-1.4.8.ebuild b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
index 81a2a696fb08..5375a143bc49 100644
--- a/dev-ruby/sinatra/sinatra-1.4.8.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.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
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.sinatrarb.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.5:*
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 9907cbeef60a..71450dc1e1c5 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,7 +1,7 @@
 DIST slim-3.0.7.gem 97280 BLAKE2B 8346e2dd6330b597e0c1f0d4257978c1acbe38014c2fed249a9137b73ca8ee4945a63e2c1453144b7a9acc3f07a755e2ae31622c6b8d8e5554569a01d7d142cb SHA512 b410ed35941a3cfc68f8ab5649450381f830f94c8503e062afcd097f5a669df4cf8035d0baefd42bffaad5d12766baf70bad3eed82149fd861f615649ee469c0
 DIST slim-3.0.8.gem 99328 BLAKE2B a63191186223e32f36cc19b9513b22b2312c9d848aa39067d687cc92b46de9415c1d8cc618cf4b79547405b1899e4b5fe7bcb9b142d6e2a7a7cf101af2df618f SHA512 c9ed748c221f1bc25f3442900e93db6674520388c8d958bb40516172b97da042cd2e20fd924f9c85382b08eb39e399ae675c4d4e0b1d884ceef7339697345dd4
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
-EBUILD slim-3.0.7-r1.ebuild 1683 BLAKE2B 401501c7654d2c142f2b01fb1e9e793a5fbdf5877e4fab97bc5453f6aa742b9bf45dcd4b5823c586c6b0f5702280c8281d62b51d5725e07b12afeba672d10a16 SHA512 e09662ee69c1ce793f0e13f764754a1158dd2ea1c5ec68a72df77d01bbdb145afbd969f79c38124c272e8ad183b80bb8c7bb048b9b936f5806bd0adc2ddb38fd
+EBUILD slim-3.0.7-r1.ebuild 1683 BLAKE2B 73f77c95d292b746257a97cbdf16a243825083e35465c046dd90a88885dde80d8165a3d03df9d2fab1c4f9736c774d1dab7f731217715bdad1c8718483794d3c SHA512 00d7b9b3052d361900dab3bca6ef0236a17c4b10b366ee1fe79a4f863689d008de7a37aa53a7c9dd5b8238157feb44194bfc5a1b5ef4182e62ac075ab7605a8f
 EBUILD slim-3.0.8.ebuild 1588 BLAKE2B e45ac0134d76e10ec6ef9f40575d2921ade3403759bf43902b098ed8c13bd95a152a6cc6d414d65344697ad9bf79b1ef7c1a7a7c3bfe55c57666ad8b64b20fbf SHA512 d784f569a9b17d934d7f1bc11ddf31af127c759812069acc4cd4186678ebcf27b90437f216b02487a91ad9be3301c1de94dd9c66d3f37f7f5d34af7a12158f43
 EBUILD slim-3.0.9.ebuild 1581 BLAKE2B 1a5bd8f0cc477c674f616cc1aafad073222f8266375bd79a04922679cadf609e4b89853bbe888809b7058cf073b5981a85ea7828b59eb3f4ca6afa61c2ca0d93 SHA512 9309a3192fc49b1514dc87c86bd3c7b1a97454f5387eb4804fc21f37d410fdffa638c60996622e310f30a9aa26dc2c4e7c7e3bc4e97124caa02d0ee826629c16
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.7-r1.ebuild b/dev-ruby/slim/slim-3.0.7-r1.ebuild
index 7b9a00738407..7d61c772992d 100644
--- a/dev-ruby/slim/slim-3.0.7-r1.ebuild
+++ b/dev-ruby/slim/slim-3.0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index a4e6b7c3f817..837485af1d62 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,5 +1,3 @@
-DIST spreadsheet-0.6.9.gem 160256 BLAKE2B e669e020e7df13ec9826b06e311d31ba13d000630185f98623cfe344fa2fdf515e0cfadd7c6a1e0def0f882c1498fc6c264df55ecc99d097f941eba8c642aa3e SHA512 9400908153a671cfcf17dd9dfa8db7de0a9c95281ba6dbee1ac8002e9f0058616e5887e36eb2e1e2c790516731117d5a0f7efdbadcaaea3c69a8f9aa8d3091ac
 DIST spreadsheet-1.1.3.tar.gz 4655837 BLAKE2B fdb28822c0d40eaceaeccd7ecb7861fa7ab9cf2f775aeca2f5fa00dc7932d17f1cbf5298aac4458109bada8e1d97a5a537f9054cc947aa4140dde3ae260556e3 SHA512 c1529318384c4e48abe20aad21aa80d652ab91bca505379c310707fa23382654252bfc04d1f8bdb7aa6ec00d0e064790e3ffdcf1c1089bd49010e79729a36690
-EBUILD spreadsheet-0.6.9.ebuild 768 BLAKE2B e8cbe6a6c44bac27a814fd44d4793c591bf26ab7c5d90e3a407907134b4339c9e2483cb2dbb09efc119d252c07a5d9aaa4603ca4ed161611658f4d96f8486895 SHA512 095f922312704beab8c4bcf17c48510b313810474fa9b0005a64a962fd8be62be88850dbf8d2b1d00bc11757062d36c97da933bb9771ed43ca709153238d5381
 EBUILD spreadsheet-1.1.3.ebuild 851 BLAKE2B 475e28dcb09dec4a4c2c3694f5a882a54b654fcd85b870ff0f0d83e115f8dccd51829aef5d5ce9ab169a6074ecc779632963154ce63069fa326a259348269678 SHA512 31cb85c7478832fa0beb9e4ff691583f91fec1852b80a78784011065f1c6ee1c65a2c61ce95a5586e9f77ca32142c6097479415b3c751eb5dcc70e5a9758995a
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild b/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild
deleted file mode 100644
index b49c5b4c3ec1..000000000000
--- a/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-# Same thing for the docs whose rake target just calls rdoc.
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-RUBY_FAKEGEM_EXTRADOC="GUIDE.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to read and write spreadsheet documents"
-HOMEPAGE="https://rubygems.org/gems/spreadsheet"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
-}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index c140444a4f79..0743a7a8b8be 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,13 +1,5 @@
 DIST sprockets-2.12.3-git.tgz 195647 BLAKE2B 332855d9505456ddf2cc17e8027c1a048ff503c82deb4cb22d0df1d1711a88db11b2e9b3a102843e1affc8d4c676726344f5676248ea8a3e8de57746e4fba4e1 SHA512 fd9544ed946bdf95968f198e74a36b682613d68e29a46708fd46c8b58792bf52526936b4c8d9ec3acea8f7cce789a69bcf4da3269741d43e186001061cbed03a
-DIST sprockets-3.4.1-git.tgz 298315 BLAKE2B 4f904fc8f1a252f85495b09d8889a4fa61e7c2ece55e8f00fbe388793dd084ac7ececcf283b7d62c9c660ac427263c723af61d52f9aae560fac5cdef2e4066d7 SHA512 dd8bae1d922b662ef3215742731024d13b3fbc435124bb25351eeb6d33363383cb630ff60a8f6199205f31ed484e76c4a40d2c8a02b05e35bd9e73eb43a951bb
-DIST sprockets-3.5.2-git.tgz 302784 BLAKE2B 189d590ca7e36cebdde3e3a2497946f55ad620cfd74f7f92270438afb26745113936037bd684c1ae93d842ec0d09a2713e35353d2ba98122e935c33639343d43 SHA512 8e599cf646baf53650ecafc65923d7e92c0d04cbf7207f64a0aaa4098d068ce4a1c252c5ce879188cff9d9af6f88ba50fa39d7af643b2668f23b1b8535a284c2
-DIST sprockets-3.6.3-git.tgz 367032 BLAKE2B 0d8846cab53b2f3e89b08988f031e8331b958d5e6d6a6b13c18244f57e841d31ee0dbfe28346b898da04610926301ab0c5ff8b5eaad80c8b08a2351e9c9e81ab SHA512 4e497e87e0a5e93baa142071bf200810b47ad26dd9f431dbcda8e332629d971e94d43da2ebd04331d7be7f6807a4c707bdd0cf33303aa689da8996be26adbcac
-DIST sprockets-3.7.0-git.tgz 368648 BLAKE2B eea0843ec57712e330e137a52c949d74131bf72755c5531ae154c4def707a6557466fcdc64444ebdfc3f34bfe3418ac8fec6255e6b23a6ec20790661c04b8275 SHA512 ed9e2ee8515a69e56816701182502b09fcad25900a6f77696daa32e943d6ab0ec01cae9df2592373b00f2e28fbc63c7476ffff793702a9d6857f38ee913781f6
 DIST sprockets-3.7.1-git.tgz 368910 BLAKE2B 1411f0ad02da1fe6c3774a3c7fd689b174e18ef72a2a032eccfca2c9b4bb5298312488cd97511572e7785e7eb1b00b6accce90046b2d59b91edc8b38542aa0e1 SHA512 b766070806d62ef10839c12c0e1ba31b3553d014fc45df27fe7dc678d6980b8da3080733b1bcc3d40b1ed9d41550e45da7a365d10fc5de0b1eb88d769169cc3e
 EBUILD sprockets-2.12.3-r1.ebuild 2387 BLAKE2B 6bebabb98692c32068bc0001ac1bbf097b49f884dec8a47a4249cc6625a5950c9bfc74337e9086e4b676ee49325c153310a5d3303a118d85e0793cd7efb35c66 SHA512 44eed9b85ee296118f9679b8269f6fa3eeaaff00e301efa69bb6f3ff46c4659eb2c77549505061f2355646e7418cfefc8c13b2ff9c5212d95ddcebd8e8526288
-EBUILD sprockets-3.4.1.ebuild 1612 BLAKE2B 0190f2871c0b110a8c6db7ecbd210d737743beb92bde9493a209fe60b69bb74022e03395f7757c1985699e1f0070010b98bc4c4c1776219779bf69aae733b101 SHA512 29a11f2a50e5ec7bd768b54221796eea8fe522a191794ce8d976ec5cdf42ae37d6a3935de2529a4c4804512d02d0cddf8f0695da9d91f0b701f5a8d7c06e8e25
-EBUILD sprockets-3.5.2.ebuild 1623 BLAKE2B 2fd21383b915bebc424d823a296e9fbfcc2ce019faf6e98aca1eddaac8e00bcadb466d600b5f9180ad5f6b59b760419a71fe750961231ed0f55660b4b3bf05f4 SHA512 a0f8082eb02853b9802817dd281421ca4979f94a3aed7052b9470fbc1527adb568a4ea645bcfe51fbf677a7b161578f913ddd159ef7ca9a816a39dd2044a6cd9
-EBUILD sprockets-3.6.3.ebuild 1689 BLAKE2B d95adfba0f54f800f6bedceac4db5b876e276947f1796eac8db7cb168c46a8d2e882ebf0b23f02702ac30abc286a52a755e49fe180c088130b05a5f3e2e563f7 SHA512 e661c692b0aebacc5f0fc5f75cccca4365acae44f8076b3b50c4a3a2438f075ae2bc959d8e93b37ac9713f74420654f741090e591877ed609411b6845891b812
-EBUILD sprockets-3.7.0.ebuild 1689 BLAKE2B d95adfba0f54f800f6bedceac4db5b876e276947f1796eac8db7cb168c46a8d2e882ebf0b23f02702ac30abc286a52a755e49fe180c088130b05a5f3e2e563f7 SHA512 e661c692b0aebacc5f0fc5f75cccca4365acae44f8076b3b50c4a3a2438f075ae2bc959d8e93b37ac9713f74420654f741090e591877ed609411b6845891b812
 EBUILD sprockets-3.7.1.ebuild 1713 BLAKE2B e0051458ff89aada71c0d71ac4b3bb03b156ef80deab750716a8d18d0f6087507457f8f077d2ef8aa07229e22840ba75e4f567541bcc8a56a1015e80415457e0 SHA512 53c819dc0c006f6ed682fed08c034dcd761c5444b235b4e6e04dcf7bd879d5e506eb1d0c0e731f02c95acccf2bae9e938442ebd0f3a0235c278ac7f1842701a0
 MISC metadata.xml 341 BLAKE2B b649927de729737d95d006cd0f45484827a9628ca6cdf92589986b371059bc424f9888a5c727396b7aabc0326e94cbbbf0cc49d60c8e4c8ff09f44dafdae89df SHA512 4339a35e1af44e24e5b447c3a331e79609c0ece1b9a1a54a1e23a3c40eca5d4f0b3d788e965f102115565c45a9aaf3c59d8b1997c61bf584d1c3545f1e9fd55a
diff --git a/dev-ruby/sprockets/sprockets-3.4.1.ebuild b/dev-ruby/sprockets/sprockets-3.4.1.ebuild
deleted file mode 100644
index c16abcea54c2..000000000000
--- a/dev-ruby/sprockets/sprockets-3.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.5.2.ebuild b/dev-ruby/sprockets/sprockets-3.5.2.ebuild
deleted file mode 100644
index 34cc94d2929f..000000000000
--- a/dev-ruby/sprockets/sprockets-3.5.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	=dev-ruby/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.6.3.ebuild b/dev-ruby/sprockets/sprockets-3.6.3.ebuild
deleted file mode 100644
index 06204c4cbf44..000000000000
--- a/dev-ruby/sprockets/sprockets-3.6.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.7.0.ebuild b/dev-ruby/sprockets/sprockets-3.7.0.ebuild
deleted file mode 100644
index 06204c4cbf44..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index f7105fb30338..f13103fe99af 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,7 +1,3 @@
-DIST sshkit-1.13.1.gem 147456 BLAKE2B e77a88dc5fd09198a5e6def16947a3624fcb70cab8ea6be9ae66be6613d93da47e3c4cb4cb13fbdc7a4c620dd0065e54bb54135b3e44f41883ca2caaf40a5133 SHA512 da262cec2c32978a2f315d97ff174e47fbb131f26cbc06f894b3f3119797cd330c48aae1461176861c862b65504b9811fc492b2e162e9848fd09e62ef5ba8a5a
-DIST sshkit-1.14.0.gem 147456 BLAKE2B 0b5c5c157201ace57b3a107a24f08250c3906442eb55a0e698633a6114d643aa81e156dc8c5057c890bc78cf2c4c2ba8a142111c52dcfe5a51e1490df1df2304 SHA512 bb0934dc87e02813e24983aa21b9d508c612d3a84d9efdb342d4f73989e9ebf0177593b468391192223abb3930a1286040d996f4480385f129cf933feaa85d45
 DIST sshkit-1.15.1.gem 147968 BLAKE2B 52bde587de6a358174df6d79df8b8179960811d68ee933655f9df82e20e47481e9f32401276e613d97fc7327fce3891ccc70fe514ab8f5b2a30aff1f640ee139 SHA512 acac745b7ff1cfdd054b683219ca68233e1453430ec0bfc1efc96cb009ad257262c276857d9bc02854a6352a98feda845d728ae63e8b046a09210eebe8661665
-EBUILD sshkit-1.13.1.ebuild 1189 BLAKE2B 4af33f633865ba5c97ea7ef322b5c9279d5a9382a8d01ff037c68f09e4821211d80d4b335a5fdbf065131e54d34ae703ff4c88eb17ade22c2457dcd3b970d786 SHA512 889041cd10fcf37c1c3c7531d94e5a0f7aee2c894f902bc465b377630b16d6ff97ec199fcfe9fbc74377f6afafc08686d66fb16dbc3170e94faa8b89b31c6b03
-EBUILD sshkit-1.14.0.ebuild 1189 BLAKE2B 2a65b644bd1f7acf3831be2655cdff0283170f7ae1dbf97477c301c62dfffc696df16905ba9fb4e499674ff4e6b4e36552bd6d5b2084d95a24fc0a0f7fc4abe5 SHA512 2dfa73f0ccdd5205c0c7495cf36e49ee1e3a4a5b612d477e691d64cd4a058b192d9f08e5d54f997954ac366783bf71f90123a9a03cc7d5b8b917a1ee806ccd28
 EBUILD sshkit-1.15.1.ebuild 1182 BLAKE2B f8fa326ef24ef56145bab28a6c8de72a189adfe98b3fdfebc4ccd20820a6a0c2457528692206ac6b41f911fc271290dd9f81af6d190b65492cbba9a3ae689c65 SHA512 4f8ba190e3a1bb446b0ba8682efc4d8896b9fc72158491e463aaeaf6ab68f55a860af0fb50caa376a85d095ebc6d49bd6c716691b6a2715ab41b03614f0daf23
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.13.1.ebuild b/dev-ruby/sshkit/sshkit-1.13.1.ebuild
deleted file mode 100644
index 3a34397f996f..000000000000
--- a/dev-ruby/sshkit/sshkit-1.13.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.14.0.ebuild b/dev-ruby/sshkit/sshkit-1.14.0.ebuild
deleted file mode 100644
index 1fee1e1dcde7..000000000000
--- a/dev-ruby/sshkit/sshkit-1.14.0.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
-USE_RUBY="ruby21 ruby22 ruby23"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index 6c461cbe5202..b330827fc8c0 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,5 +1,3 @@
-DIST test-unit-rr-1.0.3.gem 15360 BLAKE2B 9580cd202694638737e3107397ad2048366170b5cec5f230a2720cc0cfa74414cf454b8b0f14d3ac212f2636cf331d20cbdc3419c7657f370c4d6be7ceb29ae6 SHA512 211041b66b8187ea9bdcb5b79c753ef835f8837246bd35bf4293e998599fe6197054867295ba1c057723aff2367e43d68dc290f806e25f7149918702782c60d7
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
-EBUILD test-unit-rr-1.0.3-r1.ebuild 569 BLAKE2B 4c010927bada01f9170b94f216ade7f5f8ec49e8f5cb5c521cba1fc07ca9688c515959dcc6ca55d3e48a80357e15b4dfcf6aa38838111ab49b44cc5962a3d939 SHA512 0535b9c53ee6bbc57588adf9362a4da5c67f33485958860184345cfcbd1b5e681abf32731666dbebac13be19dde17cdd4b196c8ea45be7cc7627f682fc8b52c6
 EBUILD test-unit-rr-1.0.5.ebuild 583 BLAKE2B 8e62fe5a571cf1be0cf327b422ded596a9eb6cded49294e39fb901e88af740bd83a9ec1db5b98969b83f2bd7fd8e4def0119121f699561c295dd415b178c0ab1 SHA512 56ab2111bba9ab8ac2f82ba0b16bd221fc6fc44b4357c0beecd1e3dee3bd6aa16a899dd4a1797819f6d38c3659c42452dc31332139ce21571d2d52cef7a5e08f
 MISC metadata.xml 338 BLAKE2B 85bc12a3d50f4734ae4d5188230046205dda2e902291ea368f79a75cdc183f38329fff34b04e3b0455fc8c318c1f3cd3175a596bf93a40338f02ddc71ab7049d SHA512 4bd0e95ac4f05d5671716f6b416de5436728297faae0a32c0d2a4e0ee977066a77f70991de74d8dfe4627a13adecf50683265332023af423e4003250adaa22eb
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
deleted file mode 100644
index 3e2faf448b73..000000000000
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RR adapter for Test::Unit"
-HOMEPAGE="http://rubyforge.org/projects/test-unit/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index c2254d2515e7..451357b3fdfd 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,14 +1,12 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-1.2.3.gem 40960 BLAKE2B f376db195cc7daf90807f8824954185591d913912c2b0f66efdff5fcbeb034dad4f9adc8586afcefe7946698be9d19d3afddea16b266a4c035376e84c2936470 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57
-DIST test-unit-2.5.5.gem 111104 BLAKE2B c74aaffb3c7a4cee2d4bc31de9616918725af917aab507e175b16a92677ae6b83bf0c0453ce3c663ed0989c0c6e145476777750ff563280212312092058fca69 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142
 DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428
 DIST test-unit-3.2.4.gem 128000 BLAKE2B d651a951d41d0a1ee2b95380d68dd15862959244eaec0e77750b910fecbe0f1be8d75f0dad7a2ac9f73bc4398e996a737a1218404f532f9b87ea7980ecc048e5 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7
 DIST test-unit-3.2.5.gem 128512 BLAKE2B 08758e57b9080b37a00af804d86ab63c582440e879724427ffe8429c5d9cc1c7d7bb0fc94df7c5d72fa18e07ace565b39b9e8531328b227b8ef997306ea95fd7 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0
 DIST test-unit-3.2.6.gem 128512 BLAKE2B 51d20d77858d706c3db7e653cfa372d10f339b441fd6ee8a0487f89e7ba82bb525ace07da6962a87fc01d0515825dd72bc376309010bcaf4ff2a21faded0edff SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
 EBUILD test-unit-1.2.3-r3.ebuild 812 BLAKE2B bbf4b93f0cf854f6c88dd88d1a0bf672087d520c35273e630dde345e63ad3f81d62967635d218c9adae8df2961b00916840c4f14b961d753a1bff4cb5dd637dd SHA512 3cfe35c894cf42716263cc7bddf8d2cb36d0ebe87f7b4c2bf0270f905a7b3d185055a8e423b412c6ada6b0af3c4c952ec6a89e54f83e739898570413797544f6
-EBUILD test-unit-2.5.5-r2.ebuild 729 BLAKE2B 6acc3dd37241489f366050d57ac19bb0a2d9557c339793da3f96e104398b6422d31485e7c85348a52c05687b7777da6984fbf293dc53af2186e9ba27e79ac7d0 SHA512 64939cff707ac0ea52a491015d017ac8ef6282e6c0b204ed86d980c6d27909d0a2211731bdc832305fa177fa2090c86c743d4deea794c6e3934cc6d242b01b31
 EBUILD test-unit-3.1.9.ebuild 876 BLAKE2B 7f5334600e70cccd7e83c6c13e42f42b9bb364a9d51d8898270eecc965e178062fbe6498325828b6dc6fc7b081b8e5e1d9428d87c0865f2d317b8c486826a329 SHA512 ec68f762c63e6915340d70423d335c8e26c33d4f7f1a9f859afcaa2af98b8926d364b3baf5a9f3f97f8ec730c3a143d0cb8ae0df5568346494299fb6a5535d3c
 EBUILD test-unit-3.2.4.ebuild 947 BLAKE2B 0569da6b4395309a7d79c93f3d0c1fcae2827b9b0137589e58cf7a2ac0fd6b72be2b5fd6a3d44487a77bfe3a5de7c9f7e6a5ea3f5128b03e387b9221af6eb2b0 SHA512 bd590d1cef14dfeaf6d76255552ad6a5f184382a5af929b9fc6773d01f397badecdaf50d8ad3b78a9681be3caf29d3cc6b509ff1961c22827880d379ca15493c
 EBUILD test-unit-3.2.5.ebuild 947 BLAKE2B 0569da6b4395309a7d79c93f3d0c1fcae2827b9b0137589e58cf7a2ac0fd6b72be2b5fd6a3d44487a77bfe3a5de7c9f7e6a5ea3f5128b03e387b9221af6eb2b0 SHA512 bd590d1cef14dfeaf6d76255552ad6a5f184382a5af929b9fc6773d01f397badecdaf50d8ad3b78a9681be3caf29d3cc6b509ff1961c22827880d379ca15493c
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
deleted file mode 100644
index 2839444f6700..000000000000
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb testrb-2
-}
diff --git a/dev-ruby/tidy_table/Manifest b/dev-ruby/tidy_table/Manifest
index 21a30c4072a2..5123934c07a3 100644
--- a/dev-ruby/tidy_table/Manifest
+++ b/dev-ruby/tidy_table/Manifest
@@ -1,3 +1,3 @@
 DIST tidy_table-0.0.5.gem 7168 BLAKE2B 7c00064c266bad9db6acf5066845cc6543c2d51fb5ac85240c9ac77d15004402588b992a0e56529123a1805e6c887ba23d135e801e07fcb918411d6706e7f596 SHA512 fbe9839587c3381ebabeb874b2460767491447b54501137f464c16bd251601670a6a260881792c117ee753e5b4d428f04295df041ffee56f109a1ff772346bcf
-EBUILD tidy_table-0.0.5-r4.ebuild 591 BLAKE2B d1aab93f2267e68fc6ce05555dd5f7bccddfe0fc3f90f7d32377bb641d27991275083d499a9edce9807c6b2b5fbe24121ff024c8cc3c707048d5a2e5c0ff789b SHA512 dc17c66d73841b870a7671dfa9c5f4e7e1f86766525f7d8fa020afed5ef2b8d929473efce183f0bc8983575b1fcbe70a5356614add5b5d23e37e2d34f9d69d7b
+EBUILD tidy_table-0.0.5-r4.ebuild 584 BLAKE2B f16a2a213b9db408044aa0d5a2ed47ea4ab18797913c37c24f362f867d404b842282177240ffdd2dea8a1eb4339ee8051054421bc29ad1ae2e8d4db6e8e42b38 SHA512 ea7ea2e2dafde42404a40b3924b0d4c360d6fb2b5ea0f45bd6ca551109aaecf66393a73cec24b39daf2513e5e1d8dceea0d89ecbd88fe449af9e63a32761d565
 MISC metadata.xml 345 BLAKE2B 3ab7b55523f2742cb7c66ba65825395616176dbc68de46e5d95e8830f34c6add52ea5f24e1b97ca5022b823b7e49985ff1eb9997209e5bee191fd1e6725aec9d SHA512 9bcbcffb393ad0e2bfc74a05ea31149e656fa947a650932b51bcef54f32ff52b576c025d073361df9ff71a5c150496cbe5d98b74b8c614466b849cf95fe7aff9
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
index c39962905beb..d676c249fc01 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index ab911c527b11..d33e18f3fa9c 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,15 +1,11 @@
 DIST uglifier-2.7.2.gem 84480 BLAKE2B a446f21f9b8682ba7ec020d355ec5b6eb573649116fddfe2d4d74849c59f6697065ca2837fb040a91a3f43264a71280660b947b138fd0fe67806f2c18631f498 SHA512 03c8fffbd385db9ee0fa8f422bf571ba99803f810828d536f1b00bc99a21108ac0ed232015d39f1ab88441fef0a3371df10944873fbadae6c8bd2624e3e1a65d
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360 SHA512 5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
-DIST uglifier-4.0.0.tar.gz 183935 BLAKE2B 355081d2aebcd6e40081564397b7ae121922d33ead6942f15fc92b9743c575756513a1125810900edcc9a327ff3011e64e539d1bbadb02a06db5a5099dadf0d5 SHA512 b4bd78ea20ed3eefa9bb8d2645da9d3a1898c2715084c47ad8f3d5d0bbeae68ac84f59a449a68dee9c9eda158a2c3e8bff23507d06fc489f00ba53057911bcd1
-DIST uglifier-4.0.1.tar.gz 184457 BLAKE2B bc922057d42868f56d3755f51b9bc39460369ee32d76b97222ef3fb05dbf0c84752236a545ffe9fcd17c1a529a429b9591bcf7d4623255e85cc9ebeb693dd595 SHA512 966a7a5c0c15146feba8633f247b9ec5d7a895c8e2a993b784836c13f3d88077e4ba701c1809588463da78d894508cb35e4d958b86c4801782f9449a93963d05
 DIST uglifier-4.0.2.tar.gz 184915 BLAKE2B eaac0fae612f357a51332db420e31d568b120dfe199d4f838db92082af888085123f322c4666d9c7d350ef3a51dc2d09ef78d11887771e8c414c9211688f6bfa SHA512 77795a2b20ac6e5fc1c12cb95f868062e040988e1efc9cd7c13cd093f0ad5447fd09b1d88d5c1c53d69c9ea4e9fa22c9331df53421af5ecd3010138e91a9a87b
-DIST uglifier-4.1.0.tar.gz 189074 BLAKE2B b18e2661a1e87eaf2436d9ed89aebb05b164523bf478a3f0b5ec2587100621fa75eac38f0ac2ab724a10add7aff2a96947c32babdd246d0583f757682d704375 SHA512 46191a961471db2f515e28229e6febe3a1e448730eece965307e6993b3b0282e69ba1c6cb8cc232897b4e29eeaea4b2981af4cafa2d1afc384ad39a049c26f60
 DIST uglifier-4.1.2.tar.gz 190343 BLAKE2B 0f3b0052d7065f36dcf9c52c226d6ddd27bcafe5a85b1a1a56a9d1d31ce8e7e8986e68ff471aa33cc2dd46688bd579594bf370203bd2ace26554b5dc71764a33 SHA512 8b11b3f8dc9e6dd6d2fe856decf11a569bea2040f1443fe437759fe4d14c0410158ef40b2660f38cd548358e78f6ac27929712e8fbc5708dc215099e58de1f75
+DIST uglifier-4.1.3.tar.gz 193256 BLAKE2B c0337da0ba4b857b80b1573538ed7596950b3bc0c13661fa7f98ff96a80cc0b747ca5361fdf9e3bbbbe646ff1b476419342194386a2d66c468e5272d7200ae3c SHA512 5b0b1e5e4cd50ca2639b034ee6da672898da2dd16e226c5bf4bd706ef219d0a85f2c8a13b167766005a77207d5b32a6cfc62dce133d176d8bd37b77b27638062
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
-EBUILD uglifier-4.0.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
-EBUILD uglifier-4.0.1.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.0.2.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
-EBUILD uglifier-4.1.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.1.2.ebuild 788 BLAKE2B 7aecab5146fa68141aa804e5160d0b5d4ac64005c9bed58a4a73bbb4c134e7d1959df45b438dc346a2874df87b861a93041ad96e7e2096daf55e371e6bf393ff SHA512 8d543a8d122c3720d96e8c62b9ea251800eba48136c4561051a36483bf3d7aa77f01ef79ce3c6848a45ba637327654028675b429034e8f1d6227fc5b4481bd45
+EBUILD uglifier-4.1.3.ebuild 788 BLAKE2B 7aecab5146fa68141aa804e5160d0b5d4ac64005c9bed58a4a73bbb4c134e7d1959df45b438dc346a2874df87b861a93041ad96e7e2096daf55e371e6bf393ff SHA512 8d543a8d122c3720d96e8c62b9ea251800eba48136c4561051a36483bf3d7aa77f01ef79ce3c6848a45ba637327654028675b429034e8f1d6227fc5b4481bd45
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.0.0.ebuild b/dev-ruby/uglifier/uglifier-4.0.0.ebuild
deleted file mode 100644
index 40301044c9ee..000000000000
--- a/dev-ruby/uglifier/uglifier-4.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.0.1.ebuild b/dev-ruby/uglifier/uglifier-4.0.1.ebuild
deleted file mode 100644
index 40301044c9ee..000000000000
--- a/dev-ruby/uglifier/uglifier-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.1.0.ebuild b/dev-ruby/uglifier/uglifier-4.1.0.ebuild
deleted file mode 100644
index 40301044c9ee..000000000000
--- a/dev-ruby/uglifier/uglifier-4.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.1.3.ebuild b/dev-ruby/uglifier/uglifier-4.1.3.ebuild
new file mode 100644
index 000000000000..8451683993d3
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-4.1.3.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_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier"
+SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index e8c0054e9b3d..e8de10cdcbb0 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,9 +1,5 @@
 DIST web-console-2.3.0.tar.gz 47641 BLAKE2B 2756f3958ea77df7dbdf7e7bd79f64711b4f958433f347175a29db2272ba549c79f1f94e2be18c17ceb8f4f1e8d281cf09995354f6ccd21da314df14dde886ec SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834
-DIST web-console-3.3.1.tar.gz 46556 BLAKE2B 632c83c27b86e812c4a8c76a891bbaa9623e976a01796b40b272db3d77a756ba564a90a5dc3569b780383a8d0ce42e4e45090ba1b53c7361fcca328d93b04360 SHA512 8acb619b47c4b91fde647b83c01ae57f25a329b2597801e51c5e2d4dfec0a232e9335528672ff036a2391677ba88679ae69fc9aeebd960071b7a8541bfe9667f
-DIST web-console-3.4.0.tar.gz 51684 BLAKE2B 8fd4cd105472ec16b3ef12a25616f6c03b1555c1fc91de1c294f2cb731b3ceb40a42fcb8201052227f59ddbbc8911bee1c2d479ca812c7d9dd657d5211fb0447 SHA512 2373c1b79b6feff46fd0883cf2da6fd7eab2db0f5070c383635567a36d3979ddc50ca3b32887e96c003df8fb9ed32e636d55dd72ed06630fe534a0224d7ce74b
 DIST web-console-3.5.1.tar.gz 50779 BLAKE2B e94ebd0bb5ddea665849155bed0bf5a1c9025a48ebdf6a8ea7b032ee5397aa75d63a91e173ba03b49af7833d27950398f50fd189c20b8fdf53738ed4af7bf0cf SHA512 0a28744f8d138a8900f368884cb65a3ab147e3f3fbabe194b15def5f05098a519692155e13a15a758b95c943e861057018b60c75e664b7dc4991a6c3803d1290
-EBUILD web-console-2.3.0.ebuild 997 BLAKE2B 15d79c21b959f151725b4d378ce05071421c20d0004dd41dfe1b2ff7eaeba95d4752d4ad774bd10aca62cc2cb55cad864c087fbddda5a567001c1a132079dba5 SHA512 75eb9bacc1f4c4c172c25f8d0d4f7c08db226543974a4171443d7e9694bf5f541df8a7191e28523e07da5afff9c2c17d6c760c81dd82c38c2dfa83f538d11e91
-EBUILD web-console-3.3.1.ebuild 1046 BLAKE2B 15f9e6e860fe45b22bfcf8f05d5adfd0e32b11c9233ac5af1271a3a26b1f685e94da2199e531d361247dbc5b57f3c6f84ef6d1c6d155a8af680c4934c8682040 SHA512 e3c7a1b4b6c3f53c0b626fec31cb14c619a22c26fa8366334b5e40e28df477290bf4fd7cda97c82cff3ee8f6461a5b2aaed45fc6c408d8da66f6ab13f1891ae7
-EBUILD web-console-3.4.0.ebuild 1046 BLAKE2B 15f9e6e860fe45b22bfcf8f05d5adfd0e32b11c9233ac5af1271a3a26b1f685e94da2199e531d361247dbc5b57f3c6f84ef6d1c6d155a8af680c4934c8682040 SHA512 e3c7a1b4b6c3f53c0b626fec31cb14c619a22c26fa8366334b5e40e28df477290bf4fd7cda97c82cff3ee8f6461a5b2aaed45fc6c408d8da66f6ab13f1891ae7
-EBUILD web-console-3.5.1.ebuild 1045 BLAKE2B adeed74e2c91cd193b8adf2d335d93f3c8ec48e9418dea54b301c1b1ea5b45bc5a42f138430d069e224bf75b69829942dab4323419b2d429dbfd3ede426b30a6 SHA512 9219b71e943c4da2283de8b96e49e3afd927ebc7b39b3dd1da60d47e0788d3bd0a977fb20f4febc6febad54d7b2d0565f2196f15582edb386c3bb059a076cc65
+EBUILD web-console-2.3.0.ebuild 1114 BLAKE2B 2c55ccf94c8b85a8533b0391850c3391b7888aac29852e7d967aec03ac6e3377fb8867df38e85ede2d3e46ce9a0dabe24479723e0a971d25173dc00006308fc8 SHA512 add8e9f946da93d69f950e377d996b907662fe1eb17e89174d6e5af4945e7fbffae0742fd2f8ac20a56f96d6c4e9863c1a17a9725fe71d0d3298b6533bb302c3
+EBUILD web-console-3.5.1.ebuild 1070 BLAKE2B 0aa8ca647e60ae9b83a0c76115dda70369a7f72428a552f162e699a2e0d1d2dedc9c694d41c38806e934406460e2423ee3afa7ed42466ee55a69928fd605ff78 SHA512 22c2e274b4f16fdf12d1fd8f33f2cf84bdfcb1ef033a2ff2cb7047d9765008eb91a8effa119960e46e2e91d6a7e52475a74c428141afa2bd00e5c1152c9e462c
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-2.3.0.ebuild b/dev-ruby/web-console/web-console-2.3.0.ebuild
index d8e0f4072532..85f233836b9d 100644
--- a/dev-ruby/web-console/web-console-2.3.0.ebuild
+++ b/dev-ruby/web-console/web-console-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -29,7 +29,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
-	>=dev-ruby/rails-4.0
+	dev-ruby/rails:4.2
 	dev-ruby/sqlite3
 	dev-ruby/mocha
 	dev-ruby/simplecov
@@ -37,5 +37,8 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
-	sed -i -e '/rails/ s/,/#/' Gemfile || die
+	sed -i -e "/'rails'/ s/,/, '~> 4.2' #/" \
+		-e "/'arel'/ s/,/#/" \
+		-e '/simplecov/ s:^:#:' Gemfile || die
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/web-console/web-console-3.3.1.ebuild b/dev-ruby/web-console/web-console-3.3.1.ebuild
deleted file mode 100644
index 8cd119d94ba9..000000000000
--- a/dev-ruby/web-console/web-console-3.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	dev-ruby/debug_inspector
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.4.0.ebuild b/dev-ruby/web-console/web-console-3.4.0.ebuild
deleted file mode 100644
index 8cd119d94ba9..000000000000
--- a/dev-ruby/web-console/web-console-3.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	dev-ruby/debug_inspector
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.5.1.ebuild b/dev-ruby/web-console/web-console-3.5.1.ebuild
index 081438ff720a..eee8ecae5741 100644
--- a/dev-ruby/web-console/web-console-3.5.1.ebuild
+++ b/dev-ruby/web-console/web-console-3.5.1.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
 	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
+		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
 
 	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e86a3ef4c629..ef29a7906e04 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,13 +1,11 @@
 DIST webmock-1.20.3.gem 99840 BLAKE2B 97c03e0c6b87f23f321658f0cf0328bac3e44c3d3270770335ab4a8938282d9af3f378997c43501b589eaab2154bb31651d5a86ce590b645c25897532ca0f5b3 SHA512 db9d770636dabf95b3a03a6589a259c1d66d875dba0cbcd493acf6bb35649c885139528aa5a8976d7ef438bca761e1063ae0fcf1da5b799e8d45abf1986c000c
 DIST webmock-1.24.6.gem 111104 BLAKE2B 6574d398579dcafe6100d948b0c70fc8a1ca813339e2edb02177dfa0ad11472444d8aeb48b235caa4f85fb4cf4fe746aa77c3b64732ec861ae0d626bda78b8d3 SHA512 9319dcb3c29189403c79870dc8f91f27e099627a9fe5136a98193ee387a6dbcdf72eecb57ec4080faca9575461dfbf4ddecaaf5e1c75cfa60b08732a1d7248cc
-DIST webmock-2.1.0.gem 111616 BLAKE2B fd1583c5050052f234cacf7cba8d99b252b09d5ef777b46b158715d56bdebd94e77ae081e616a9fcaa84fe29115a8663b6ad06f7e6ed228882ef832e87a295a4 SHA512 604318766d1a23e76c03e0f39bcdc28aa0a23cba14bd8b5a3b33894aa30ece1d5ac56456500143745a2751ddc7bd0424ef195c82b78d66b5e28e10d5059facfa
-DIST webmock-2.3.1.gem 111616 BLAKE2B b957d86b4e1df68c62cbcedb87461e3a709c6ca229488a683f18e8bcc49412046c55d2829c319d1c98b2ee89cfa2f2856611cb366bb38ebfe67084c692479a93 SHA512 b51583a67da44a2aa0c616442f03d1066d9e9270b0cb0fbca48c30d06cef4c008c6fe29186951916afc2b8bccec92a510d34f7a537d4d6889b16e2ad779eb627
 DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e SHA512 bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
 DIST webmock-3.0.1.gem 112640 BLAKE2B 61d74bbc099bdec25e919c07a12824a3bc0761c2b4eaf1180c90bef64856882a69503f10ffc25f153b7d96d6fb2c1699eb0bde8fb94ce41ee0c25f5b47e68dda SHA512 a5924105744a0b09e38501f242f3c19a6c483acdea5792bbe4805d046a4748b9ce8390745837bbf8c8101b1713e62940bda1f9e6b3d63d37b007521c46c521d5
+DIST webmock-3.3.0.gem 114688 BLAKE2B 8306e96cfccbee598f275534effd119e75e3e1729b85936f29b4d4dc118f58c5ed39aa61553cb4c4a7389d704f57e55347d1f54f3cd392610a84683df993cd3b SHA512 589d96c21c1afd05e11f4adc6325d277bbc9a2d25f1ed6176a7b7db88cf94413f470b75fd245faa73ef0a9cb037f52751826b5047f77b41bd03ac72860277902
 EBUILD webmock-1.20.3.ebuild 1660 BLAKE2B b3767cb74310f20c353dc334db87ed92e1e493c253192eed2ff9b6fb6bd686f5f6414150f403a79d59a4ca27e46c151dc24b245a33fbb70035e0fef07cc8ec4b SHA512 37a6e9e64f09e4da7f0728ece05333d7f4f4f23e720b2c038ed0f5595ea8b2c5af5496c204566c543e8a7f4319aeb31e14839b9499e2c038910e6e88579f6eaf
 EBUILD webmock-1.24.6.ebuild 1456 BLAKE2B 1f12d2f7707e6101fce94d251f621c8dad5b6693c34baaba8d338e804cfc2335b4de7fe95fbc5dbe3bb2490245b04f86d239a1b5bd4b96ec759fbc1b5ee9ac8b SHA512 866f3cad0c9a574bfc21f05a87e48c06e4b6a0053e4809c027b392b3d77117af96ff8a9f6b35a71c14c85890442378045867bfb0b3c39cdebfd14175a2aaaea5
-EBUILD webmock-2.1.0.ebuild 1787 BLAKE2B db74f315fe3d4fe30317cb2e30397a838d65b4952d0b10ef5ed309bbaeed09d59811e1834c728d9dc2e2da645c8168c1b202855e3e6ed9078b30de2e7c515f81 SHA512 a32982f49769a09ab25a26264dbbe4eed1b91953d7341da4c8649b64e45c8cc333df255d2a4405d68200aabca2a2271aab1100b7f483e7cc901046d92b3cf494
-EBUILD webmock-2.3.1.ebuild 1873 BLAKE2B ec7ce5e279fcf889d97048f84e2c96c2afadcc18e3883cb4bb8343d3ac19f82df4b8825563792978cc5e19de287b78922521b43baded431cf4bcc82f98f1897a SHA512 592d886e33c19b031bd2ae07b606e3595acd30d163ef2cdb2ddbb2f6c9810d0474ac057a9a263f644884b5e50939a7d8772331903a2806705e13542f5c2646ed
 EBUILD webmock-2.3.2.ebuild 1866 BLAKE2B 2f574e1e4112eba2db2628352bd8c5329d79027c605a067b5912fac6cacc9cd4a947e107834e1b7eb5a496cb4ea8e9384827466f5e0792c86ba3f13810a186d9 SHA512 db08d6460f5dfd2169b9d4cb48a43763e487710460d6e8ae3d1a1e0609a1e33c2cb558bbadf61a72260d06f06337cef84f2250948de7438eca00c496fa6455f4
 EBUILD webmock-3.0.1.ebuild 1873 BLAKE2B 3862da4943bf189fcba2ee9c3aa5664de32f1a7aabe1ec79345e2a41be8c737fa420d020ece69d1f82bf34300cf7138a36d8a8178d18e082a2ffaeb3b8378683 SHA512 b372ef9e38fb810c123f87622c868bf2e586eb1bd627fa28164fd0c029fcf56f9c1b8062599802ed71d5fbac945845a1a511a32ddb0afc26f95c4fd2a2ba9991
+EBUILD webmock-3.3.0.ebuild 1873 BLAKE2B 3ed92b781db87b95d4d5649d12e9f996a824626b1c875136a0d6b18c02420cce10c1a06e66b486a9126e11a1484cd0ef8da9750043b54d8582ece2dc07f9c973 SHA512 60dd68a4523175bb6c830df1e14ccbbef87bce20e2fdec1d20b9b750cb2342a20651594cbf7b55b404e5c547ed434e97cf5f0bf1d4ed37f88738144e722be116
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-2.1.0.ebuild b/dev-ruby/webmock/webmock-2.1.0.ebuild
deleted file mode 100644
index 5c08f91a32e6..000000000000
--- a/dev-ruby/webmock/webmock-2.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-2.3.1.ebuild b/dev-ruby/webmock/webmock-2.3.1.ebuild
deleted file mode 100644
index 1323145338f2..000000000000
--- a/dev-ruby/webmock/webmock-2.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.3.0.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
new file mode 100644
index 000000000000..b71d7065dbe0
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.8.0
+	>=dev-ruby/patron-0.4.18
+	>=dev-ruby/http-0.8.0:0.8 )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old.
+	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+
+	# Avoid httpclient specs that require network access, most likely
+	# because mocking does not fully work.
+	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
+		spec/acceptance/httpclient/httpclient_spec.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 5eb1811abfb7..63dfbd784f49 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,5 +1,3 @@
-DIST webrobots-0.1.1.gem 17408 BLAKE2B a6adccda1d69c095a3d240d79676f3955ba3cdcea74bb6b35e873eccf34aed101012650cfc553a250818611913dc699dc6883c2f678547884618aa5fe90515e1 SHA512 f303c238620d17cb64064d11eb352d2afb32529f7092609484e5e232ccbc903683f89116a0e5232605b6d0286a4a76b82e71e44884a7b77d12125f3b3c6c5a34
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.1-r2.ebuild 926 BLAKE2B f436d58e257d2a216b492ce379eac9a8ef111f6ea861a6a7e270c27a61a8309a214d1ecbc44d16e9dc2c9e06cade19cddf975aefafb32fea6f722fda36b9c71d SHA512 c0e7bb8b3945594d9270baf6e2b3620e396fcd29970f3ce1e16990a277710a3936c35872a1ec2f40dffe66a796c52329b025c3a5c42c0c21e7885954b9f6771e
-EBUILD webrobots-0.1.2.ebuild 938 BLAKE2B cea776d5385b06a617895bc101d84c7d5dcc92b07ac43573d0b48ffc95614ffb227410058227727f0cce65824f8bedf630fbdd7d144a14a1d099f31304410b5e SHA512 1872257b35933f9e50679e1b13e828a51cf0de55549722bd3c9b2f50d599e3fca2fa837524ede29824156be02a481649f8ae8d7318bb9eace5bb04dada490f5a
+EBUILD webrobots-0.1.2.ebuild 931 BLAKE2B bc6993fe90122b065a9788b281c3f53b6023ad07229fed779a754fc9a7b00bb55da1da16c51fe3de9ea85ec538190b2370ce308cbd636bf41437a6391416341a SHA512 95ec2362612f83afb0f7d2ab6959119c91b6acc103bcca2db36fc2b2563c38a56420f0ec30d408e7421fed6c57536ada26b9d8f2ee1ffb5ced9ca1a47614576f
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild
deleted file mode 100644
index 2fa1e1e8da14..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="http://rubygems.org/gems/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-ruby/webrobots/webrobots-0.1.2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
index fc6b65152697..b62efc0f8035 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index cd4675ee6ee7..15eb177c5ce1 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,5 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
-DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
-EBUILD yard-0.9.11.ebuild 1285 BLAKE2B ce2d077968538c51d4d800ab3cf90c40675eda7fa4e4e422cbf0e0feb758d66f102707d75b5648a55f0f8aa75c1c2dffdf34fcf6e9cca8827ab6a7204714241f SHA512 f80c2876ed53ca2d0b3a993a6493df16e1cc2c30f63a6ab233d283d9773574e64fb4a5e89b4780dde38413f69a073d120e93096a65a0cb526e2ccb41b8767005
-EBUILD yard-0.9.12.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
-EBUILD yard-0.9.4.ebuild 1316 BLAKE2B c1f9b2e880648300b34516c4a3ae7f63a51dcfb245be4237be7c4ec582a276f333231d79d50b5720c332d5d0c31f06ed3e4ae40c7c7fc700c3401788a5c26ed1 SHA512 999695d04608dd86062574814e1c02ddbf5c1a6ce3727c3da3c1137805e05a28c0b373f6c3eae13b94f398c99ac67978ae2f82a5d65550d27712755ffa0e14eb
+EBUILD yard-0.9.11.ebuild 1284 BLAKE2B 21f0de50c078a46539d23699455fd05567c9be2eeeeaf6a58a39a1e1baccde24a538820486d2e126fb8d4ccee15a0e6a85c2511f6f48f75164b966ab368ca07c SHA512 156aa3fc5bc269bcf3193ca6807ef445ab2f2e0a1ef6652e38943a95164379942f8f755fb487d2868690d987668443a025bd813a2ecc8f42d99cf4213ab6b9ed
+EBUILD yard-0.9.12.ebuild 1292 BLAKE2B ff7933232e57b12a163aa00165e6a6d97341a9188425434144d7378b061815d944e461cbb4822d745b05905bb577d094e5d5236e907223fc1c003f6bfd2f1c19 SHA512 d07dbfd2e440c410b5b6fc014259a80c10a3f0e43ea20074b4ac3f12cdb9b0da2692db36858019b5ce8b1ab3b63d9ff706761421a1879ef258db95bad652f377
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index 313157ab8cd6..37f1408ab94c 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.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
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 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=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.12.ebuild b/dev-ruby/yard/yard-0.9.12.ebuild
index 37824a405d76..079217be5068 100644
--- a/dev-ruby/yard/yard-0.9.12.ebuild
+++ b/dev-ruby/yard/yard-0.9.12.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
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.4.ebuild b/dev-ruby/yard/yard-0.9.4.ebuild
deleted file mode 100644
index 47c626701fa1..000000000000
--- a/dev-ruby/yard/yard-0.9.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
-
-USE_RUBY="ruby20 ruby21 ruby22" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 04e07702fa1c..2688c15f58f2 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index ea3add154438..e56ff6b0c0c9 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,3 +1,3 @@
 DIST guile-git-0.0.20171110.tar.gz 269708 BLAKE2B 89095fcf666fdb4810e44155829413c3878c783d66d7b60416b9535f57edf27719515c22d9e15e07dbfe0976613fb5ca323ea0559b5a0533f1818b87d248db87 SHA512 b542c6ac30f596599ffa05074be7f71407a062ea3b23e80153894d13220f7935711abf74060bb0cea5e9c46b12492ee78c6914d4a15227bd393b3a833edf4fe9
-EBUILD guile-git-0.0.20171110.ebuild 452 BLAKE2B b86bbea2518a419f80a76e7350131ad7988021ff8a14f3168646e2074a9d836f3a17dd252f764d135de5842ff8683601a627f36bb169e03a6aafee59d39290a4 SHA512 87c7e602c05533af432e27e094800e8a806e5cad8d58581639995f3b237a8be521adb36d161bab425233351d4bbeb389efddcc8fdba394566828b2e2bcc7ac0d
+EBUILD guile-git-0.0.20171110.ebuild 433 BLAKE2B 7c7cc7a47c9c8c922a2cf391f0203016cd0e5f5e095c4d57980c72a5f6080b4cbcb7209f386f4b53b24d909cac31ab3d46b8df134cb161ad30ebd7f2130153de SHA512 ed154b02a126cd0bc9de00309830c68d11415a2eb5e453eeb5295045a8071d07fe3976be5c7058dee78c0b215047d685a690b03a420516af04ab38409da6d79c
 MISC metadata.xml 215 BLAKE2B d64ed3f6aa6c0801d11ca2844a2144593b284a17abf056863e7c9244ab88d6d75362e26315621fd4ff00e278f355b1cdb74bb979bd4faf4062a39d2cdbb37047 SHA512 f19ca9483a74cf30828e8f6c322e8b7c056b5f5cb88443ae0ca3742a17ae56f000c8c6297171e5897569e8f173bb7d96028ee12574e3ffe9c280106cfdbe3743
diff --git a/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
index e99e67bfff8f..ac4a2d6d25aa 100644
--- a/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
+++ b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-DESCRIPTION="Structured access to bytevector contents"
+DESCRIPTION="Guile bindings of git"
 HOMEPAGE="https://gitlab.com/guile-git/guile-git"
 SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
 
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 8a92ac9a4443..b90e728bb24e 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,5 +1,5 @@
 AUX kawa-1.14.patch 1482 BLAKE2B 76f1ab83fee8ece2d30138b4fed314a056dc32b4c3a07eccbc75307a36779c0a5c3bd519e7bfa5d03c1108714ea9c2f13cd1e5852c2622a9b701387f6e9fe0b0 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
-EBUILD kawa-1.14.ebuild 2880 BLAKE2B 442fe3059d989817b5d8b946f003eb2020afd55bd75727dfcc79a2acac12f0e97e5884eaecfa223047118a8d59344f34fdf641950a0726be582d40b460d65bff SHA512 95e03965d265334da79e716ec090021ddc25abf2091e5234ca36f783b207491df60a7864fa51293387449a3aa5750d835af5d5b119e67f525530114db878bfd7
-MISC metadata.xml 1375 BLAKE2B e4d011072db72872f56a01e131466d364a663a49776ae38bfa24891dd75941817461f03a7685324096161ec002ba68e72a492ffb02bddb23ee0ec773a0f7ea5f SHA512 6d211ce3778ee387d9776cc33a361f745414dc546e3acece0b5240d2a62f2b1f83ebe505a04e5ae66d7c6f46631bfa8b248234da6176fcca993c9602d1a265b0
+EBUILD kawa-1.14-r1.ebuild 2760 BLAKE2B b16be8e41e14d2531fd937bf95708e16753a65ac0df852c169568c4fe045df96e301c16d9565ded650de714e28454ee9d44db08aa70f97fa20d1ed6a266ca8b6 SHA512 4c17775eda4f927e6db324d69a7fed405b21b44f51294db8fe0acfc8445a17241cf74c8c2486931ba8c1d98a06bf0cc609d55f86121787f23ef142441b9dbc0e
+MISC metadata.xml 1296 BLAKE2B ba022afb4f0abda7b0bef5d3a74f7f9a1e02e861d7a9d5cd44c50a74d57e4c66f646c2249cd037c159751bdbada7f53a4674bfe229933584f219bef87e561e71 SHA512 f960bf7ac29967887ca3d07bc55ebf127e0b99e7dbf2d45b6a14f018010aaa50338db62151ab5a2e92b71801eebbdf8c797b21d76c36117daa88536e965bd194
diff --git a/dev-scheme/kawa/kawa-1.14-r1.ebuild b/dev-scheme/kawa/kawa-1.14-r1.ebuild
new file mode 100644
index 000000000000..6faeac4e0383
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.14-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
+HOMEPAGE="https://www.gnu.org/software/kawa/"
+XQTS_Ver="1_0_3"
+SRC_URI="mirror://gnu/kawa/${P}.tar.gz
+		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
+
+LICENSE="MIT public-domain
+		 jemacs? ( GPL-2 )
+		 krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests"
+
+CDEPEND="( >=virtual/jdk-1.6 )
+	frontend? ( sys-libs/readline:0 )
+	sax? ( dev-java/sax:0 )
+	echo2? ( dev-java/echo2 )
+	servlets? ( java-virtuals/servlet-api:3.0 )"
+DEPEND="${CDEPEND}
+		xqtests? ( app-arch/unzip:0 )"
+RDEPEND="${CDEPEND}"
+
+xtestsuite="XQTS_${XQTS_Ver}"
+
+src_unpack () {
+	unpack kawa-${PV}.tar.gz || die
+	if use xqtests; then
+		mkdir "${WORKDIR}/${xtestsuite}" || die
+		cd "${WORKDIR}/${xtestsuite}" || die
+		unpack ${xtestsuite}.Zip || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
+	# speeds up one-shot ebuilds.
+	myconf="--disable-dependency-tracking"
+	if use jemacs && ! use swing; then
+		echo
+		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
+		einfo "so swing is enabled anyway."
+		echo
+		myconf="${myconf} --with-swing"
+	else
+		myconf="${myconf} $(use_with swing)"
+	fi
+	if use xqtests; then
+		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
+	fi
+	if use servlets; then
+		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+	fi
+
+	econf ${myconf} $(use_enable frontend kawa-frontend) \
+		  $(use_enable xml) \
+		  $(use_enable krl brl) \
+		  $(use_enable echo2) \
+		  $(use_enable jemacs) \
+		  $(use_with awt) \
+		  $(use_with sax sax2) \
+		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
+}
+
+src_compile() {
+	emake -j1 || die "emake failed."
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
+
+	java-pkg_newjar kawa-${PV}.jar || die
+
+	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
+	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
+		"--xquery" || die "dolauncher qexo failed"
+	if use servlets; then
+		java-pkg_dolauncher "kawa-cgi-servlet" --main \
+			gnu.kawa.servlet.CGIServletWrapper || die
+	fi
+	if use jemacs; then
+		java-pkg_dolauncher "jemacs" --main \
+			gnu.jemacs.lang.ELisp || die
+	fi
+
+	use source && java-pkg_dosrc kawa/* gnu/*
+
+	dodoc ChangeLog TODO README NEWS || die
+	doinfo doc/kawa.info* || die
+	cp doc/kawa.man doc/kawa.2 || die
+	cp doc/qexo.man doc/qexo.2 || die
+	doman doc/*.2 || die
+}
diff --git a/dev-scheme/kawa/kawa-1.14.ebuild b/dev-scheme/kawa/kawa-1.14.ebuild
deleted file mode 100644
index 370090ab7af3..000000000000
--- a/dev-scheme/kawa/kawa-1.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="https://www.gnu.org/software/kawa/"
-XQTS_Ver="1_0_3"
-SRC_URI="mirror://gnu/kawa/${P}.tar.gz
-		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
-
-LICENSE="MIT public-domain
-		 jemacs? ( GPL-2 )
-		 krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
-
-CDEPEND="( >=virtual/jdk-1.6 )
-	frontend? ( sys-libs/readline:0 )
-	sax? ( dev-java/sax:0 )
-	echo2? ( dev-java/echo2 )
-	swt? ( dev-java/swt:3.5 )
-	servlets? ( java-virtuals/servlet-api:3.0 )"
-DEPEND="${CDEPEND}
-		xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${CDEPEND}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-src_unpack () {
-	unpack kawa-${PV}.tar.gz || die
-	if use xqtests; then
-		mkdir "${WORKDIR}/${xtestsuite}" || die
-		cd "${WORKDIR}/${xtestsuite}" || die
-		unpack ${xtestsuite}.Zip || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-	# speeds up one-shot ebuilds.
-	myconf="--disable-dependency-tracking"
-	if use jemacs && ! use swing; then
-		echo
-		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
-		einfo "so swing is enabled anyway."
-		echo
-		myconf="${myconf} --with-swing"
-	else
-		myconf="${myconf} $(use_with swing)"
-	fi
-	if use xqtests; then
-		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
-	fi
-	if use servlets; then
-		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-	fi
-	if use swt; then
-		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
-	fi
-
-	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		  $(use_enable xml) \
-		  $(use_enable krl brl) \
-		  $(use_enable echo2) \
-		  $(use_enable jemacs) \
-		  $(use_with awt) \
-		  $(use_with sax sax2) \
-		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
-}
-
-src_compile() {
-	emake -j1 || die "emake failed."
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-	java-pkg_newjar kawa-${PV}.jar || die
-
-	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-		"--xquery" || die "dolauncher qexo failed"
-	if use servlets; then
-		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper || die
-	fi
-	if use jemacs; then
-		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp || die
-	fi
-
-	use source && java-pkg_dosrc kawa/* gnu/*
-
-	dodoc ChangeLog TODO README NEWS || die
-	doinfo doc/kawa.info* || die
-	cp doc/kawa.man doc/kawa.2 || die
-	cp doc/qexo.man doc/qexo.2 || die
-	doman doc/*.2 || die
-}
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index c7ff97f104a7..64f677da3f76 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -24,7 +24,6 @@
   <flag name="servlets">Build support for generating servlets with
     <pkg>dev-java/servletapi</pkg></flag>
   <flag name="swing">Assume Swing is available</flag>
-  <flag name="swt">Assume SWT is available with <pkg>dev-java/swt</pkg></flag>
   <flag name="xqtests">Support XQuery Test Suite</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 81593a881ab6..79b48b1c7111 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/hlatex/Manifest b/dev-tex/hlatex/Manifest
index 56d56be8a265..43fa05fbd40e 100644
--- a/dev-tex/hlatex/Manifest
+++ b/dev-tex/hlatex/Manifest
@@ -14,6 +14,5 @@ DIST uhc-shinmun-1.0.tar.gz 4794977 BLAKE2B 84e1e3a872acf6897d34261a676fb810ef58
 DIST uhc-taza-1.0.tar.gz 1338672 BLAKE2B 8c91e9d1c0490c4e63760baa933f6639aa20fd441868d259f21839816e3abbaf6d7e664a0c76d6afb7bca06c86aa2c78e43a6de74273c158d32a2c4368a0e9f3 SHA512 87ae8ff615e76b1a570f14a4d8f29ae3e15a7dccb75c7b80c1e5bb64374c2b749090f9f6a706cfd74c36d39584549cd36bdbd2ede13c50a9c9d5c3b8a44346b8
 DIST uhc-vada-1.0.tar.gz 1225522 BLAKE2B f15ffe19bc9ae2ec83116ab700b12716bea53a8cdc5bb62e5362eff4e17d9feaa2c1decdbf0bc7e2ad1228cd96d95347e415ec91222db44d5d0687143b661b17 SHA512 663ea0a1d3f968dc30387cd7962962969af6c2ade41c6de585f24b116e79ce897539ddb412735bd19a7c1083a69bd975ba198b442ca25ea30d6811ebbb8421ad
 DIST uhc-yetgul-1.0.tar.gz 5198946 BLAKE2B a9795852f0a075b78896f76fe01301104b16b21fd8b44d5545f99c6bbaf038f64a25bd5805ca65b09d627162651814856fb997d933740e19e638e161f597df7d SHA512 e620bfc42eb30d3b3a60964a68071d6ea68a2a6a8f1c9e1d07a3a9c75dcfabb6b26beb5d65ba76c16aaee5f1cd42c87991033d581e49acc67bae923aefaf6ddd
-EBUILD hlatex-1.0.1-r1.ebuild 2416 BLAKE2B eb33e6e05777036a0c80bd9d84b64193107c899d32847a2ea615e40ae40d800286f9617b1a823d484a75c456ff832d8dafbe542a5e53ed19dc9c74f87b490af6 SHA512 74dc54c9331c202470a79c398cc3d36bbae76bd0c17096221012d6b061e372abba204091ff7a4324eb28772573e6f1bc186abe87932c2ac3eb87059d9ffc02de
-EBUILD hlatex-1.0.1.ebuild 2419 BLAKE2B b66e156f087752aa05ca78a1282d0702adf591e6395dca6253288e65d5034fd6e13295e2e1d77636046390a322fe1e2b008b5b32ee3fb729e7c09aebccd6f22d SHA512 34c079942f96facb7d3f14eca3a8d8a47574388130dc973979680135a37086f36b61cd998640295359e99f828e824ea9ab3ec0964c12aa0a2bb2fa231a77075d
+EBUILD hlatex-1.0.1-r1.ebuild 2412 BLAKE2B 7e57422b2d035c922af8d6f96c30ca45c9aed6aa0f0bb10ab0629435c94a763b7e62c2f4b25368a217fb29cd5e0b326382929d39488bb326366849a3e4efc42e SHA512 b1b8b0148a5cd5c95591ea74ac03c9cea8996906d6798fc7fe1f7c617df6537b73e122ce789c1a1af28c1caee714a5dab1890619f26cc907d999c6b03cb48326
 MISC metadata.xml 336 BLAKE2B b50f21b184d0548ece37497188f8d6cd0dd664ef669c7e64af31accefa53819e1a20dc8a40a7aff7d28546444ce26bd8eeca12acd9d9ea9459d8764a5ace1464 SHA512 e94ba5fcd5ceb62065d4bcc67d0ef1fa9053589073124a55a775324ea9bdab3d8af4aa3ba393f3388674c73fe9b58fd6598b815bc481a1b2caadf1dce11b75a2
diff --git a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
index c1cf71c7a38a..5e221fe9f4e0 100644
--- a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
+++ b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="ftp://ftp.ktug.or.kr/pub/ktug/hlatex/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S="${WORKDIR}/HLaTeX"
diff --git a/dev-tex/hlatex/hlatex-1.0.1.ebuild b/dev-tex/hlatex/hlatex-1.0.1.ebuild
deleted file mode 100644
index b2864cf44eec..000000000000
--- a/dev-tex/hlatex/hlatex-1.0.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs latex-package
-
-MY_P="HLaTeX-${PV}"
-DESCRIPTION="HLaTeX is a LaTeX package to use Hangul with LaTeX"
-HOMEPAGE="http://project.ktug.or.kr/hlatex/"
-UHCFONTS="uhc-myoungjo-1.0.tar.gz
-	uhc-gothic-1.0.tar.gz
-	uhc-taza-1.0.tar.gz
-	uhc-graphic-1.0.tar.gz
-	uhc-gungseo-1.0.tar.gz
-	uhc-shinmun-1.0.tar.gz
-	uhc-pilgi-1.0.tar.gz
-	uhc-pen-1.0.tar.gz
-	uhc-bom-1.0.tar.gz
-	uhc-yetgul-1.0.tar.gz
-	uhc-jamo-1.0.tar.gz
-	uhc-vada-1.0.tar.gz
-	uhc-pilgia-1.0.tar.gz
-	uhc-dinaru-1.0.tar.gz"
-
-SRC_URI="ftp://ftp.ktug.or.kr/pub/ktug/hlatex/${MY_P}.tar.gz
-	ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz
-	${UHCFONTS//uhc-/ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${WORKDIR}/HLaTeX"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack uhc-fonts-1.0.tar.gz
-	cd "${S}"/contrib
-	cat >Makefile <<-EOF
-CC=$(tc-getCC)
-all: hmakeindex hbibtex
-hmakeindex: hmakeindex.c
-hbibtex: hbibtex.c
-EOF
-}
-
-src_compile() {
-	cd "${S}"/contrib
-	emake || die
-}
-
-src_install() {
-	cd "${S}"/latex
-		insinto ${TEXMF}/tex/latex/hlatex
-		doins *
-
-	cd "${S}"/lambda
-		insinto ${TEXMF}/tex/lambda/hlatex
-		doins u8hangul.tex uhc-test.tex uhc*.fd
-
-		insinto ${TEXMF}/omega/otp/hlatex
-		doins hlatex.otp
-
-		insinto ${TEXMF}/omega/ocp/hlatex
-		doins hlatex.ocp
-
-	cd "${S}"/contrib
-		insinto ${TEXMF}/tex/latex/hlatex
-		doins hbname-k.tex khyper.sty showhkeys.sty showhtags.sty
-		doins hangulfn.sty hfn-k.tex
-
-		insinto ${TEXMF}/tex/lambda/hlatex
-		doins hbname-u.tex hfn-u.tex
-
-		insinto ${TEXMF}/bibtex/bst/hlatex
-		doins halpha.bst
-
-		insinto ${TEXMF}/makeindex
-		doins hind.ist hglo.ist
-
-		dobin hmakeindex hbibtex
-
-	cd "${S}"
-		dodoc ChangeLog.ko NEWS* README.en
-
-	cd "${WORKDIR}"/uhc-fonts-1.0
-		insinto ${TEXMF}/fonts/map/hlatex
-		doins uhc-base.map uhc-extra.map
-
-	cd "${ED}"/${TEXMF}/fonts
-	for X in ${UHCFONTS}
-	do
-		unpack ${X}
-	done
-}
-
-pkg_postinst() {
-	updmap-sys --enable Map=uhc-base.map
-	updmap-sys --enable Map=uhc-extra.map
-	texhash
-}
-
-pkg_postrm() {
-	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-base.map ] ; then
-		updmap-sys --disable Map=uhc-base.map
-	fi
-
-	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-extra.map ] ; then
-		updmap-sys --disable Map=uhc-extra.map
-	fi
-
-	texhash
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 79bc5e19888b..69288bd0aff8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 528e674d6df2..a21c386d559f 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,10 +1,8 @@
 DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594ff0d07d9fc74539d08f56df57a826bd87ee2b78989dad24b9bee7e6bfad7c10277b07b67ce39c663dac SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-DIST aruba-0.7.4.gem 91648 BLAKE2B 6a71fc740bcaee845271f82f7ab36a9205df796aebcd1502466e65690f978a090df7e13ebec5d172d4562adf5c5fbbb7b68606511f704abb8371989eb0fc4b96 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
 EBUILD aruba-0.6.2-r1.ebuild 982 BLAKE2B 7839b281c45698aff3ef137eea8036c56c535bf4f6585b387cd0db24f64a7ac7c951bc14fec294e8657db19e70055c1b9c04f6b36d487b83e1e7bdd39350b979 SHA512 b667c836becb888223fac9f30a5dd858501270995aa3e71cb77306c43051309b0114c6c56c152ceab70be1ca6c0b13c4dce99ff9f9189f0efceb61e49c8e371e
-EBUILD aruba-0.6.2.ebuild 992 BLAKE2B cc346c563facc83dfe092932401ac736c44b45a1cb35a58c256808a9487c667e05c4bd451c5c10e6eff1a254e0a9c110d0156e6509e4a62ad5e0d91bd2add6e2 SHA512 859b7b7a1da19ad4687c8362a4fbc0964063f1d5b2fae8b209604add856e974e3b8c6f17627d98a2307c79bf526876223cf2f90f984ea7983352922d0c3529a5
-EBUILD aruba-0.7.4.ebuild 1305 BLAKE2B 8b0a11f7586caf45f615b06fe75f546e04724f15588098ab32d177debb4cbf1a409bdfae016a865963fe2d920e6e8d5a32e7f2dd6a1c41507facd33d88833148 SHA512 a3922e5b3550e7b93582b5fea463f68a0064a9e4e2e56950d9f52720a019f663e0163c8acea68ea5fbe0c48ef615e1124cda8c566affce80e122fc7551f9f694
-EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B bb7465c5483d989737a710dd8f5d357ddbcbff4b4fcf034c9011374df56d7af85c7407308084136719d6402bb9446c1b8e69d425a18556d024cac0dc95e9666c SHA512 d91882d6e4629d2e8e686e5f6393065e19d8bba990baac4e40234350779037689e3bbee8dccfe189520f5697e1879e07f4fd2d4e5d0fd8dd976c962875a9cfcd
+EBUILD aruba-0.6.2.ebuild 985 BLAKE2B fe9c02aed0fd268983ef592164fa53306fda96ce32d27ef3ea93090c3917da2f97030e2dd21777751d78cb0666d192c947f722f62aab70f15770ef85d19a9a3f SHA512 deb59f89b7ad08e033cad93b6075b9d72a89959fe72553feb3b4f66a458c0d4508a4833ac0e9ee7e0199910e5ecc7551f56b6c5183c68e3f4407bba22e2abf30
+EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2.ebuild b/dev-util/aruba/aruba-0.6.2.ebuild
index bfd66f5dc73e..f85d54a391d8 100644
--- a/dev-util/aruba/aruba-0.6.2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
diff --git a/dev-util/aruba/aruba-0.7.4.ebuild b/dev-util/aruba/aruba-0.7.4.ebuild
deleted file mode 100644
index db894883c98a..000000000000
--- a/dev-util/aruba/aruba-0.7.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.1 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-	sed -i -e '1i require "time"' spec/spec_helper.rb || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 1110c6b99139..5d89ae37b9e7 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
diff --git a/dev-util/buildbot-prometheus/Manifest b/dev-util/buildbot-prometheus/Manifest
new file mode 100644
index 000000000000..4934e752dcae
--- /dev/null
+++ b/dev-util/buildbot-prometheus/Manifest
@@ -0,0 +1,3 @@
+DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
+EBUILD buildbot-prometheus-17.7.2.ebuild 624 BLAKE2B 53e5d5a111eba5433a1d234c91929c192165b7ba0bfddd99cb529c5ab94e61f43baa95fa9b22837918f93ef2d622226620b18b69bfe8cb3ec9545c0bfd839933 SHA512 eefdb7f1939150323e767707c21a59a8c2431a6e006e57af1d7fed92c71c66b7ccca55da95b7af66838b4f252140efc6b74992567c921f0ecd6a638949ed3f01
+MISC metadata.xml 392 BLAKE2B 2a2acde2274ca75c4477314c27d5bdc2f02ffd3f207a000ae928cf30b258e15d345cb27dd22254181ffc488e01354225f297ad56ce9d2b3575ef4a68199b7e0e SHA512 3d0a5ff260e9606e29ec0eabd8b87fc7f338f35b86dba44024dedf2029fd8d4e04e4f895812f75821dd21703ecf6c57ae25e27ca92dfbb8e817c49c1d404bbb0
diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
new file mode 100644
index 000000000000..e84caf199146
--- /dev/null
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="A Prometheus metrics exporter for Buildbot"
+HOMEPAGE="https://github.com/claws/buildbot-prometheus"
+SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-util/buildbot[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	${RDEPEND}"
diff --git a/dev-util/buildbot-prometheus/metadata.xml b/dev-util/buildbot-prometheus/metadata.xml
new file mode 100644
index 000000000000..688a3484930f
--- /dev/null
+++ b/dev-util/buildbot-prometheus/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">buildbot-prometheus</remote-id>
+		<remote-id type="github">claws/buildbot-prometheus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index cbce86112fc4..f1eaddb2f5a2 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -2,12 +2,17 @@ AUX 0.21.0-openssl-0.9.15.patch 6026 BLAKE2B 560e399e5582d80e689298e647cdce01865
 DIST advapi32-sys-0.2.0.crate 7217 BLAKE2B ef3328a3405f51afe01b4bf0dec00def432a23935fb1d26a4c577b7f4716f1018ae44ba3d738275406512cc7085fb8be9f3795a56e84349acd2af64165ddef84 SHA512 8e6bc75fcb2b91d2b8fe281d165aa8281c8ecca9ba09552f5e4cdbadc03b91db5a98789233c4dc858ee9cf8a3488f28af5a742dac50b44f6397fd14478b77618
 DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
 DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
+DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST atty-0.2.2.crate 5124 BLAKE2B c49d6ad5d47be2910fd9cb96bb68ddc38489e800894679df7acd15c88d834035d9918afceb219eb6ce127e68ef2c7eb25a04f022218189283cd8d228861772f6 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a
+DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
 DIST backtrace-0.3.2.crate 23785 BLAKE2B d1c6c3abba281c166b9bcbdadbb1c306b304c41b8a2c3214d9da7d3c00927f338d20fc1371a4e09b05a25645a2472de63fbb644e129cabca7c528824294b7c83 SHA512 74d7d77da8a42e8c2b6cdc7205c41d52c1299a503583ac26dc4f98703f43d2fd4f6e76b34c68dfa0cbc5a0d239ee1bd0144a35fef6274fb4fdf8c732a141e1e8
+DIST backtrace-0.3.4.crate 27579 BLAKE2B 9a6ce86ab4f0359cc4e2adece8fe6a2bd6550be931ec8dc21edaadf19af8d403840e69b786e4766c99a81708364a9594b5605ed1c847af18acc99ec7f0cea47a SHA512 e06cf7a39d609abab9b2297a0f5bdb049bbbf0baeb9e048a2436b8b7ff71618ba5020ff13871aa3d49a3a2fee60fe253826ce2975fc1fda212966a935f8d311f
 DIST backtrace-sys-0.1.11.crate 282665 BLAKE2B 7db5988fb6adaf2f4b5834cf97255442c1c108b21485ba2dde2cbb855eafe68ae4ab0973b4e4caca25dac2bcbfaa386653ba329f5ec4393072c6b62f1c5f62fd SHA512 56ecfcc927857f1e2d19cea1503a3bff7c5f53c79a5072a514f2137db693585da8d5fdcca94ca0da2a5c8abb0c24184a896f04f4428b7c4830233de9fd98f4e6
+DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4
 DIST bitflags-0.1.1.crate 8719 BLAKE2B bb58e8ffc25d9b20ab262e728244d5f8b69ec9ce153351508a44498cac9ac2adff72c1c999daab8fddc3a79e4067ae772ace870c6ef9a80d7470ff75848cfe5a SHA512 aa85c6adda0e9d192f2ae817e3c727167bac8609eb85c8153d99bb42d990de3f931e890924841ca11ba8dbd1413d1c5bf20acd584d182292e8828ed56fcedc18
 DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
 DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
+DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST bufstream-0.1.2.crate 7477 BLAKE2B a33a7ab91f7ca584b2830b3286d32f45e711689f0c1fa40c4d1083f926b5bff73354fa6c9fed84580ae934888870c1595341fda1bcbccb34ce49750b3fb78cad SHA512 ddbb8597cd430111e58facfc30e6cf93bce174b09a8f7eeaf7d7062dc856137dbd238a0c7794336d9a2b7d0a1859dc8b8d225116c0c57591106dc6f2e1adc0a9
 DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1
 DIST cargo-0.15.0.tar.gz 631157 BLAKE2B 93591c7d685b5d21a1c6f78a113c19db7ceee5fd07cd4f1169414a1aeff4eb8a1aff59656c79592f7b31f64625a72fd5d5b2ffad4bdd93f19bef8be17b2ee209 SHA512 a5917d500697ffd000204716a1802e83633d0fd1859a918d57b6add932aa7b935f4ca3cd7ac206b1565b0af29414306198500e036fbf4838f4e91920a84e7dfe
@@ -19,42 +24,63 @@ DIST cargo-0.20.0-i686-unknown-linux-gnu.tar.gz 5149726 BLAKE2B dccfe492e8807771
 DIST cargo-0.20.0-x86_64-unknown-linux-gnu.tar.gz 5209416 BLAKE2B 955491adb58ef8a1cd05a6560cf7093b50df67894ac5d32c48b83984db6075bee2316c99e48569bc181e953ab3cc19562e63816747021beb2a8591dd28ce7b21 SHA512 de7fc86e39da132f29fde07f6c232fddc41bb766f3b540f1b16ca9dbcf408bd5e522e82c5e2d0930a2803b42192aadcedfa8ed2837ca53bccc16c46e76fd16c3
 DIST cargo-0.20.0.tar.gz 657472 BLAKE2B 98f4e0b43b5955fb791f1c786421ee494c75901ee87be9165531230d27fbd700b21d7bd99225a07deee7aaee26538eb7d888c7fd345a7be447dbe1b69a0ceb89 SHA512 b4e31ad2b16d9ca361ceed657112ef4647a872ae8e16052810b6170cd8cc37ecc3c903e7c2d98f914851b2210b35551483ff9e2f0da135aad47e48bbffa4a8eb
 DIST cargo-0.21.0.tar.gz 665343 BLAKE2B 75a74c8b682cefaf3d4959b9edf54bf1d3ff1567efa47c9e3cd8167f10931ca3498cc7e41ad32535bb955d9ad860864497a36694a0204efecac37ab66bcfb4a5 SHA512 5be5f4410ea4d5a23a62e6324917d91132ebd2a0644039b7c8bdc671a5d569c22965f4e0aaad317a05e670d14aee388f75baaf215ef97fb49724ab86702ea7cf
+DIST cargo-0.23.0-i686-unknown-linux-gnu.tar.gz 5312890 BLAKE2B 2ef79f7acfdd5aacc03ac3866ae3e767dfec1dc9c4cc7bbdcfb6934e2292a56084b9b9003f832ccc2f46ffb852270338e4e30839029185f1c1857733408a0275 SHA512 e4c4df36e00db5b0cb62eff25e260157d830ac70bf1354fe8d287966b6d50cee55aed77aaefae5aff3aaba013c0f734956822202d20dd51195aa7ede11365053
+DIST cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz 5365725 BLAKE2B 836c7b3765fdd45c8b1b15c87b810c9163cc311f6fd9883b99594a4327570c46bf9ff9b91f44d1653127dd933bdccc8bc4a45e4ce2644a0cbe6e1df548ca6904 SHA512 8367e2f2e4b5ae2330515b12ee03cced7a497605f1d0c86c9176007f6f93898328116e2ce22359a0dd5f80caa316b790ef28ad5cd56169332211dc28442d5ce0
+DIST cargo-0.24.0.tar.gz 967740 BLAKE2B 0e0406ea35800283070773798cbc3535a8cd717f1ac3fc92558e43c934b107bd7af4b2a29c7aa4ae7a7eee6945e1063e497aa7bbf2d737645fbdedd021a13c3c SHA512 d0aa41f113c8ed40a96a279d986894bdb8756ff49f7f8c7a269033e1000b110a2b867283bac2e85edab54b52bf8c78f9048481762a8c9e3e02a956cac95ddbb7
 DIST cargo-snapshot-amd64-2016-09-01.tar.gz 4453020 BLAKE2B c9593a27342a7e4f3ba74938794a14849852bb8b35bdf1c0c024773d57e1398aad86befc62294fe9881224a89f7a94cab751b1aceb46df75d0ecab3db35dd06f SHA512 a87cd21e5be8f7dc580e1d0b78a2ca57b98c8cf09d5d1517a7422448b5e27e6af82ad61d2170b39c2265fd02078ceb9714bd6e79116a30d9cdeefdfe97eceeac
 DIST cargo-snapshot-x86-2016-09-01.tar.gz 4145052 BLAKE2B cef39fa195a1f9f243ceabc7866e7f0f334a8761e0b9f2aa1593a7abbbcbbce4b14c0b5e8a821d13ca9c2ec5395f43eef544d182b93b5ab9e095eb1bb7cea7d7 SHA512 8f8715c117f7e54101db7dabef12a0a69696a3b173789e4b1c05f578d785ee4f77ecf9f9076d0caf74e1f0effe6c68304280afdd4013e9d8f840b7e090e6c137
 DIST cargotest-0.1.0.crate 335 BLAKE2B c29ebbe22822d906d14aa42ed60d100ba0cbca5b52cd65cd981588bdf64a9ed9f8a1502ea5cb43d11c23dcaf7f4e168d2a40954693f448818b68384450ad7ca0 SHA512 d96dfc584dd6c0ed05b609d4fc4375af4950e37d41493113d2693c5180ebb11987c4f7e3fe9e5ccb4b71f37b3afe3bcc646f92ad325ed5fd1df92ac5b095dde8
+DIST cc-1.0.4.crate 39631 BLAKE2B 2eff5ab0dca5e91947b0fd3905e102ae8c38985743b26acff7f6782493c6d8bc01881bad2dc27ac941978027745d81273a3364473bca35eafdea619b140818ff SHA512 e4baf12860db202ac37357c26c058ecb5a04c582ff1f458019d6351ae70b44b987f7e726839742523c80d42ef63d8f59518c96f7cffd5d4dd0b8e660d1d8594a
 DIST cfg-if-0.1.0.crate 2758 BLAKE2B 8ba4ea4deb8cfeb4927edcc9112346650eb9b2f5ced13e4130aed6c030f8f7bafdb50ca4b25f2124636058f09ab76f70f6a5820cdf31186b5f5699d7da4db03a SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
 DIST cmake-0.1.18.crate 11546 BLAKE2B 891e359e29c7455e504d73f83e009251d7ea5cd37eef96406ca90fcab774e8ba749c1228d28a556ec2501b7dbe6bb33c10bb35d739f55852e531cec7b32d6971 SHA512 9bb2ccc80a2ce3d9d437623059e892ea06ab3c46fe4a43735d83fba9b9a03764a619b586cf23392959456860bbf90f498ef563757c13059addb1abbed1a25e3a
 DIST cmake-0.1.19.crate 11698 BLAKE2B 99f65bc06bdf3449f8caacf0bcd16cac613b96724906409b517c9eb13b6f2f7be2deb5c3206bd232524be2548bc5203da3ea34f7d910a7629e6bb27b9fa96e30 SHA512 85c73b5e36e58f75b58a853275e30afce4c12fbaeca9532bd01f90465ad928bcb565b793e7de21154e794c604d5abb99e5b269542e4a1fd6b3724037b49f8520
 DIST cmake-0.1.24.crate 11525 BLAKE2B 9c9b7cbb111d0e5e058d1094c78f36b833cebeeb142635175b987a858078e71d2781d9e0cc5dac04b46eaf4f3fe2e46c63cf2faa2d04f0dbfedc3800820d2c9e SHA512 e8191d4f6b1474cb02fb66d2c32bd6a49c052bb91169a6091623a288f751a7ed595e4b07676c82687fc7fb55850631ff26a50016c56acdc0f74fa31b6a17ab84
+DIST cmake-0.1.29.crate 12372 BLAKE2B 39b07e5c329217beb81af585b5295a82f5e85deae705a16d3152dfbe1d03ba576eb3a4342e10e14587578f19f23c2f7561a91a6e8cea102084f1923f70cbb8e3 SHA512 ba0d9b5b0fcd6f14cd66f3d0f4eb83e3e2121262946785e0849d270ae505eedcd12329d36e9cae491e51d0320f6d73c7721405db533efcdaa3935e52df7700cc
+DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
+DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
+DIST core-foundation-0.4.4.crate 9564 BLAKE2B c4f1ba52346600f3ea850f6bdf41ea0ebbbe2efaef5e219f54b210a30d811032d47bcfd120a29eb9a45a2d4d70f82ecd3cef0ad33fa34f5829e07ff22b716941 SHA512 74fc2ee29fca7ba4edceaf351146dcebbbeb8a81fe5479c69d3e55022e0079e7f6010dd173ea712c36ecbb132fe049a80aa79e2f2ef08b5996985e7abadde7da
+DIST core-foundation-sys-0.4.4.crate 10137 BLAKE2B 02fc345fe19325c941da5389ad35444dc3457127055bcbc3d304eadf8c29a385cbe5f93476f2d52a1524e221082b79d1cd897f04bc6417dbf5610f2a58b38129 SHA512 94a371d45e9a601918b3632b457e5ab99dabaf6256feda9ff4f0e27263e481a03dd9e0fae4b2bcced9331bce9ae0b6ebaab1550cc2c3bab74c68479cbe3aa3a2
 DIST crates-io-0.10.0.crate 3548 BLAKE2B 039a12402b24ad77af87d7fac3479e96ae54eeaaeeec1fc456f238a94f93e3896db5f47806301e2111087284b188ac8727f0224b49eef49c52d92bf6984b5609 SHA512 6932cdf682254b5d68854c4c77b08ffac306e6e8e067a755c325a08b312be28f7175da229315d979902f7807520f500dd2f1f1b7b872a83ee1b22d98946c56e8
+DIST crates-io-0.13.0.crate 3606 BLAKE2B 81ef045161b0c5181054db50a70e9dff9ffd3c37c5d9f1ed5b3fa87448ef942680cd91a980014c3836caf4338e331c7053e4b1b35d14f135796b76218310af09 SHA512 cecea1114e8b7fa87c641accdbe43eb3aa59dc72905cb6559a2d099a04c41a56e2af8b188a1d388f88a4aa51dc48fbb463f8198f9269c63bbc2f67de08e2edd1
 DIST crates-io-0.4.0.crate 3080 BLAKE2B 14b34d4413ae4206d3bf3af017c51e41a8399e50cbed02084af50f9e7c2861cc84fe3a05823340fcfea3dfd0226e75f0c1a79aaa97533f3f47cca8c00504f752 SHA512 c63740f8b17cb35502c7d9b2845d355851ea559dba0b5321b17987d0a5c9f712d2cd8dc394c5ec998e223b422d4a53aa759556c92fe279a6eb0f5007f7e4346d
 DIST crates-io-0.6.0.crate 3387 BLAKE2B bb63fabcf977d4730886c4dd2ba65ca341799a0bb1d87010eb187172432b96c1796215b0e30dab77f5524a8c95f6aefe6bce6ff0eb48cfaba01c729efe707aea SHA512 225c0582e2ff28fc7a31a3c5d89f6731cab0593cc9adf2897a1a0f6a8436f58a32d46976241b813ff84de5cbc30e505812b7536df7766dfadfd5f0452626b5c3
 DIST crates-io-0.9.0.crate 3518 BLAKE2B db054ad739f3c96d9878c5bd0b676e24cffe30e6aecbfbf950cc8acb001afef36047aa36dee11f77bb9f08c58efb49a862388cc3bc2798429056fcfaed9cb3b2 SHA512 8fc628b073c192568045a7816b9dcc92974f8cc20feb3114283ec890a303211d4529c31643e1827f8c92027ce0a919c5549ad70b55a024464c73672715bcd39f
 DIST crossbeam-0.2.10.crate 32993 BLAKE2B 10bc4519c091251798a838a9ed3404f84b6af950e88209b6ce7607f5ee1105fdd1ea4c81f788321455b3bf5c6169e7296757a73619ee837ee4ac799fa1c64b7d SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2
+DIST crossbeam-0.3.0.crate 33263 BLAKE2B a1fd8d6e06f9c56d1651d1f08cf9b05605a862feb751c2254f68b102fa11d7ad7386b4d8893370f69e26f77c40c64578c39d4b838da478ee33ea32ed71a3365b SHA512 314d09a98f0d6379a9528dae0c5d4d56453404074f80ec144e77036f47be678996ef3a9b29692f582ff25b78a1c28f3864b9a66926a583efb36277bc2d25b38c
+DIST crypto-hash-0.3.0.crate 7387 BLAKE2B a1add69db8db121b4f0c9b91c6488e8543485e0f999795088f70d837c14c2c57a97508bf8681d181ea0e818d2d7370c5e3bb9173dc8d6bfd4642c0e42ca8d24c SHA512 226755b61e7d75ff73bf662cbb379500052afcfe8d4c28ba5c8f6c9a5b691cead51c43a81b4c975378569e674e942d981c434722c51f6625faa758116bfa8d02
 DIST curl-0.4.1.crate 53884 BLAKE2B a62f13b35766aea1a4fa27856bc070cea434d820a7727494282adb6d932d2e460fe680a85e8c9b568d8326ff7767e7f04d334fd886e413fef844c6e5056c56b5 SHA512 357689f9927b57341324948d4e7f9216f9a21fbbf12b864122509a11565fae4b33498b75b85c0b45566d6b2a432905f140c57889a5e4fd8c154b3fb36e81f284
 DIST curl-0.4.6.crate 57831 BLAKE2B 958378068a00d4c2caaca03bb099a98d2ef9e814f1250c19d27a737ce6ab5199736451daf140ed11bbf10c0f93d9b64998265d6308141a799e88cb25b47fb692 SHA512 865b0cae00d0b160bcdc515e7e571b12ccd46189721d26b0642e86cf78af2f321524ef75704213b2e75e301bd5b04e466b422ab28419fb3a74f1ed7715e500fa
 DIST curl-0.4.7.crate 67930 BLAKE2B aa17c39ee706e2f68d0a80ea61fef37178d6999d0dd561e531dd58627be7fa6d07df0119c5e2e53dff986474065097c0a0f2415d30f348c94841bdf9ea425f2b SHA512 bb05446d221a4cce48dc03003d16c8c9be7f2aeda9de0dbea8de96d4353be3f2c03b32c79b61921a90fd31e5eda993ddd4b1b9b229e198fae82e13d94907e4a4
+DIST curl-0.4.8.crate 68063 BLAKE2B f590e0027cee5c0672c44fabe8362b5499d2ea42fb25d8c505a653cd917e50defe14940764c51782fb482c3ad855691838efc6d832dbab11d3586d86cc9ca1e8 SHA512 5489b5cc24c9c32503400e17d5f8446503a9baaacba92b06bf2d8b6e1f36ed14e9de8c029ae541000e390678a963fe7029e380ee05858639b894fa7f45446ec5
 DIST curl-sys-0.3.12.crate 2980888 BLAKE2B a6ac52347816c474092487db655033b1651b6f760b88a4e9191ed714effa7757f7f2dcca8c5b33b9d2e1dc8e844d36988f94f9e0053b6b2fac55c9318b73529c SHA512 5a861623d0645da868bba3ae60c1a32281ec36914c38ae931b0ebc76f64395e6f80c5fb256cf1fac7e20dec442264a64188b6fd78b23be2ec16f47865171cff7
 DIST curl-sys-0.3.14.crate 2980965 BLAKE2B 2912b47d302d64d96a8eba231f0aa4f23cb757d1ee5dfd0cc3ed66b74aa70e869a9823e35212f98d2382f35ffe718d7eb13a020cd4c8f8f78c77adb7626363a2 SHA512 a8956c978ff35a84d493d405cf1d3e9ce24147c4a850710510f3ab2f461d5e6c832d47baa1abb6c34d1935d56a2f927460d5981c2ba7aecba8d9a751776e0d1e
+DIST curl-sys-0.3.15.crate 2981411 BLAKE2B 68e7856f423df0afab7a4dd1f32e34ba7d94ae00d1e46af41b53e5b5d4537cb2ad00bf20d498524dbbf8bd182df1957572812ef2333158dbfaf19e5624fe9b38 SHA512 8abfe22a11f4e364f7a18d58ac92bec7aecb2cd8aeda41ebd2b87489364ae08eb3a0c07d5e0f90424229c3f297ebd6b86c467c9ea81c7725f9ccfd690804bae6
 DIST curl-sys-0.3.6.crate 3196287 BLAKE2B d81782ea45004362e12d8ba55e0ea50e26c86f43561cbd5e2df5826f77e86742465baa8082ee6a91b456223ccbdaad12bd6d124d7d078de64be828a927b9ad44 SHA512 10d5308e60be5c08cf4a61cc991648278f832bb9630a3c84fa0f389c53835ed99b74ce89a99ae3ed092685a80f0d50276faea4a42bd2bfb16cc536b6f0b7293f
 DIST dbghelp-sys-0.2.0.crate 20721 BLAKE2B 15b49d667e62f7182cbb2f413459c872489e68a8930591f56e92d673df4919a0a78692ff14dd45beef6ea01ec6db562d052f135d275dae667d51763ccf754023 SHA512 83588245f1df7db15d0c1b0b816e183c75238bcb90776ce42d9be4a9f06c64ab761dc10e2b3da566cf0c392b22acca60c96a8a40f6ef95d4d3f3f570af3f3d0d
 DIST docopt-0.6.86.crate 41141 BLAKE2B 94bddf07ae53f21ab54501736ebeab2ef8fc478e0a4df906b82992aa8ce456339785f55eaaed4aaba07bcc4c5dbb5f8685e96393abcf9af0dcf5b3aa5347e3b2 SHA512 f79132ff3d49ad3a4eb37179a8369def367d39110829e673d926d1ba252a63c6f8241e8889895d6cac68af2543de176255a8641e49958746dd729837c54d0da0
 DIST docopt-0.7.0.crate 41313 BLAKE2B fa6503c52765e2d687da6c8edf1d8b5d4e73e46ba6307611351189218e00b4859f5297b30ec0fb30a2334c65a3a9f4d0b869661bf97c0b1783fb6d4bf8da6996 SHA512 f95549388ee834bdb3bfc2615338990e2e496b1e5059bd92376af5e3a173c365101c5fcc7e82a3aa0ee67ea8362ce98e19df4f02bf65cf14287d61e68299be09
 DIST docopt-0.8.1.crate 42801 BLAKE2B f603538a7b68a2d3615f94921ebb690f6fd67a900dabab16657b5eab08095b9bbb45d9b2846139b7091893c3504c9e76bd759c7451cd7e56f711fda14fb27470 SHA512 478c3ad7bc0df47e666527be26c2ace86740848f8a3651f4182e6573dc5b3087efc949a73467e3712e0610b412d9847dcea2421f4fef44d8786ef0f3f8f3ba6e
 DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
+DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
 DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
 DIST error-chain-0.10.0.crate 18432 BLAKE2B ec4623513667d68a2f491eae64fc7e3ab11819b64ca95f7a0e5776cea433b19ce8198fcdae7ac16831c63594dfa27b1a285a7989990111af6f91eec88399ab70 SHA512 77552e8db32e2c7d37e01b1050fc889964193d21f281c3ad28c6adf5fcf8d3ee4c73fe182b27282fba4dbc3e6584df7894a3b1fabdee7e219b6d59fcf18a1a3e
 DIST error-chain-0.11.0-rc.2.crate 25349 BLAKE2B f8d63250e994972f1097cbe6d5d2f4b5c7ff9d5bf05571976f0710e80750d6d80db8c22f924f45eff1ad6f440c887a8538964759840f4f051271ff4a18fc6010 SHA512 20c555b451ed10d800090457d6ae0ea2a8628c8aee8faa45c8bc59e7802b3ebc837411c6f6b67e05bebde6fef2225180ec74d90f5b643c5fe20b24e1b04a38d7
+DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
 DIST error-chain-0.7.2.crate 17208 BLAKE2B bfc5df3cac4ea943fee7f919050f9480a7be09f4ff467db2fcd95f6cdb072f925583a1a19df285b4815a7177cab8244981287c247ade3e58e550cdaafdf7350f SHA512 7a29d11b57a8c88d8ea347f80f71f9c4ce0b022fcd563f3ced973d6e008f1c0ffcb958bac4108cb02739547a334d6473d7aa20f66feabf06c68f82dab23e1de4
 DIST filetime-0.1.10.crate 8884 BLAKE2B d723d352ffce73d361a00cec407485ddcf9881b7756cadc531b0946b2f80d051dc27be6078d2ae2939fc0fc47e8ad7d66f9c3af697f961cb7747714d9684f055 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb
+DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
 DIST flate2-0.2.14.crate 46692 BLAKE2B 228423bc896a1ea21f504d03777e3d841cd54ad42e590389e74eedba7a6c7449d9d0ca85bdcc01c9f94ad73677de6512fcedfba9e91d0b7898537d78c47787fa SHA512 efe87214a33557ba7f3c255de21f8e556402f947bf7fdff36d4fa98999811bf92efcffdfb53bb1612a8c995673ef423d66906f740875b2213a2fb78306ed0340
 DIST flate2-0.2.19.crate 55174 BLAKE2B 1d99883a905baf6778feeeb5fd71d50f9f27931239aa7c2094f11ef31e78f9f077404a891a3e7b8285e6d730c64041bca563b9ec1f44f7afc4332cfcee4c1aa7 SHA512 c0e6a011067a7745b8926be752fd7d43284c38571b873efb57dc6fc6f3530f4305069a8e83b92bc0242c72961352687a62fbbe56edcac6517139b19c9585c82f
+DIST flate2-0.2.20.crate 61748 BLAKE2B 8538749b3bed9cde97762702cd4882a9582bb3b11c080d888aebbd31aa10da8ec056d5129d8d3af833da06d84b4b061e8ec5332948a4a43cc2cb0b61a40f1d18 SHA512 b8273301dd1ddd4d05d2767dd56b963ee7f5f777fc584d7b4ff887dc53578579945ecbd58cb0aaae2050cdd0c735b3662469098a377e68af08e9e0068c4410fb
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.2.0.crate 7182 BLAKE2B 1e8f3cc73723363635b2dac363822103086daff0781e8435d9e2d109868066ad1e3d95e4674bd6fb0be60ec34af4c2c877e7d4bae67b0fcba1ab75ad7a1a96db SHA512 aedde435a898d65473dfeaf27eb469bb76ed9cea808b3e7a9eef3087ade49e3e39a3997a515882262901988a0ff17a68c9486a635da9829eb0fbf5a708260fe1
 DIST fs2-0.3.0.crate 11874 BLAKE2B 99a950d206460df44a8bbabfb5d4681c3903b9fe21d030e8992b9734c79b8c276f8b5d58d4a5eee32661959f8e7c56aa224ab45367813c1dc5819b9455cb6edc SHA512 00423172c7bfceae2c6e769c414d460d61a763d533073cbffcaac60979493b00d19dff3b8191c4ef97c87a4f860dd11fb4f0aafd730a6a3655665a9f1d83c0d8
 DIST fs2-0.4.1.crate 12039 BLAKE2B dee27f1333c30e7dfd3a53244bb274217a1b625c97e52ccbf2d55bad7158f9d3ff1891d557291bd4c307ac2501851ec585c7f324e745a086e1433d69618634f7 SHA512 2c27424c716fa69a0d53784285683d8d87a26abe2875bfb9135502622ec4656ac6ebfe508a24b413444aa5c0077c2a022dfdb3d19bf4836d8dd9d006af5c418d
 DIST fs2-0.4.2.crate 12815 BLAKE2B c84f4eae016ae1424e63f6c2b5a6c1deb2aa1343b0bdbf732041e737da7701fdb1228a5750cb1994375e78fbb324fbb425de26e11f0aacdf7e10e0cb10cf4084 SHA512 626c5edadaf356ef9d13ac042ef517f317a376fefc76163e3dc7573eff024323a2ea0f9c1582db5d797eb2ea64f2d27e7877e774154f5d5dadc506c926a5dfef
+DIST fuchsia-zircon-0.2.1.crate 22942 BLAKE2B c27952cd4cef4d13b2d79c4dccd79ca33289fe93e71a10663888e1ac2256d922bd1f09afefad827f9f74559dc742b231af4c778e1070cf3af7d6c9a6c9a702ee SHA512 5eb407a683d6115b91257efa592a87a2b11b93e69755eba8c19fcd021ea19b286711f33a723d5ce12e3beb0ea2260f57cafe5f3a49d71bbf1bb60af96b25c6bc
+DIST fuchsia-zircon-sys-0.2.0.crate 7005 BLAKE2B b29b5e8e84631e9ec63c951046dc877efaf8289684b816d68e1a128e36a96ccc238c7e90960817b47da5f56ed52a4bf29641ae3d2f2c1396594d848a38e7016b SHA512 d938ddbb5faa8771700a8e6014b9f078cd3edd68a02569942152a00790a1dcdbd88b84e9ab51198029e170e5fef9b99af15c0af25f48f53fec0525cc4c1c9e48
 DIST gcc-0.3.38.crate 24427 BLAKE2B 8a676b54a633ec82258e6121f1d7aed9bcee85731d29f76a463d336a1b771e7ee6ddfee3ad36bc00e8fafeaeed4376765d3920fa0eb97cdff9e627bb9ea785ad SHA512 cca8e2ff6acb8bdd87017808d2ebd70db5c13a2a6cbcb8d251c8fdb8b92a0ae1738ed6ae4d0879e264aab7ea7aa7874ea4e21c7230e2d859a3f72c6200ef2025
 DIST gcc-0.3.39.crate 24744 BLAKE2B 833323aedc9ddb99edfb26e04dd55a7c1b6c4bc274a1e530874c16d5b2361b199c9f1c25ace1a892189bb0ce43bd0f16cbcedffa874dc5abfc13eb4578d9bf9c SHA512 7e253d1e1cf4b86b3ddb463975411473525ba3d8f2417b68fef07fe686c08452657a432aaab1ee05b37d73273544b3e3f97c41fdc1c2c2c505766554e04327f0
 DIST gcc-0.3.50.crate 33085 BLAKE2B 235d077e28756862d4d5220c2eea57baf22ee6cc34b6f4c178f3e22fbdbbd716018ae38bd210c5cef4ffd533e6b5b9c759443ef29622c31a356e0f9e4f1fed12 SHA512 d4e15365812336fe263108d3b24206d4de14c350ca2fae620d232d352a2876905468c3adc6829e9a517a6689398d45ef96ffc0fcb846c8d76976f77194a39222
@@ -62,22 +88,32 @@ DIST gcc-0.3.51.crate 33348 BLAKE2B 660f9db8a63e9ae5e9babf2f64ea71397f8eaf68a466
 DIST gdi32-sys-0.2.0.crate 7643 BLAKE2B f6e54cb186437c400eb4625a242cbb96c212b5978943b761f3cd524d8d55bed4962cafd036a2a61bb71d2fd71400352f5d6ec827f5634de2a3eb30f9a5a4bf14 SHA512 009f51899ecf9c8a6c688c3b087c294482c9d4c09b9c2b7fd5d949ed269bed9dea7ab5ff95ba9524c3402e4299d944205187f99ce0d0300a1646ff021030f19c
 DIST git2-0.6.3.crate 126947 BLAKE2B 93801976ebb385096b7bad616304cfb155b8e7c8b7e9ffdbb84f8f77a32a66517f1f01491ee2a46bbf3f93873a785c7027d63040f7dd1e795ef2b1be99df43d7 SHA512 c78bdd853bbeb24d8e730c48f335ca9bb79d7930a83a52cf3d769b4a9feee418d4885aa1da59c966bcfec5e6280a0854235a2042c94ac11d65832d72524cf6a0
 DIST git2-0.6.6.crate 131360 BLAKE2B ad16c7052700688f25f3f4e66d05e4827813e7bf8bfbe74f0abfb9713fd39466e306f3d9dcd093ee52b6365fe40877a611286647b653f0496ce4aec2eaa1cc82 SHA512 acba69cab03e2205b5fd5db2620c34cc04d24bc1ac7baed5fb7a1452613a78da1fa42c90c6922436386b5e96650f85b8e628f24754d0aecdc8273f19bbdfb21f
+DIST git2-0.6.8.crate 133449 BLAKE2B 7a189ed74b2e4f365a8de282486bf7f2269b4725a186bbe4c56a926d080f5cc83a5f94587783bd6b2b4e9816d6a64996e0152fbc786af1b88611b32b70a4aa56 SHA512 3565e917a16dfe3cef96e219970b25b84aac7eb481bbf8e7fd2b05ffeed98d6354df015e3f93379802fd9b8b34045f8a62069df18ff4bbba5812f3a1c62cb45d
 DIST git2-curl-0.7.0.crate 4097 BLAKE2B 95d80cbb573f8e71bb47317c029b39e309cdd3d113db85334c4ce3f3a48f3bfee17ff1bc67828fa8c2884b2b51620a607f6a18a50901828c77da99c1d6463551 SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST globset-0.2.1.crate 21542 BLAKE2B 6c104c118d05a8e06280f736dd4cb7ac8ad7c5c90a4baacb0d8f602e64cfe0734b34f7854d0da725802df9753613b9ce5eef10cdb8eb979c5eea918fa12efd35 SHA512 19cdce0b498033a8649006621137dfd1df5cb00b69e5d4ecd4ad34962b7f8ad10df94bbd07a92074b43f6d96b9b49a6b0861072900d1591fb8d64f2ff64c7eb2
 DIST hamcrest-0.1.1.crate 9217 BLAKE2B aead0773fba00b44ca6634dfafdfdc9c1856cf0fd8c6f32de7dae4be1285021ff097a140b8aed28d1f5d5a279681f95d24de96f45f14aba205fcddd0bf301f0d SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d
 DIST hex-0.2.0.crate 12368 BLAKE2B ab1294efedcb16c18e0a624bc67ea17430dea26eff34071df16a211d79fdd54c7a05b00a516f7561b19bcdbd28907863ecf2fa5022a539fc682a3e2a7e21e335 SHA512 9dafcd03e7e244b8134cf33141888788c722d64c6099946ea63d6ac714e9a1b2a6c158a19c2a85ee488ba32429306174a4778488579a65da08084b468259ec25
+DIST home-0.3.0.crate 4042 BLAKE2B 400b665c7f4e222a2875e1dc70292601417d558aa4183535ca79279f0feda7e12157c3b30465392ca02591009cffe066e1dd37a7c9dc3796bfda29db82cdb475 SHA512 8e16d5d3b99e1e8afc33894659aafc59ff3656e7f55cf9c1ee801d9f3d356cedf36f13253e17498a7642dc0edbed77dbf7ae2d40523ca241b15826e7958cf585
 DIST idna-0.1.0.crate 234027 BLAKE2B ab59c9574c1c7c830ae9e183795511b9a9bfe2300e631952edd09927845457f1d5eb36a71271d50678e8e4219e230c472b24c78e192550fabf5f1eb49e710a60 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424
 DIST idna-0.1.2.crate 248301 BLAKE2B 358ab175cf73dbf22aa98e848351ea55a6ea0a68a4c14417911abaf656fc866cbce222175edf3f6117c73a952514aa97104f093b5f4e018a350b9b263f3e1687 SHA512 28aeb6fb22f5d2bc47d12d5bfaa24d6c6b070b1dbe66f66a8756bf6cef5f3f21017a4005f507c6b5d86944d54f82d0c7ea2b9aa215a1b758dd420dd648726626
+DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
+DIST ignore-0.2.2.crate 39372 BLAKE2B cfe9b6fa1a02bbff3ca825c8d3daa6eabe61d6b86e8202d0929ffd59e4cfccddc99be4e41b61b9d8445244f649d0f1289322aa1b75d3e8fb1b7dc27edf900783 SHA512 6280ac43ddbe599481e8bcce95be222e328d64f6d8a1bec46a34a6f7950b6ea02c1e56fb8e2fa7f3167b6486536a4953cf1ca67e0f8757257a39304d9fe0f37b
 DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
+DIST itoa-0.3.4.crate 9921 BLAKE2B b2cc97b6b50164bfab0ccf3afb53ec827ec3247a8111814f9e2e3181394515abda1f452168d11b518d771701f6ce9a2936a0ed69e9b82e1a842c51c1e74df536 SHA512 1cecca0c6c6d9602e692e16cb6dce850c0f7c7ac5ec1defe1f5b8a17ed325abe41eaba56c1d973dc63bc476b52d436a90b266f6eff99c618b6581cbffcaa278f
 DIST jobserver-0.1.6.crate 18407 BLAKE2B 94a9c767fb632364425627b8080337d2a14da870ba546c4583b7ed14bace118477e6a7d527d666d8ab5bbf2228725b488904f3cd1986af9bdbe7d5e073ed44e7 SHA512 ef32d6741321b04052ecdfdae1a1267665dda4f275fa6b0d875cda76804a8e704e54a1d9bff478fbd196b5434e651a82b800bf1c9f5c726bfc8ec6d3d7c8ce37
+DIST jobserver-0.1.9.crate 19752 BLAKE2B 50b174e4e2b858d65d3b53a6ceed93a18802a2283abfa74a51ac382f073e4eae19e48a35bfaffc367cd31f747007cfe46e744cba8cf65712568945bc8b2db141 SHA512 071659d76ec2d0e8f43a4699c6a04631561f6bd7e9fbda5cbf0ce818ae4214c6991557c996143d52026962bfdcc935fb91c70d1566871a41b2c3c6a611649c41
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
 DIST lazy_static-0.2.2.crate 5026 BLAKE2B 9840a70456cc52c40c983ab1f516dd8a3667ba94e3758a14f92b29717adab6e9072de254d378f8702d461879694a0d3f313a941afc6d56ce6431efc0dc6d7f2b SHA512 d151405da0ff2305cb9556325c783c3214f57f7d905a9de9e41aabfcfa3921a402957b71e48b307feff4c34372e04075864d3eef3b44098df3f8015264eead09
 DIST lazy_static-0.2.8.crate 9950 BLAKE2B fff432af8299c8ae39f055a0c6bf0b8bdb7c3317b77ffc8a3c9b248e79434f8bb3f737596822fc5cf0dda7a2ce39616f699ca13a95d2f56cb619b3263beaf415 SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368
 DIST libc-0.2.17.crate 108320 BLAKE2B 951798aa8ba63076e02e340e6d8c55638e773cf9f6e425bdd1917c9258d0dba5db119b53635ebadb75626b0a65bd94c3516925bd8ef8048ae1102626788db0a2 SHA512 fc3a1063ee1c7dac2e4ac00c4fbbf467cd4716f28e68ee897922de0fe0bcf193d44abd0cffa9e52a01b0816549c5156723de6bbbc7e04a05b39c50765ea7d067
 DIST libc-0.2.18.crate 114209 BLAKE2B dfe3d850c4d5ec14ce1acbee4f8ff50c098b269c064279ac639195fb67da0c5a1c7f75dee7c79657a41a8ca34efaeb0b1517b59fda4262cfab82489e1247f759 SHA512 d99e0db6fcc6538ee88109c2857a9e24641326c399f604d9704b9fc9e1d3e79eec8dfb10291499b1900a9a40f0d3d00f50d4709808683032f10fc3bdddebc2bf
 DIST libc-0.2.23.crate 153939 BLAKE2B e89495dc4b9bb791bfe51e31a8047a20b74ffd585ddd81daec411c583d5d66b0c4fb2ecf13b19d2ef49a7023018df395f388681b1cb7f2f0449ffb4babe8a8ca SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72
 DIST libc-0.2.25.crate 171026 BLAKE2B 5fed88e33f522cc0ef8d6fde4a893af45988bb497d4cf4b88a5cf59a3847d63d86eda45c9a46448123fa8b0c14229fe426850f1adbdff9b4fbb054eb7bf29627 SHA512 6555397955a975e221453f55d712edf3e08b1e9257f2ddb0a9216cb8febfd2ea8b9795ff19f4ec6c9384db805e52e6beb75a265315ed00bc481017d4ea1bbaf0
+DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
 DIST libgit2-sys-0.6.12.crate 4653762 BLAKE2B e6ad59c913169ba7aeb14aabe1fb21e6e9a350f94d3d2d9391b52295c1b771031842da6d0742bca6a2166d5609b39408ecef44067529109da2031291c3e32829 SHA512 9793177fca3cf89fe64138e3dd7ade894318374a144313a5876ac5766e594d3999ae0bbdcaaa384412a4154e5a4848dd419c888c5ef11a2817a42dbcb4d13d46
+DIST libgit2-sys-0.6.16.crate 4677407 BLAKE2B fcb6303340436d1c3247a3611d101b6e4233df30c74663708477bb31d0b1236df4f5a580a15014c3c33a1a98d76976151a94f1fef9e13dbca110ef4d0197299e SHA512 5319fb0a0520d18939d1423e8fa6c32899cafc27048030192197404037a2df52f624039a437f81c965d25fb27aceacf20bd121407e23f5e147773aaeee00741c
 DIST libgit2-sys-0.6.4.crate 4210492 BLAKE2B 589870e13e6d6913ba32864ab1d4e4909860361c1827ea83a7cfa15b0c6678b787fc67f44af8110957a1afba2f54eaabbae4a1d9dc509a54cf6ced1e9a037601 SHA512 7fdeed9d7070518ac39fd77bad57f5ec2c4ef1043c49d97c679555d36ac50d26ce430fe3fc051cbfb619a4a62908a0b5ab1a52bf8edca1ec96f332621b312e68
 DIST libgit2-sys-0.6.5.crate 4211865 BLAKE2B fbda744ddbd5decfa85471171dc97e78e1efe12007bfd5ec4c2b037e9661a95f40c73d8c6449c4764708c3ba1cd34ac5bc5fcc1619ccec4547558e9053221177 SHA512 36b5ad0893c1dbf851a4a85dfd8c55eaf8c8267bc387ea2dfdbfd2dee7545e53b8096756b1c89edc95e65cc8c83ab71be8bffa3271b7831eaf398ec744cdb742
 DIST libgit2-sys-0.6.6.crate 4216277 BLAKE2B 4f5fbc75ab26eb488309ae3607cb301fc0477626455bf220133cbf234af16cb39367b31e86ace509d4c09b94b3a915c6ff02978589f2feac09d5e562b9793ea4 SHA512 6cbef4a910a752b9ad4489f45f0d04ae15a68d647f054352896d0aa50513ad1f13bd02902caa814ff8aa2331d9c786aa200ba384ed3239bcee52678d4e928e61
@@ -88,90 +124,124 @@ DIST libz-sys-1.0.10.crate 602079 BLAKE2B 828dc2177587bacf504d1ee9d53c6dfa88a286
 DIST libz-sys-1.0.13.crate 602795 BLAKE2B 1d058639dcde0583552a3500249338c5b0a6c84e45b59da267d025091498d56f3a989b796893cfacbe379f77a9c0f0d51f7b974c0cc084bd93b91c75a82717ce SHA512 13fd5c8be6acb39c47d1596b2aafe6e6ac576345d74b7d121681dcfbe30bcf585bf096ebb4cd62dd0805aea959ef5eaf4fafe72efbd7302810c366d0279fe730
 DIST libz-sys-1.0.14.crate 603292 BLAKE2B 66d31574d7ed1c39e5208f1fc1a95fe03f214a6809c3879a67abe0436cbfdc4f21a1f9d9dd58aeb12101f6bf9d5bd9ccb12b99aa2af3440004a21beaa8b09182 SHA512 f62a6fbb52d8af77c7c7aaad910c169c3b0e5e5bcdaea39bf1ef35dd54727ea972db481c75715ad83e123e99fa5d0304f2706ad384b50399616a3a2860485215
 DIST libz-sys-1.0.16.crate 603527 BLAKE2B c7becaefde627e1e5aedc040db28f5f5d3035875672c8c4471b573c61cb86b848c4d23a1b6bad0b9c68b566258a13ebcddbf728a1b8bef2c48d2034d97414f99 SHA512 b0d06c12b550b2c5592652d5085f4174ad9da66b6ba430d8e66e18e119ff00d266a1a325966e799e04a2c170f5728a36614a2417a3c15a3fe8e6a68aaa07299e
+DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
 DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST matches-0.1.4.crate 1530 BLAKE2B 1c823cfa18f896d490f0a5a03bcd3afe735418a13334d8d0f76bb2f2d2903659729f399725ff20392834566aa2d8605f670cd8f9474ae62464ebd95662cbf850 SHA512 a0248296a155fd3132150dcd95d3e51b62cf7b99a8530f0c2ea34455a224613bd7a2d1803fbbe1627aedf826e82e746495df319b62f1189e361c9fa1cd8a380e
 DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
 DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
 DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
+DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
+DIST memchr-2.0.0.crate 9824 BLAKE2B 7e8c47b8ec9465d9c91879a1ac28d8a31b0f8a6e40e4553329d84de8817b2333dda4e234f02ad3fd61e6c68031842a79fca971826b39afbe2fae66f682735fa7 SHA512 de1ba67ccd342cd0b5cc493b5eb67e0e4ef90d0da0c1ec035ae5daaf778fc8d16eaa620d2cdf2100f45a3861640ea174eaeb9012571c90d47e2e925300665b46
 DIST metadeps-1.1.1.crate 2767 BLAKE2B 8e03e803083d6f8771c1baaa9f049b8f252d209f067a69fc240eb7db374fd025d8378a03a836db7c9dcb8d01bfffce4786f285772e307c760a9beb6948eadc86 SHA512 fec3e82e44854b6dc4f4322727f33f2afc5e676c5fee728f299240c3eb40595bed5a46afe75f51fa7f6a32f97e12bfddd04bed92981d7ccaf9d26400b72f0dea
+DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844
 DIST miniz-sys-0.1.7.crate 53361 BLAKE2B fa2f3a221ecc7f325a00097c583db027aaa4744298c081e6d83a3d72beff43cd45dfb7957ecb4b5662adc712308ba2cb0a83c567efe55000e9303835179497bd SHA512 30fbd5a040cc55642a023ac45915081af5b91c7929e1d5c27f15aec6fbd714886d17b8d41396ab13329f150288fae52a1ec21e41fc3e660fb1a6bd388b38b028
 DIST miniz-sys-0.1.9.crate 53242 BLAKE2B 1259dae3c0c1d37c68e947f9f64e8c4044ef7eb6d900cc8f6a8ef07a42454beba4565885c301021cf925096b605fbe482d22df6c6f9b44a228e7a6fe468ad7a8 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709
 DIST miow-0.1.3.crate 18874 BLAKE2B d80e72e3a3fff2b21d82f42b0937aac83b340deea1cb33b402cfcb8249d20aeedb1ac79e3b859ef96fe1221bb8a0db6e64959a1eecc09b59b92af8fc31e07b60 SHA512 e1e8be24dc4dc81a52f94d7b779d9ae3950ea5a5f74d1b64ecaa04e556c5f1a8a84058bb3388836369e15c44621f5193003499420cce3098503c47da1b374392
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST net2-0.2.26.crate 18489 BLAKE2B 702431b884b99212b6cb00125d4de249754512685d14b10e21161e4d619943c4262cede67efc49b782fe324b38da651cbc57ac1d8478a24b16a75d837421763d SHA512 60c6c3b0b9dbfd844c7b52565bf3ed4977394be6396c19aa872d9377bf1961ae3e2cdf87da3822a81d78d453369d740b0477dc48ee62834bd6be4ead6cc92fb7
 DIST net2-0.2.29.crate 19349 BLAKE2B 3211b41683327e88ffd3e36417a1bfc6d5051fbb189677ad4f3c0523bd73075ea03c49577a3a58e024bef942171c7a21fc2c2fbb481d8696c7b53fb825363626 SHA512 9913b8787a42891f7889484d89f4fe8886c2453d6505cdde68d93884a63fb7172e6354eda2dd7cd3ef8f57612d27d2dd579f2d978af4fee812a3bd941fcd21ae
+DIST net2-0.2.31.crate 19824 BLAKE2B 685fe747d74c34fd9d28c759610cf3dd754c32632dc4f83f80c0b0663c558ff7c93f460c767e2f6cc3a62e8eca0efa1306e592ac21024e365860adc3f2750df4 SHA512 23311a2b702d705219184667d4dd976c43111c88f5fb0ccda63849a7c5ebea19a08e4b63dd73647db805739184e0b297234b6c0248563c36a3f5ded4b5315dd2
 DIST num-0.1.36.crate 30018 BLAKE2B 705186fae1a46f09a3c70eef66b5132b252f9bf0ef5afd8fbee4dbfc4c22ddffe9297222fc5e7199c2037d536d7bbf2287de6c7fdcae9a09626675b78bd385a5 SHA512 4af505c3a9b8e5343a1c565274da2ee529a418a72f4fddf6bfe2abe57180cc5e261c817f5b9d7a7c23cf73119121c149865d02a1e817cd2e5ce82369f6b4ab96
 DIST num-0.1.37.crate 30152 BLAKE2B e4dd6f154c042d3ade3a850e0dbce92d371d1997d0ef3b801c1af050a534eb325a448c4f804d430d38946e818d4038d6f84a6195b3cb53f181bc87aee4b18237 SHA512 56fab4ca9694d323b947806f4a69af137d30f8cff5ba7a4ddaf35dc97104391ea3a076fdc4b58c9b867db5b38f4f4393e9565ee52cf176c2563db8f15a0e4ee4
 DIST num-0.1.39.crate 30137 BLAKE2B 430f6fd6df89ba3ed5b0899755fda65da4d7f0ad4172926a5f8d49938121ae36355a03c33e39f3c6faf965227e7ddeba0bb1f295d4e582642a84c1fbfeba024a SHA512 19d04469609a80dafa8728e44b9e1a064eaa4fbecd2b8e19f67d7883b5889a2e7ae7670075bdd0e6306aa5ebba490cf7f0ca71a4de9e7000551ca0704d092990
+DIST num-0.1.41.crate 31846 BLAKE2B 36b4f094ea56c422bb1123368f06c6bd146adf5ab2f4d2b3ed845bb5f0754569013696ee45541a58589ced2048d3e8070f91c41215520a2cf84feb7b9918a9e4 SHA512 96c551c1a5dbdb72f202466102cb2d453f24c40aa74f627d10c36fec3d541e54c9815a8ac47703ca12b7b5a50cf964b2076b9a3f08d70af70cfa934491dcc70f
 DIST num-bigint-0.1.35.crate 31261 BLAKE2B adc41b86da6ea6e6a30f4a0622a25a828006ebdd79eabe02a15b987ecaa1baf0638ba1200fa8a57c89c89dcd024abf1b1175113c9a7ca9d32c6696eb4c8e72f3 SHA512 41a89872223bae94b7225937d816bde6ff7d46af2d69077b2da79cbfcbf9491a3f58ee8c6218315b67b760baa85d57c1040e3896ca6a3d6caf1014b7c9ff6c09
 DIST num-bigint-0.1.37.crate 35577 BLAKE2B 27f28e0ae30ddcaa65113f6e34ee2f88a882dfb0398ffd66231b95fd9d6f62a2783b8fe0c44c970d8c702e0b4c5131b28c23dc5c012797673184965bccb77360 SHA512 eceb339532789a1bad8be6cde079c291754ddb10c9d7d7a1cd84f5cf6394c4452df8bc240a231f51423318b09b43e43b09691aa796da25a45f84f3af90474166
 DIST num-bigint-0.1.39.crate 34736 BLAKE2B 43d3a3b7c88b332df0df854c53267db21a673f77db4f974baac7ad16aa018cd076d7b078264e2ea71eaf6c0e584292c4a2015f0c3fa5f764160e069dc915ce2e SHA512 aba29aa21616800dffb530ff4dd4e5104702a62f78a3cc006c0fce8d03e820dc63cf7bd10593b99bbf580678e9d5cc13a738043367ea2ee3ab4e6aa70f701719
+DIST num-bigint-0.1.41.crate 56466 BLAKE2B 04f6db29a60b7814cc4ae9de84636044451ad82fadb8b05a9fe47aac5611376be77cc7635ec5eef512b0df3c729e6482731d8a1d39560a9297eff4ae3babc096 SHA512 c9e19babcb448ac19ac8099fb1039e9ab8b1b7ec354120a7f958715da0620f2a54670e8d51d4470dc8719e51191a5c6b00f3ab9b5617c0ccd77b988fceceea19
 DIST num-complex-0.1.35.crate 8114 BLAKE2B b10a32d6634120e430a9728f32a6791b18c862d20b459d9e3d653d5be13eb5908dcd49f7adcb44d8c7b26f8d010585029c17cbd0f5829edfe91a6e732a170ba3 SHA512 fa6d8de041e4b02813da69ae844389ba422badabfd2396f11716286edf1ba566d3d59e002e7215eb2156d74e1942c2435117054a0d9cac23c00e7285c438aa49
 DIST num-complex-0.1.37.crate 13522 BLAKE2B bb8552c1a0cf0a3efd3c14cd0c71712e806eed73f629083091ff7c7605888211f135f9573736fba8802d2dc598ab64b6deec2bedc5aa89c490979ec5c32e95dd SHA512 0a6deb8eb6555ee12b8432ead66d35b62b7c91bacbf176093b89f8c3c29ea7a3a7231542810a3c82424524f602e20a820d08e17668af073053c02b2d08dd6fb2
 DIST num-complex-0.1.38.crate 13547 BLAKE2B 23cf026e4dd914f1ffaf34002626212344ac6479acbc5b67cace3bfdce5c4d42ab0374099434efba7fee2ed244e037c1393c9ff6fa6bdbeeac316581e5dec875 SHA512 4a796ce2a924a0a0867e630be657b11231a6897fb3685eff0a374d61c0343013ce60cb000a871a204156b75e83e2f6d21f519add645b4b10ee3b20633252da47
+DIST num-complex-0.1.41.crate 16549 BLAKE2B d5c4b90e5835bf2cfd98b7fe88ec70cc4b2c9291f6de5757b8fb6521adba4cb4a3e21bb07a8e6cace6e4b80582208dbf75326d0cbac60797e0f593d02394ab04 SHA512 530d2dac0cebfc05d3697949236d9d687e2385b6ae801fd04452d5cf7d9319c95d6152bc3a2563c89e2fffa603d7baf4ee1ecc9de613afa3f24084777d2d97f4
 DIST num-integer-0.1.32.crate 4312 BLAKE2B 60fe44ee659d1e7ee4438486f7bf510810800a4b98eb207abb1c662575a98eeec565674e9dfa95e13271ff1e051c35b77d8dd71e8ded4113ce209db6ef384bf1 SHA512 a1e413aa7881928b848630f2125fc1053a085027b04df7493a33cc711549d84e0ee250f6425b978054c486bf3c532fe04beca191d1729ecccc751b59bdc6ba6b
 DIST num-integer-0.1.34.crate 10400 BLAKE2B f03f075ef01bcd68e6b465cc0e9aaf7f54532ed2aeca31d0bacc20b2b5dfce71b71edd27dae488e1b3223155c29622150d5365ae2d1f63aa9e5f963b4a7cba3f SHA512 63a7a46bd424dc2e56462bf826bf72f6ccb62b01786eb78ad901b8fc78aa2b25844f9722327a7c607c311877695e6c79889fb9e862e12f7abbe01cd5f2a3d4d3
+DIST num-integer-0.1.35.crate 10413 BLAKE2B 9db5aab79c3ca7874e8b080b23deb88e113c67317e86bbe4d2f9178b4271a6d68d017d0bd0ba47e4cbdba2aa2bf816aca44a9763fe03a39746ad09bdab7c347c SHA512 141f07b433e363495cc899d164615748372e7135958af9e94354e75be9dedd348071592bfdaaf10f3f1e828d502df505aa28a709a58eb83ff2380e92fe3082b7
 DIST num-iter-0.1.32.crate 2896 BLAKE2B a6adf8ecdada61fd4ea223950cefdc18c5384ffc6a28d2c6694f14af1eae91488f3d5e2acfc782c4c1da806cc8e920819162334d7379af113294d72b87b4dd18 SHA512 ab13228dd619c68c8c2fcf8aababd1b4a9726f126837a83e0e0694a93a3d2cb77620f923d629bc464bdc311084b36ce6248770b965f6a6bc0694a8f6ab6d4cd1
 DIST num-iter-0.1.33.crate 7397 BLAKE2B 4400b4b6ff4f8d59cad3db732769a9a2e390a8bc957a57bcc362a0ecbddbb6db0853a0a3c4d4364018748df54e05566d7e69182329bb1cfb334ad9c4c230f6d5 SHA512 5e27e8539b592dbc370f174d9fd3922902e6ecb47c2324f3a347fd7f4d069d5a9803a2eaa0ee228381b926249df2b3b6ced23d5beb2778fcd47c1ecb96b5c283
+DIST num-iter-0.1.34.crate 7351 BLAKE2B b7455eac48b49f53678b48e47c166759ea78f921d60bd9743820f85118d99b45462b10e841f0bb99352530b58ed630d9c5cb97706df7177d665150dd71135ac7 SHA512 c983cbf7bf7daea400305d90b18644070bf1b9e6783b463b8a79d41fa0b37bd6035c8cc462693f27f1fec833051f1a5e3b4394618476b96f45ccfc692f581a05
 DIST num-rational-0.1.35.crate 7759 BLAKE2B 5d990f878398938c9fdf64d90287279e0e8d42629989414e946c85efb64762a4ebfea3269057ef2075e790e26e78d135e32c778552703cd43894b59a9882c5a8 SHA512 2bbf05b3ba1a3e98d857ba005cf2aca1f1f2e40961902fea7600cb90ae6e9b5626eb2419f214d4cd07794d6cd5df49a6ba1808fb43f2d3db40089f91a785ddcf
 DIST num-rational-0.1.36.crate 12556 BLAKE2B 0ff7451158a05766b35ec5f6d6aeff2cd4915e42a19e4e33251ebcdb38d5c3cda715ce94e956d6be3cba06e8cd44a04d555a8b3b725d0ee0547c3b4e52ad1dab SHA512 9325ca6415ca968df0512fabae46910ffbb3b94d61e06ee8392feb525d65654214038624b5df8ff3146cec0ed22a52b9e96bbf54b13aa51aa027df364060cad6
 DIST num-rational-0.1.38.crate 13848 BLAKE2B bca17490a77eba8b01fb48dbf25711fca9c770c68a7032e313a23cba11860c45ed90d0891f0f73be7814d241e7a23e6a453eb1c5d214074510c083cfe693c33e SHA512 de0613f58fb30d820e20622e3ae504c3ea2946a2ad9c4bb0c5cd31271618cadfd660b595e7fe44b3b21b23490c6831b493b5764568de87a2c33c96fcbe8fba7c
+DIST num-rational-0.1.40.crate 14510 BLAKE2B b95c33b0d08769d9ed593fe87c6363bcd25b1279df8fba6fff944691696aa9c3555e4094005d0c39c8b82dd5dbef8ee21398e6c926c6325d769e08b080fcb6ab SHA512 3d887b115662b0a98f6648189c095dca9bbccdfa84a8e138d594e4677ce7d64b60c8ee554658a38d7668609c9c446226b4b169cb90bff1feaf1e6fc5b67c22fb
 DIST num-traits-0.1.36.crate 15071 BLAKE2B d5150d8ad3f16386ebbfcf34728a99256c7b6ab6cd242c8c4547e7d20ca2d47fdd6d3b2010baa1a003b7b747d314b5e923634c7841372935b13c22f118ed365c SHA512 b1d81ecb12e5894ce0508f0a23f98ad36f321a8571264753087703defcb905d982394c924e21c1da025a43e5bc964ad6d59d605d7c8a2a50addeb89fb93fdebf
 DIST num-traits-0.1.37.crate 20492 BLAKE2B c7327ac98110871c9ce2896653c8b7c7e3ce04b966c7e97f21608ca12d37cd03e771b0111a6e7eb2804055bc87f13f38709130e81f1b559d0ea40182c6f8e2d6 SHA512 290c7ebc5a0249d9fd937350b854cd5d181dd0ca989a6d9b3d5e05e438343083f40261b4e151f3ce5546e9f9a404cb091b587bb7e1e193fbd26c3317b122c2b5
 DIST num-traits-0.1.39.crate 22618 BLAKE2B acacffc5ba41e2eeab0cb50f2746dba800fc5ebc4b9bb32000678eae117bf0e26d52b8225f71ac7c646bd7f5d8ab37615aad74086dc6ff4ea25e6e6fa141f024 SHA512 daf317fcd87807b2e295a4f748f1152f5a9b012bdada80204c97d33e3ef18c89432680db6f79ec655e585e0c38428c50ce5fbe7215f626af6f6f83eff47a364e
+DIST num-traits-0.1.41.crate 22994 BLAKE2B 01f5006d86d5785d82621da2db72fd036144a2c87e3e425753bc1832a875a71be16d6b40e054f2c4926c0861d9b44fa8e2b83f978d16265116565d3b55c475de SHA512 94387b02429a521e244b05323c865a498e794cad10c047baa37f928e55d3fc20d55e2236d886462833c628ace6333cb90b2e3f13b2f1c4bdfc135e0d04a6ae2b
 DIST num_cpus-1.1.0.crate 6381 BLAKE2B 878fda6111708541eda31702b70e4a098a77ab6bc3654d049472e17cfedfd1af5a34b5f4a8c82f5ddd8a6ef1b6d2d5c7c31e117b8d1135c6d08cd43b4680fbd1 SHA512 31999bdbda7e1ca02a4a276a47f4b61e56dbb8987747de7b6850d5c9f21e0b8c541b5fa9fd07203c8790e6bcc6ffcf9167270dd2fc9716396b8d3cb2b88bebf1
 DIST num_cpus-1.5.0.crate 7684 BLAKE2B 0966251142d988d65f1776cb1b384787519a406489e855e432324e3260172aacab9f15432b7c4e4d25e515c17839b148fc1382c255ee580c56bc7e6863467665 SHA512 c782859acfeb26e9a335920799a071e9ede34355fd0ae39e708fcc96372da09c3d144267e92f0ff76fb079b0dfb0bce184b9b44fdaa61a15d8916b879376c3c9
 DIST num_cpus-1.6.2.crate 8442 BLAKE2B 2abdaf71357a958cc3f968184cd1e74a9b1b4a8f4b3548a54dc65b10f560a580263479e99cd9cea37179a9cb9fce4db248c8c117802d4ac508884f589e9e156e SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e
+DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST openssl-0.9.1.crate 80149 BLAKE2B 4866c0c3d7ea833763f6343e7854faed4aae2ece89ca79317a9bf004ebe4926d7f31643e5824f72e49d5ac72860f3e6f277cebf28be3235046d0bfb3ccc02266 SHA512 8f3fa912e16b203f8dea3815bcf72ad80645dc7ec69c74cb0aa5ef30a69b14577fe292a1fe7d7aca5163098bf4789deae7cf99c4bea3b3f48cf7e5513f3b63aa
 DIST openssl-0.9.13.crate 124078 BLAKE2B 75091066a1f9a4b29b2e9e15c20f3f0e8a8a394e651492aefa2a2032fdd9a1605580c8e7b1add8d309e915aafcca912f213b3582e261210a0bcf6d5449aaf4ef SHA512 1c61564c238a2a62e9a5cf567deb088feb5c9c595f348fe3ba1a419b69bcdbff6632c3544d49f805ae69a98cc64dd0ac240a24f22cd2da3560868929837b4984
 DIST openssl-0.9.15.crate 125845 BLAKE2B e52f0e86a11799be507d85fac9da77db5e282b30bc8119e1263480e9a4bdf9867629af784c02ce7fcfbd81ca3c92a69f5cc482adb687cb2fbaaa2dfcb8812958 SHA512 ee15cc7dbc075cec32ad12b0cc12e99300a967004e8f19c91a16a456519821f29c9ae8ffc95f16e356bc359edee763069e5fb887fadc22547d547b419bc73ac7
+DIST openssl-0.9.21.crate 144676 BLAKE2B cebb70f94a0e6e0d68ff2c6bb712209ed284228c5f67c25b075df3e864486e0c7231ab07e9467c5008a49699fdc53e634f0861de3e1667acddd23f4d0f98013d SHA512 9758eb2956961add36b667ddb590a6cb9b9fc225e22917e3e8f2392e0bf10569affeb726d4e575e0581cdc3ad6daee484737602fb6871ed267836c88f9ce7d43
 DIST openssl-0.9.6.crate 86211 BLAKE2B 821446a5ae0f6ae3e7082dbe6e6ad62290b7a75dbe091d1ffe8f50843f2aeeed8a2af63d14c6b90e37c8226c582f56500f736df004640bbd6513f3cef773705f SHA512 dacd50f81e6509e7508a1a74b949b13f3500ab2774c306d4b46a2b48b70c7a3edc41ca321b299be56491469e87bbec5a19320b89f1ae426ef30058b480c111c9
 DIST openssl-probe-0.1.0.crate 5638 BLAKE2B 043a2bfd022a6cb0523eeafceb60a36fa5d09fea231cf4a70c54d06794781ac3bf454fab69ee79f9e9a74963c54c021a609dab572b0490bbda16d049b9a04364 SHA512 044a4fd477420a511a01971b3e0373971b7c06f4a8e3f039745a71b84c652048437260d608997ee2499e0afb886e8dc637e9086545075eb3ea6979967d937c10
 DIST openssl-probe-0.1.1.crate 5668 BLAKE2B d3ae9cb2e3de4700ff54f6537080c0b6a8b087f2b68c27046fd789a0e3d7eda1484e4640ce83c4312324c4550593dd29985513fbf8376391b51c6a2706a16736 SHA512 442617fb5d7f540ff05dc25c7364e180a7f4620848a2eeec31afa5a59ad6ef1924dc6254d24d5c73f356532794ce3cceae353826bb78d061edebd5fdf60296b1
 DIST openssl-sys-0.9.1.crate 25655 BLAKE2B 23de94f0f2cf356f72129448715f5bfe5e9d853b7fb26db1eb9ccb027afa12c408f21030325747f79a43f9e45faea4f77288a5fb30de5d9113a36d6682256fc5 SHA512 5ec32c40d96b696b954e2a451f6840ca17ba0c9f59fe24e55708075a6615fddb6ab403058b45ffe1acbc0e8d0e418fc47fcff09c65bae56203e98b1e240814ea
 DIST openssl-sys-0.9.13.crate 34706 BLAKE2B ac0e6b8eb251a09b519bf7ca72f60f38f85419fd98390ff309134e602d003736ff7b3845fc5d0c0fd91ed5cb027bfd90fc0984174dca394b425bdc73b17c5eb9 SHA512 93066afbf3a3dc05e9b1019f75c5892d31a539d002a3235093a62b6767be148b8fbdeee4671041868973f828c5da4526fa02e14cdbd2c4bb0c77e5a22fa048ec
 DIST openssl-sys-0.9.15.crate 34003 BLAKE2B a2ccd10daa6ad0d67d9c4b1a6ad54a64de7bb44dbf16360192f3572e65e149574a70ae200053823a71a68b185bd6caf27f62f875dafc21b35cc40bfadde4971a SHA512 ee1fe69b792100049534fced217bdadfe4092920cbfec7c782da7e1db2394552f73c6e80f6bb2eb40ba66b7dfc78f6b5a850e001e8ae3e8de9dfbd9921455818
+DIST openssl-sys-0.9.21.crate 37962 BLAKE2B 91fefdfa5c6023a7f20d6d5c69599563de1509f2e13786e59b3d71dcd480f1ad95b29822ebc8453f396a380fddc0c14ac91b55b5a23d60e3e8f3bff9f7bdb8ee SHA512 edc859b79be4a77d992d628f828032e766838715445379d06d3cb95592b28214a4fe822a10fc418eb334bdba9ebd1982851a2ef7ff3c362aeba8b1d331acd5ed
 DIST openssl-sys-0.9.6.crate 28093 BLAKE2B 7e4119ca140d3e049e628450256820934e7ef38311bbdee78f355d0179b638197aa98903f6134cbdb16977d0b93897ec26cc10da5088a77704430cb7a9d93b07 SHA512 b7f3b7a0e0b7cb34c7b1f65efc32738ccf40a2ab93782722a5655cfdb0e2feb566e1a53c8121c6d2e16794f26e817aac1455a39f8c422616fb4660478b339d8d
 DIST percent-encoding-1.0.0.crate 5408 BLAKE2B f3b1e426d02ec66c08eb1c4b22e53a09bf070a281a7b0bdf04a230c1664c88ba7867b41bdb93d70687bf2b747d5569c4d9e200ad8fa2828caae47ca370f2c70a SHA512 c2d5f58032df76e9c15d695c752f5f79c551ee2d8747c7da8c4a75db15a3d55ddf2f48c9b775f16bb15ae18ecb9efe17eed967bd207305e2ce3c3e9602c2bed6
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST pkg-config-0.3.8.crate 10814 BLAKE2B fc0778d1544269a6aa82701c3664b50046969883aa632967af08517d1a82cfc145f4f0790a4d4c9309d490f4b77ee23eb67ee64220a8f1a7f0f1ff3348fc75d4 SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77
 DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
 DIST psapi-sys-0.1.0.crate 973 BLAKE2B 2d2509b36704b04c388a02b1e67b658b7616f7d287bfe91bd72e0db7e4d44c6487764532064db7dd6bd96ef02d230fa96da61feed99efe9ee4542ccb1146c812 SHA512 512ac5b4f71b46aa74a856844a43092d236eab95eef7f6913e04553c9f699a3d36e4449fe6f1718426bc7d89787d891a066b315646a57961efe8b0de59ad8557
 DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
 DIST rand-0.3.14.crate 54768 BLAKE2B 0061cddce3da5242da8f6368defad800a4c4294a9835c941b5238cd95298fdc8b45877516a92b222a0bf99fa44cfb73fae2b4e26656fb26b62f8d0f9bdecf468 SHA512 f727b61f29567b7f322bb9500f01c81588b3681c379f366ef80792ea80c200747b136389a91e32bcff346b24894e7f015090c86960c74b72ced3187a709dfbee
 DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
+DIST rand-0.3.18.crate 57544 BLAKE2B 6f5ff4f24acd758ca23f595fd5b0df6b2d9216c4357150eef10cf696e46955573051824b11cb4304464faf7018b598c3ebd1d316a9517435d6d93e17438710eb SHA512 d9f69713af3af01b8bf1b54c97f8032c0eb2fd2ee0149542ba300949f54b13eeef403b26360c9fda266f6304e6455c79aa66d96a0599994c1e047206080ab182
+DIST redox_syscall-0.1.31.crate 13420 BLAKE2B 5e533c5db7dd026c490c4250761d105592a2958aba4643d50642d7e543f2850d09b8debadaebf1a7a5f4bcf4c9584bed3f7f6776d075681a4038d3bc53ba9499 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
 DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
+DIST regex-0.2.5.crate 197417 BLAKE2B c8c4f5f4198c8d35475b95be378c07cb4b3d5baeafc52bf04dda55eefe796cfc8b36aaf0aa55a6ad08bab7aeefb63b7d39c35f51eed23e10599eb2854ae141dc SHA512 572f90bdfab4af1eed9905ef1b4ecdb97ad42849000f4efe0d0e24f7c1d4084ea0805dbdb7b18ed553c3ca796d64b5d2c59f4c1667608a7f74e29136172fde8c
 DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
+DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
 DIST rustc-demangle-0.1.4.crate 9438 BLAKE2B 695a8e529090ee9293a2d01339a0f0d4011af010f40964f67ce862dd93c71643e468f4d3a2fbc83430a8ad775a824ae56cbdf59abd4808c7696f76446518f91d SHA512 928cf5537343ad3bba3aff4b09dc51921b6823dc7a450422b363cfcb84ba65e19393dbcf67657197cf96fdb4b9b0195f42b3973473f51085610c90c8b49c4e9a
+DIST rustc-demangle-0.1.5.crate 10099 BLAKE2B 7f6925fd0451c6e012e70f4516841d08109911c8be665d608f29e96857608e70cedc9f9909436ab1497dc2038a3a6251fffa896a2854b76522f32a8e77bf5503 SHA512 4a1926f69fe10ecee9f72c7b42c0eb86c03b1536cccadc1dc763ec705c6ac8491d1ad1e549abbb37f30c2f5bbaf36ee6013c5d8b2d5e000985d3972aaac46516
 DIST rustc-serialize-0.3.21.crate 45393 BLAKE2B ab7d82be5995b2ab3e090f605ebdaaa7f58efe4f14788fd3afa46c018a366ba2d316bd7f4b34e43ffc6caf96326ae5364367c5c9d85f5a8f292ac5c04016dc60 SHA512 c49d89841b983bbe3a121187146452f83ea196064c25b94777b0a282a4b79c5ee99fe45c8bfd897d0832e8bb508c1f1c0fb9cfb7e5f6b81633cbf821ea0d54f3
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
 DIST scoped-tls-0.1.0.crate 8523 BLAKE2B 887db0c474eba9a6cf6cd58f15c6aee63c5d245aee1a90ac6ef6046a9c233666671e468a312614d66f8405469b268cee21bbef78262482f9cb00c4eef8448569 SHA512 3791153856298ffe3821d6cce5c8dd011c068e859e5f7598d05b85885eadeb4e6edc1befa9fdb27f708d13d5d7c20645ba8f29637026c9d0ff105255e019b9ea
+DIST scopeguard-0.1.2.crate 6341 BLAKE2B 7fe0ba0fff9c1b643766e70e5d594d693aa62ffef8d53446bcd29f421730a689c5bcfb887cd7ff1f0547d08cebf9bb1e39d1eb9a381ce1dac39bbb8e351dee7a SHA512 271370010ecb2e9636cb51c73a2b3e36643bb2b68ba2b64ed51e49960587b376a7b411bc064b4031a472211860808a27e037b5e925dd62485648a2e809815d74
 DIST semver-0.5.1.crate 15586 BLAKE2B d354e9a6bdeda566c8087d2e4592b3328640a1d7f68a254c1cba4c13bc8fc64e9a3d5e2d20de4d85e1c19e14e894a4c74b7ecf6873eba6f00ddf99cd95947ac2 SHA512 bd96a216dec5d6007f2536979d24b7c4f81b29ccec8e588bbe796f34e6842102175a47d72f3fc8b96c51f9ede0968edd2c647fd1176eddfa26c8789d8d7f8318
 DIST semver-0.7.0.crate 16497 BLAKE2B a5742bbc6c95cec43bb0363d9d6b32d3c7c7f39d1d2c950bf63d7e467978e27206d40f3da4a679f753714f62e1c2241eb50da8c93f2c65b01b21d29fa2a71528 SHA512 1eb3223ba04b5d7e67ca671cec1fca7c5c262082db8834bce1487be083035ff119c22a09c9cc957b474fc89b8ac29637f6a75d0ea9bf771e8ad3710c202d1510
+DIST semver-0.8.0.crate 17167 BLAKE2B 3d02405d4bfd85f1c1aafc67302fa0f6b22dd278c8cbf3c7aa548d560c20bbdcf4f99f1c9304c9faae2b2368414a878ba216df9caf863ef3267fb98eb51c29fa SHA512 5fea13c798280da29c3cb55cc21e2b59bbb713912ebe8794f92e5e84cb16d6de8f696277231423719644d090bf3530dee557c6d6f229c789b6fe05f1c49b932b
 DIST semver-parser-0.6.1.crate 4860 BLAKE2B 42c060fc56a8265ea36d7cb2246f7d9315ef10de1b2a0c5065134eeb91ad5ef026af27ace233a18f97b0107cd3757051f62fc90a2afd0d791180900ef56c09dd SHA512 25324af886c06889c16acc3f99aeb85eaab07ac851d398a07742bfdb970c2dd71b0a24dd4feba8004a529a0f541c97e3571540194870fbaac44a31adc5103f49
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.27.crate 64308 BLAKE2B cf00247096c2662adccde328260e3d905a2d2a559888815c23e55d5da8204e9d5dabe79052f37a1249605332058313666451815b597e853e452e0062a88c8c09 SHA512 9e465de3e30a1c966002094fe263f3be6321bc43940888ced981099b3c70bfddac0629ecf05d6b9e1a488e8403b324e9ae016764c9e170338dc63111f97d15a3
 DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
 DIST serde-1.0.9.crate 59987 BLAKE2B bb5b67eb7ff75fb274b56c298869f0d380beeefdb33bbed7ed77e6147bb67c6b2f63bd80fe8702e2fcfc40f9ef81af0bdfa4a576a90b4cd98dc877b31992b468 SHA512 dc9744f6c0b593505fd965b23a99ee88203a17d0a99ef4f767cfd103ae12248e573545b5910e531242955f0666d8e010d8320f91778d1859f4ad399c6d22f07d
+DIST serde_derive-1.0.27.crate 27098 BLAKE2B 28e2b7f3cdcc17536b9263132876a2d64d0244b78a9664eb119255ecee82be8ce76347916cadee96589b40b0d8d03ca194a2cb214bc7c23a95ec73778e5c7fc2 SHA512 127723f8778410dfee6b9f3a847ca544c2bc1e59d8e31d930d1186b5ebf9c53ba5c9b41f8b3926c06c6db6a1c3e1b21acf0487b65821485e8373a814be39c7a2
 DIST serde_derive-1.0.8.crate 24015 BLAKE2B d97f73055a5375d338fd078f2f55ca3db59c5c6212c9cc02817237ae964fba1076bc8e901f0d80285619568519745f9d55731ffacf3e4965aef80a662f61bc7f SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a
 DIST serde_derive-1.0.9.crate 24100 BLAKE2B be80d3627d88393c91210fbea4d3782ce85d99a7236bc0bfc349d63b6ecbc018daa4e1c4a1cd3693fcebd7399c1718635992fb8b05b6297f94fb814a3d76f725 SHA512 9be2820409ee8269645bd35dffa7568df7e67e8e7faa6a6b2037a48bfee7fe99febe08ef28c38d9324931b629f942315e14080dec7dad4794f433e00cdcc6b29
 DIST serde_derive_internals-0.15.1.crate 16441 BLAKE2B e1b82c9a0b8c08eddaafbaa3ca5c23aa1b11462e3e45912d2ee109a991206df5a65605739bf8365e3a29836c2fb0a551401bb090f5bf1418c5d6ed9d41c91bd6 SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c
+DIST serde_derive_internals-0.19.0.crate 17905 BLAKE2B cf4292428e8e949943f671774fedceec259ee7ad0c3700ceb5a47440691f53f6290d2f420598b79861f60107b06a3d8d8e266900bd019054211248601fa17624 SHA512 6de6356e9716d4044bbffab6151273202fe978554ad6bd3ed5b2b6df2d1e674c3f150413277685dbadcd50222a344fa6ffdac40fe84021cd2f5e4923c842befa
 DIST serde_ignored-0.0.3.crate 9476 BLAKE2B 8eb1050fa718d8353d6830afa417b0df93c04c5ee2ba0696a6d19f80d2d5d533a68331ad41eb9bcac9e56d3f31c797272845ac8fe48b0fde0e6ceb9b84c90740 SHA512 9d73d559cfe7dbe5ddb2cf9b3952f2c055eb607722b017b102470995857eadbe5ed6bff9c7db277c6de203f09841ec4208480857d5d6269d7b267e7373d26728
+DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
 DIST serde_json-1.0.2.crate 55422 BLAKE2B 346d929bfebaf04b0afaebc9ac1c54119f2ce9b77e7163b474fe92669051bae12f0e2fff8ce9899219cc37032b4ea9f5dfc2fbdc022440246526ee11dedb71bd SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5
+DIST serde_json-1.0.9.crate 58906 BLAKE2B eb74423144d523daf0ee0041f0e701cbbb7dad2983570f2bd731c7cc7b54b2195c5be00d6b3c5d755b8c0c5117575bb6f91cc95e42e13d96304f24c4b2ab7a83 SHA512 9c591679fcac957b13dae1166b7e096ef87596ab3aa80714e41fc8af2bb1448ed792c3adc7cafa5d932487b5376c9976de01bfc58b105fdabb91804ffdec0350
 DIST shell-escape-0.1.3.crate 6441 BLAKE2B 56f47e2b0a6e5158dfa3c191422a553af9886afdbd8ecfe9e79d94016de3412c8395d03d7a4dbb189f5fbce37fbedeb6378efe191d5bf02e2701b5f0fee4c588 SHA512 d5a8bfc9074163396e7362f9a3b57374bda3fc4635b8adadeb24610d14b051cc55cd8a9ec3ccc71b107cce57b262e2605f7c88a9cb21da4e442fe207e3397b97
 DIST socket2-0.2.1.crate 23000 BLAKE2B 64fd191d444c0faf32f05422dd2034cdc85b65dbb9bf596cd0d46cc02475e7753f152df55d03f51ff1e719496f0b8de69e8889f1549240902248d73783127e56 SHA512 82c254897365d781c4fb24a8ecb765ed39c88389b83e00c26cad822ca102c1a8722076895cc3039853c2e9ade863e084866a48255b2604fba63ba59bcabddb32
+DIST socket2-0.2.4.crate 26052 BLAKE2B 94289e480b83e7d25d4ed645629aad4a1dc525fe81a93cfc9548c6b2363e7e56988b10e087decd461cc7b493eed9162dfde98c717a23f36b42a44d532497516a SHA512 eb3c333f0207debf5a3bec10e91efcacda8242d50588eb170f24a93581dd0685e6149dbbea8105d2bed1c6e41ca25e9f657bb8935b760c41fc57deba69298229
 DIST strsim-0.5.1.crate 598561 BLAKE2B 5ef88190af84c3be4b1ca6bb913a43ef8f4a54592249c92001ecb01466ce29b113f9118bcf58e97379ce9041c8b459e193a6518e21f2355988234422e35bbdb3 SHA512 34b298df18d71121d515545e3ed0f52130366b6d3ddb1075736754f736ec40438c9d3ded75f675904a9d72e2efb88ee9462211e212a6ce10d210797c91724ae5
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
 DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
 DIST tar-0.4.13.crate 39373 BLAKE2B 6329eda60e23f2f649b71f4e25c3e0fa8af7b9164bf492114f7855dd493bc9851ee5de8f29f8bcc64f12668316124a27c8b32107cfb1c04be38ce549dbb0c292 SHA512 0cb42bccc898a3f454b37e966894e0faf337179f678e7da9a2bd06fd0fafd1c5e282264c65d910a9fd6959368671967f7b40fbd66cfbe4f5434683f0249f911f
+DIST tar-0.4.14.crate 41988 BLAKE2B dbbc3f1517c817827f7cebe84918cd3aba9a3aee65a503b9da7647b187f1b4f0a173649c97bbc7ff3dc0e93486881f00a49b9a24c70c9df249d26a9f13cec3a3 SHA512 b46685caadf335ec296a6d7ff5c2bae31a50395a3681a733998dbdf6295a4a55e7b094340b4679f9468f430f5c92734e08b75123de935dc5636b36d06c498b96
 DIST tar-0.4.8.crate 35295 BLAKE2B 0c1e02545391535608d3a80c1b6471a2f68e542d541f687af97aa88672494546af8c3745e91b2debe87975b39cc37307ad9a0f0b1e7e1f733432ed042d9f05f9 SHA512 2b31523b565cf4b1d649c8096f0b8bdb7c416c8910189d3bae6fa9027983968c62af76c8c727482a68bdceb1ed39fd2d72729d3fe63185e0da46d6b3a910c408
 DIST tar-0.4.9.crate 36838 BLAKE2B f7a04cfd0b5fe5c969a196ce75abdbb8995210871c83e96f39d90ad8272af0afea367bc622b16a3b8ad37e8dc1b5a6731328ac63f186e5af1ac7cf09ddb8fa0c SHA512 d74b493b2e903aa2b7bc954edeb53b9aa459622eb305b2b3fd50a3754137485f8748f9d8c978d47589d0c6c8ae6536e828b4a63165314e9028bfb9aca3d3248c
 DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
 DIST term-0.4.4.crate 35853 BLAKE2B c3cc3955790f68d2500d6103f93a8d5d763d4b5ed3e00ee437cc597b4176bb6891c6b63a1c49bc7c85bec23906b09583fbe7160ef14d868eb00182d1da4d6165 SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7
 DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
 DIST termcolor-0.3.2.crate 10874 BLAKE2B 1beb98c1b1b04c4e28cca2788eeb0f9cbc12a8f791857826c0b40697a33f77db0c8608902e109d565b7716a6d76df2dfb03d9a27930254e6424e2e36f732e432 SHA512 bbbf32ebc2970e5d59aa97a9dd3a6c3717564f7397e6c11b7e17c638239b2cc0cce75a48d1472571c651ca57eea34af4750f44ccaf08d0b922229a6baadb7f13
+DIST termcolor-0.3.3.crate 11381 BLAKE2B 208366b46aec6b1ddff6d673893344f5f39a0672dfbf26960ac0c8d1135e4e570ccdd71a00a22253279efacf40ece272c71fbfa319047e514eb578e087991bc5 SHA512 1f62c970a2592777b5399940a7a2864155ec5641f2150e9a59715be0e58ee8573961fd73e44134f7e516e38abdfa569ede09a93c8551943fb10c5dfc11d7937e
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
 DIST thread-id-3.1.0.crate 7195 BLAKE2B 8bed46dc27434635f5dfba629e56c2aa1ab0a74733d37b9e90339d70443471e95bbe59672525962143b85df60b6834e1a3cf98b071c07eab371419e09aa28512 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13
 DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
@@ -180,6 +250,7 @@ DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f4
 DIST toml-0.2.1.crate 47258 BLAKE2B 0016d906559a13b97e16614597e41ad9d6f9892abb0897b69a33c87415578dd7d12cab9821ed7d64c335d0d738fd7ac516265aca7b1afcd567ae746b1c841d14 SHA512 e802d66d207debc8f5d7655c0eb797fe09125d5e85fcf4cc8c3088d9811b141f8db40b9a95f76df271a9d32640a8e59f1e9520da670f0a994bc73994552cf4bc
 DIST toml-0.4.1.crate 54017 BLAKE2B 20fd8f0f8501adba0cfc504446d490da8d488efe218f54e8b9bda2e95d70b1a26d660fdfd512bd6344a2858e7a813edb10c26f366041171407db29abd1025654 SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480
 DIST toml-0.4.2.crate 54899 BLAKE2B e79eeda2fb587eae36a7431b1a27013fde3bab7ba32b59807845b45da92b85b60da9c9076f271bc3b80bdec9e7ee9e31266f14e6c938a197a68877cb12936a06 SHA512 952f81c310502f314af5172e6e7c585fa9ed6c1f38d7a9819eb11ba9f7fa4560fa6429ddd65f9f97f5063180a23aae40b9074558f5a774783dc7bf8335641366
+DIST toml-0.4.5.crate 60003 BLAKE2B 7121acb62b85d24c24fee4e0ce0d4b73b45024ce1b6be28917f100c816f0e2166e378d0e184ed4ef9268a59723f7d39d8e6b0b7cb3b79abc28326c491ee8474d SHA512 ad8387da3fab2608f912ec65c4e7617af15427e6a065d67f92378a822c09fd291093917538ae50bd498d155b272051d1183973909b9a57ca135bd005896a2f89
 DIST unicode-bidi-0.2.3.crate 1744003 BLAKE2B e6a5a5cba379ea3eba12b42808148d8013cc99e4fbcea345e94b9cbe3b6fa4da5a41f72f4a3dc4ea4e6c5cc0eeef6230fea8868b2a31891c7e234b277d9c6608 SHA512 fb067746b4788c7110bc2687850dc11183c7e596453b42c0c4764c59c1686faf4d03a52b6c147c6578d88b8a2f3f1257d88010874b6ff0bb942b41e055c00a08
 DIST unicode-bidi-0.3.3.crate 35909 BLAKE2B 7e7c7ebec3b9a4bf10a876399fa262c0ec20dca4515fe2cd04391ffa46e99c033e94e998b61292daabe9952e80ae89f68d9e02d37146646867701ea0b16efaec SHA512 5fdfd49234f98dccf4b12f28d78b0fbba046df9eae9ce94ef829f3973ea24016819607239ee329d524c0937702aeb897b1c91c5e579d3e8e73a560b803ddfbf5
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
@@ -192,12 +263,15 @@ DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d359
 DIST url-1.2.3.crate 68790 BLAKE2B 65247777a837a1f0c0cc6352fb94f0381595ba97e3b35f2e3dd0da9d284717d5ec39554f67b3b391ef5c4e297cded65f024091a05a05b5fc57703b2669c5b5dc SHA512 6415f77b2226c79a340bc6f1061b835700a3ed9cfac4d5357ae8de947131c79d9a87150a59178c2fc8101b642d884c4ef4fecf657b3f89220aec130cae7c822f
 DIST url-1.4.1.crate 72273 BLAKE2B ed2598a559ae5736b037c395dd6947c1da6578867a474401795756182f8bce49493d92363548ab98a95e033e986a1bc405004fb0aa7d0d8db1edb839705e3bcb SHA512 84d4917f0daa83d9b361ea0fa24ac0cfc3e76d66cb9ac7791ca92053f8c07b38aa165a6a4a6b56e5ac07434fa50b28984061e7d95bab1166d9169e7987bad7f9
 DIST url-1.5.1.crate 71508 BLAKE2B cb7417b8936978eec32a17fba55d5858aa47d898e33b28006dde8baf57a7155b6cc67b2525f9549dd97281d7c45319ac5cc11cb9fdff9b0ea7c7b1617a32d180 SHA512 8867f76b4b7b463de889a8649be6255bee025a878ce5f25ab4ce7c0221934d7624495622de5e8895bb42b261aebf0cf4682577054a3fc7040486294d0b3cdd60
+DIST url-1.6.0.crate 72377 BLAKE2B 3654eb8f4ce808953abdcf45d577789aa4c458ccf517b2e8be3c9eb8c0ef210a36247389244e54449f32a91d80f62bcd443cd8857692cf950a9a6078996c7656 SHA512 7f355617afb1ef6c572f4d14aeaf26b184fcadf2c35ea9c5e0f5a76ff2096957b75b95c48449732c4c239b17932674a6fea525f04a77b3f8328ad37c5e143a98
 DIST user32-sys-0.2.0.crate 10624 BLAKE2B 76e57ff5dcaf533f7087073d85b3ac9a5825ca5c7251c1e8729cd35c9c3bc3c0cfb6a4d7586c3490fccf1aa581a6ce7c58696b161073bb23e524a20ca5c30be3 SHA512 75fa43621acff70425ca40a132a25fc67923526c895c51edb6b49ef507d1d461383e1d92b5dbb5c5aee9207cc76b9a9e43d27efa0b65476bc5ae0c122a2dcc19
+DIST userenv-sys-0.2.0.crate 1749 BLAKE2B cbba1af566a05a27ba571b25be6e5bc47b98cc1710d89083023586704e8111158f3433214d7bc6a0d72af40f589679791dca9a99f73d17cd29cbe75281d4d476 SHA512 97065d57b63045876685797b6cfe600d65a7d3a3b66a356ca86df735f19de373eec24d4eb679c013ec8bbc22954e8c258863ddca608bedd830fcb55df01438d2
 DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST vcpkg-0.2.1.crate 5446 BLAKE2B 150ca332e5ab87b4894cf4762fb10b86f6bb61ad0d1dffdc8e0499e579ca69344423ecaa0763225f5d4a5279a340db251f0847d1821467a00eab1567abe79503 SHA512 81b3f7ccfd29fe09620f7a952e360e949cdf0a0cf06b698aa65861a00fb5b8d6ab35292a3b9b3444947790a59b34eaeec0cb31bdad25da389c10320fc5581791
 DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST wincolor-0.1.4.crate 4434 BLAKE2B ec4d5d07dc631c65e4b94918b49f805dbf35d45b6220619d76de56613bb234ddd8eb42d87f61a20df69670783b9c0fe206d902318ded405e8b0012d99a91a597 SHA512 910920a4a86084d1529c2cc29fd65eb2e858b7e89677617c31d0c8690c7c22145e4ece54237df103b3defb58e1b0b05edf2d24304af2dec4662e61593901ba9f
@@ -207,4 +281,5 @@ EBUILD cargo-0.16.0.ebuild 4023 BLAKE2B 5973004a6d85da524e9fd0768cabd5c44658693a
 EBUILD cargo-0.17.0.ebuild 4075 BLAKE2B 0ca0a386ce28304a3d54c5b7a0741339ac0c028fd304629f648cb4d243c7cdc62a29c9fba3e1333492d3f7b6f955cd1b25aad6a001cc368452fac0ed6955e6d9 SHA512 d03fa52a6bffa94f2481efd00d5f264b64d1f72ff289180704e9cd356ccc1390608774ee650adc1a5ea8cfe6339ad128d478efcca89513f7a9fe46f804cd63e4
 EBUILD cargo-0.20.0.ebuild 3349 BLAKE2B 353a8dac201123708a68eb85eef3c2218c72af2be5611b864f4d1670eca4d6d3dc78692c1d8419ee2c8a0f832ed24d7f4409af7d9ad5985f6913cf957c0d8eda SHA512 70af7d2ba1c1c30fe7f2244f7fa8004e0a51bdf02f27df42c18a80ba49e5e70b59abd9ee882b849b965e6582ca46cf565e5b2dbe499432509e037f72bde77585
 EBUILD cargo-0.21.0.ebuild 3432 BLAKE2B 7efc4d09cdc369d7442f0d34f8b3c62e2d9e419589a86288476b07f9cf371e37d80b98d85179c1993f5f05ac87ff826aefc70263daaaf476a44d7ca668f7de68 SHA512 31b03bbd9028da28332a64759c7df193f5c55155b01c73619c4cd2e427078c0a1a52eedab3fe670b67f0ae7f0cb29af185ce6ec48a0f19f389e6e9092e782bab
+EBUILD cargo-0.24.0.ebuild 3767 BLAKE2B 72b8380e5ed313a97a6e4c992eac0aa68e8ee7e4151706d72d6db8aafd31b87fc6014ffe1a886ab2c0f3e4a7c1964ffe628855bcf8854551ea9613ba611cee3e SHA512 cda6637c121dc0071b0312853b82cfc2ab00bbac3dafbd59bfe985d9053063273a635d24be564b3dec4c6b1ea3918fe14f009efe64660b3ef1d09a87d15d97f2
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.24.0.ebuild b/dev-util/cargo/cargo-0.24.0.ebuild
new file mode 100644
index 000000000000..d8f492d29d2c
--- /dev/null
+++ b/dev-util/cargo/cargo-0.24.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CARGO_SNAPSHOT_DATE="2016-09-01"
+CRATES="
+advapi32-sys-0.2.0
+aho-corasick-0.5.3
+aho-corasick-0.6.4
+atty-0.2.3
+backtrace-0.3.4
+backtrace-sys-0.1.16
+bitflags-0.7.0
+bitflags-0.9.1
+bitflags-1.0.1
+bufstream-0.1.3
+cargotest-0.1.0
+cc-1.0.4
+cfg-if-0.1.2
+cmake-0.1.29
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.4.4
+core-foundation-sys-0.4.4
+crates-io-0.13.0
+crossbeam-0.2.10
+crossbeam-0.3.0
+crypto-hash-0.3.0
+curl-0.4.8
+curl-sys-0.3.15
+dbghelp-sys-0.2.0
+docopt-0.8.1
+dtoa-0.4.2
+env_logger-0.4.3
+error-chain-0.11.0
+filetime-0.1.15
+flate2-0.2.20
+fnv-1.0.6
+foreign-types-0.2.0
+fs2-0.4.2
+fuchsia-zircon-0.2.1
+fuchsia-zircon-sys-0.2.0
+git2-0.6.8
+git2-curl-0.7.0
+glob-0.2.11
+globset-0.2.1
+hamcrest-0.1.1
+hex-0.2.0
+home-0.3.0
+idna-0.1.4
+ignore-0.2.2
+itoa-0.3.4
+jobserver-0.1.9
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+libc-0.2.36
+libgit2-sys-0.6.16
+libssh2-sys-0.2.6
+libz-sys-1.0.18
+log-0.3.8
+matches-0.1.6
+memchr-0.1.11
+memchr-1.0.2
+memchr-2.0.0
+miniz-sys-0.1.10
+miow-0.2.1
+net2-0.2.31
+num-0.1.41
+num-bigint-0.1.41
+num-complex-0.1.41
+num-integer-0.1.35
+num-iter-0.1.34
+num-rational-0.1.40
+num-traits-0.1.41
+num_cpus-1.8.0
+openssl-0.9.21
+openssl-probe-0.1.1
+openssl-sys-0.9.21
+percent-encoding-1.0.1
+pkg-config-0.3.9
+psapi-sys-0.1.0
+quote-0.3.15
+rand-0.3.18
+redox_syscall-0.1.31
+redox_termios-0.1.1
+regex-0.1.80
+regex-0.2.5
+regex-syntax-0.3.9
+regex-syntax-0.4.2
+rustc-demangle-0.1.5
+rustc-serialize-0.3.24
+same-file-0.1.3
+scopeguard-0.1.2
+scoped-tls-0.1.0
+semver-0.8.0
+semver-parser-0.7.0
+serde-1.0.27
+serde_derive-1.0.27
+serde_derive_internals-0.19.0
+serde_ignored-0.0.4
+serde_json-1.0.9
+shell-escape-0.1.3
+socket2-0.2.4
+strsim-0.6.0
+syn-0.11.11
+synom-0.11.3
+tar-0.4.14
+tempdir-0.3.5
+termcolor-0.3.3
+termion-1.5.1
+thread-id-2.0.0
+thread_local-0.2.7
+thread_local-0.3.4
+toml-0.4.5
+unicode-bidi-0.3.4
+unicode-normalization-0.1.5
+unicode-xid-0.0.4
+unreachable-1.0.0
+url-1.6.0
+userenv-sys-0.2.0
+utf8-ranges-0.1.3
+utf8-ranges-1.0.0
+vcpkg-0.2.2
+void-1.0.2
+walkdir-1.0.7
+winapi-0.2.8
+winapi-build-0.1.1
+wincolor-0.1.4
+ws2_32-sys-0.2.1
+"
+
+inherit cargo bash-completion-r1 versionator
+
+BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
+
+DESCRIPTION="The Rust's package manager"
+HOMEPAGE="http://crates.io"
+SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	x86?   (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
+	)
+	amd64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+	)"
+
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl"
+
+if [[ ${ARCH} = "amd64" ]]; then
+	TRIPLE="x86_64-unknown-linux-gnu"
+else
+	TRIPLE="i686-unknown-linux-gnu"
+fi
+
+COMMON_DEPEND="sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-libs/http-parser"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/cargo-bin
+	net-misc/curl[ssl]"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/rust-1.19.0
+	dev-util/cmake
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/sed"
+
+PATCHES=()
+
+src_configure() {
+	# Do nothing
+	echo "Configuring cargo..."
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
+	${cargo} build --release
+
+	# Building HTML documentation
+	use doc && ${cargo} doc
+}
+
+src_install() {
+	dobin target/release/cargo
+
+	# Install HTML documentation
+	use doc && HTML_DOCS=("target/doc")
+	einstalldocs
+
+	newbashcomp src/etc/cargo.bashcomp.sh cargo
+	insinto /usr/share/zsh/site-functions
+	doins src/etc/_cargo
+	doman src/etc/man/*
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 113b62d60255..35d69ea012aa 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,8 +17,8 @@ DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 004149841b128288845c2a3987b38e6d90b3dcc
 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.1.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
-EBUILD cmake-3.10.2.ebuild 5926 BLAKE2B 89c3b1211c68dbdbeb1030ffe6df27538d52358679c709fa2261b94d0ed8a2a6fea7b00f83b35815671600ad75dcdfe4ad2c13d5cdc9d46c6e6121a05af94941 SHA512 d4c674e3879d3df39f8b36da433bb31a587a741eb3b2ec7c43eea8b0e1cdd67e7a3772d7d029acc7ca6ecaf4e3289f5825f944daeacd5fb019cfa2a749c3b907
-EBUILD cmake-3.8.2.ebuild 5714 BLAKE2B 3043b071ed597f37a7a07d9613e5010031d64be5849443dec86ba96892d7afd96c6c8b6a210964fa909da360e1ada9bdef47d82f61ac62ac7812455785af1bee SHA512 951eb5e34e58de94697a01c91f45b43f8d1045cef4eb3d9fa3fa9c8a0c36ce66f4f8656cc2e16b3d62d56cf59d4e59af17ab6972ddca87c9e14821b2703fde4c
-EBUILD cmake-3.9.6.ebuild 5967 BLAKE2B 56b2b6a835224465d2080314684f557999c613fa7f04ad4172649520bd68aa9b9de3bce3b3a3a98400896069c7d8e3b6b04a4f6a40c66a2dfe027033825aa518 SHA512 8b6cf993d76c44a33333ab9a1db51b82847acd67cc706c1c0afa40417ad34846b56742fe302382c4261a3f77f8d146bfb426582f2ad74d4f06883584fbf86de7
+EBUILD cmake-3.10.1.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582
+EBUILD cmake-3.10.2.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582
+EBUILD cmake-3.8.2.ebuild 5702 BLAKE2B 41a2b56a1666d4f2375b7e0d2ba473b889c215340b57ef5ca4297eb10f71870bc83db16d803a85eea0204f2d931901af2484fbd19269ccd52d2b07b436a04981 SHA512 ffe83e85988895e7bacdad4db796f112a1f8888a7f9df580c1c0fce6c8b959dd568079b73dbe8f9ff605388f64de9c4a9a1e61950876f7d5b7ea3444bc6ce62f
+EBUILD cmake-3.9.6.ebuild 5955 BLAKE2B 239073bc7c7aaea4422893f51bbd0c8151acd128ae1857100d74564dda786a3d8aa0e68234cc52d0ddd93352d7d8077ace1400aa452bcecea3f158413046e37f SHA512 9afd703b46784f6c225f355c7c3402abddfa0548eb031f23974d39de0130e04011bda6d15f49e998348084ced2649c8f192c472fcb741c6995443162c1828fcc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.1.ebuild b/dev-util/cmake/cmake-3.10.1.ebuild
index 95dda9d73a6e..af381f00bde4 100644
--- a/dev-util/cmake/cmake-3.10.1.ebuild
+++ b/dev-util/cmake/cmake-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
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.10.2.ebuild b/dev-util/cmake/cmake-3.10.2.ebuild
index 40e98fab968c..af381f00bde4 100644
--- a/dev-util/cmake/cmake-3.10.2.ebuild
+++ b/dev-util/cmake/cmake-3.10.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
index 8f3c7d03045f..6e3fe9a84c80 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.8.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
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 80d0a07e9c26..f63f8c117780 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.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
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 4e33cc5b8fdd..f3ec524a5c1f 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
 DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
 DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
-EBUILD ctags-20161028.ebuild 1740 BLAKE2B 625121e1f46e330077faa4db78c90fa8b77f1f0b142be63e6eae5a8cb0c642d6123c76ca0e5d709e25df1fd472c483e7318958dc665d75fe1e88ec26fa336982 SHA512 283d385cd584b2d6a75f24bfa7160eaee391527b696581f4376268cb427f2a1fed36a5549ce5a3d93f9c859a970523b8a3aa8b26e422d63afd32ef0c79fb6523
-EBUILD ctags-20170704.ebuild 1876 BLAKE2B fb811ba1ad60c5a4d0f1844e85ca1197d720ca9a4d5f1eb67cc4a6a774fd6077fc36ff9538963334e1d4b4e6f5204cf4b772dcd853dec42ff4435f65a92eb877 SHA512 88a375e118f5e7290ec9b3585146a6410fea98003379664ccf7995d439114fe198e460b53f6c941d975157769af12b6f2aeac612029c9d3df205581cf6ebb4d8
+EBUILD ctags-20161028.ebuild 1728 BLAKE2B a2609b3e6a0f49733213230ac8b9718f5766ca0ca68151aab7b15bf23a27875e6095b6558cf8e88a77692a7c83f981c99778e2fb14d7dc07a12350e9a3f73d5d SHA512 df496dad6d9f51921d0a39222463424acd1ad8639c6d28c01e929e50997f86cf77692fe39ff4653d5b408b9cdc2a325defad4463de7ebbddb503c559a9641606
+EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
index 7955990dfe10..c82ea79817ee 100644
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.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="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 COMMON_DEPEND="
diff --git a/dev-util/ctags/ctags-20170704.ebuild b/dev-util/ctags/ctags-20170704.ebuild
index 09d17b8df337..0fc5b8e6e8fb 100644
--- a/dev-util/ctags/ctags-20170704.ebuild
+++ b/dev-util/ctags/ctags-20170704.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/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 457fb5d8efca..0103b34a61e6 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
 EBUILD cucumber-core-1.5.0.ebuild 724 BLAKE2B 41c92e5eabe95f7589d6c30e6b0fd2f748ddee17347d566b15bb05fb81e2cb6c463a9956bd03e0ac53794c13679e1df84ce1319ae9ada2f8c24a30e7c3f4bee7 SHA512 28435ec6302a732d8a615e9ae7d24038b223313737421863ee35019b2dd6859971586cdac40011651021d39616dea82922a3e02fe972586fac1f10ece77fb0c2
 EBUILD cucumber-core-3.0.0.ebuild 789 BLAKE2B 5d5ad28ba4dbcbb81f5df7bca241275b1e265058b876fcec4e7ef32d8695b1f615f3dedddaa7432b9d08af5cd6c275a9495dc08143473f64cbbbcb497db55c84 SHA512 fc7c525226b47cfe3a47b6eb1461c0084014b0881b8eda450272c4e12c0cf7c26f8e1eade18204a847b0cee16dfe41ffeeb36eedf3f5b667da920dff3e1dd0f1
-EBUILD cucumber-core-3.1.0.ebuild 900 BLAKE2B e03b278e6a39d3c188123ef3c1a67d681581355b75ed6bceaba5de4c7c3687b985e3d3836f8ab85ceebb0613524e43297c36db98828e736ddc88bf5b3b276c8c SHA512 021ad5f6294383d136abaef2f25bb534474da77251d874da7b52a6abd44d5a6f4585ced131401d089fbe4b1ef811d206dd68d85d5a0f39639a2dadd9559f4ea5
+EBUILD cucumber-core-3.1.0.ebuild 900 BLAKE2B 780237371f74c17e803d15d294988eb00ad6ccd0a9af2434d179b3380bef4f27a3c3e52c132c10c798ccf3bf0f39037dc1f873db0291d3ee0eabb6c8f274c657 SHA512 17e5780e4029f5196047ceca8f7940dc92f8ac8d183f7791b49c004671f87f7cdd1302739b4806930d529ef570f4b0d6bf452b1fff3bbf507bc705b702414864
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild
index fed19d04d55e..b03f37de3006 100644
--- a/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.1.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
@@ -17,7 +17,7 @@ RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 ~ia64 ~ppc"
-SLOT="3.0"
+SLOT="3.1"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index deb3abc09050..6492067e5126 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-rails-1.4.5.gem 406016 BLAKE2B 8ab7b196d986eea09f2a8965c222227f1e3025519827de455f4ff8f058c6af16b7ec2f99bd6cb94e7821914aea850e332a97d012a47cce5590934fe85dce23c4 SHA512 66ad3a23503a5f28202e13fd041ca8c75ee447c525daf4b4711cbf789c7ee924efaaabf9753173eb67b8d9fd201f08d2d2fa1905175b7615640d4f2861c92701
 DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
 EBUILD cucumber-rails-1.4.5.ebuild 1226 BLAKE2B 1a5faaf79779b819cc416e80ab7b21e946aaf9b487b7c71c6144ad6858daa175ea626681a6e8485ec6fecc282f5292e7d6e7359c5f9d4232068823e862ae52b0 SHA512 5c22f4a764aa3f5ce068fceb0ebcab23f603551cc121eddc892f9eea495e27f4ee7b4779ec6b54ca2a7d68432eee7e8e7ee3b098f456b1308b5ef9b3b6eda3a5
-EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 8aa6bdd4c0e0888dc9aab5e9ab4e9e78b8932b9c61cea3601381b622bac758848b6d2c9dd18d75bd252ba216c8f033380249e0e8c6b526a108f572864b72b684 SHA512 66b7579838f307e2da948b847e6da81794dbcc680af9799b4e1cd3bcbe2784ba790b4b2bddff60cdd7f83a20ec84b72294100dc3674ef6b3e05585d2ed3f9056
+EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
index c0874f2cab31..dac64878d7b4 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
new file mode 100644
index 000000000000..c8d88d45dbd6
--- /dev/null
+++ b/dev-util/cutter/Manifest
@@ -0,0 +1,3 @@
+DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
+EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
+MISC metadata.xml 498 BLAKE2B 13ac7c1a7f382c474ac946021ccc8bceb07319597531c576e41f98b81e516b4f2ec39456ccba044f16648e28641ca813994f4adbd6886cbc41e55e5773029e8f SHA512 a58aa869297f0e1470886d7f847051949ddcff7cb2721612064e4d58ae337903fcb081202671e329fda3731ff7a63ace211ef352a6fc89c6df0e1e40c1335f7e
diff --git a/dev-util/cutter/cutter-1.0.ebuild b/dev-util/cutter/cutter-1.0.ebuild
new file mode 100644
index 000000000000..2c1e84fe599d
--- /dev/null
+++ b/dev-util/cutter/cutter-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="http://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	dev-util/radare2
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 PREFIX="/usr" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/dev-util/cutter/metadata.xml b/dev-util/cutter/metadata.xml
new file mode 100644
index 000000000000..95eddc5b4578
--- /dev/null
+++ b/dev-util/cutter/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>otakuto.gentoo@gmail.com</email>
+        <name>Tact Yoshida</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">radareorg/cutter</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 7ec92cb21ddf..25366bbb8548 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
 DIST debhelper_11.1.2.tar.xz 448676 BLAKE2B 52e79349449c387f48cacedfae334c241b8e0187071aec1ec571a7fc04a4bfd2a9ea9c54f7cfa75ec96a01ef5d2f859caeac317f53b72479664d4f2670d44a22 SHA512 26cd04eef4cb634b1424b7d08bcc61fdae9b18a96753680658ed412e51c9124b33295e79f3aabbb40579a9d4bb059b526428b97c151d9f34ae93b615b64291bb
-DIST debhelper_11.tar.xz 439268 BLAKE2B 45c1eeb046a6fbc59b814f696c7320b344ba3cf1ba47b02e9aafd38f88e72943eaba0c0625115fc35cdce9cec0f01232278956644f02b632beda2e2d052ca1aa SHA512 12eabb2f02df24a2c1d8db8e1d88ecec2fce1547c21e99f99bf89f5a44ebd71d09ebbb7e19e0e30ca7e2f17b252769c79968d81989ab7330f870b7ee42e13521
+DIST debhelper_11.1.3.tar.xz 449268 BLAKE2B 9cbd8a2c71897a5ba28b987b24e939e830a9322332c48f94c42ea417330b94ddee60f5619426b37db96cf4e560b74cd2d1dc221fed27433943b7ff6db7adbeff SHA512 e7a36b2226eb0dcbf91068fa312d42125add7864fd16eefa3346d196162fa739c436df41c053e6d25d82f5d784c95df37dd1a43927dd007c358382dd042c4e92
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-11.1.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
-EBUILD debhelper-11.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.1.3.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.ebuild b/dev-util/debhelper/debhelper-11.1.3.ebuild
index eb7e5fa626c2..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.ebuild
+++ b/dev-util/debhelper/debhelper-11.1.3.ebuild
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 9c39b5413b40..43db17f6146c 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -4,7 +4,7 @@ AUX dejagnu-ignore-libwarning.patch 1129 BLAKE2B 5fc7cbba3acecd3e51e66dcc68da4d3
 DIST dejagnu-1.4.4.tar.gz 1080346 BLAKE2B 183566795c2ba9cf4acbc9c39e93a45b50409eefef0ae2039cbdf56135e367552d190e5b01b5bceab4e26b3b05c0ea68e892b7c6bd419bc38bcfc7c5be27645e SHA512 fae08d4801b6a815af8771896e6e5eb12b297b773faa89743eac28d08c7eac6ed7e530921acdba1b9a7903990060c520497d281651d29d98ab0def1dbfab392e
 DIST dejagnu-1.5.tar.gz 576269 BLAKE2B df7767e5b8adbad7315e3489d3f8a267043e2bf27ed120ad7e534b9a6dc8c5ae2fa5fdbf7ff6fe530605998af4a09cc3b4b94881837b5f3c6336a9c515b5c7e2 SHA512 a9486e28f7ce25c34b59d00c0e4862bbb4b7a01d8faae0d1f28669b9d3ded9ed233b892aa27c34e1d06911f071d894aba7c1469e2fd0bddaa5611c2383e4974f
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.4.4-r3.ebuild 991 BLAKE2B f47cb37c34311cc9c48590b810c4545b58e80d05aafa44dc10d58bda158aa3e680b0dd1bb1cd6fcf2080fca0a2dae3b341d9df0b357095900b56e12fb296502e SHA512 a43f22f9e33301347bd24ce70ed5167b711ad152e5b6ae5d9a1896e598502fdad82462cbf58520c5d78902632662e383d68346c4d895cd2c4014313f9dba128b
-EBUILD dejagnu-1.5.ebuild 805 BLAKE2B 0368f7ddeac2724ac079e6a7679ff1d9bd228252ec8f60772669fd4e3038281ca1170f4429a3737ae88ea4f73302fad9ba8856bd188b325357ec9f04e93c5903 SHA512 f65a8d262c97e92a3ae4a02b863aecc99a2b948b38c6c720faa66d7752a537aa5d5499af586837f80e5174fa7dcb10e33feff22f922e26888735e103bf36b7bb
-EBUILD dejagnu-1.6.ebuild 746 BLAKE2B 184b7b657ea2610ec105ef26213eb22aff2e3ddc45e8e90b9d5399e09389c8838cdf4b97f3fe0a0d61eac99d8438e2452af53fca4bfe5404becbd4cfa81350ac SHA512 cbfebccec8bcbb98a95da829bd5637e3fd93154af3c30346a2abdb722e9935cdae2b44b7bf704ee99b9695ae2fb349329f925df9c01ffb0ac1c5a3a2ef25947f
+EBUILD dejagnu-1.4.4-r3.ebuild 979 BLAKE2B 48712a9df00606d95f8c0db480bc501b7c1c51a144236c0d0267b8bd5033a7809132c28fe6ec8c27c4c82382cba9ccf6b509d53e2a1ee69a8ffd5318e8002fe7 SHA512 b44d349d8d82305084b44268176f2f80985e7c983661d565a77f537a80b9ebd29bdd4290e2394e524aa5f30676f0aa09e6e717e4ed620fe5f0eb0d7c2488751e
+EBUILD dejagnu-1.5.ebuild 793 BLAKE2B 4d1961448a3b2d5b38d05a70f34a289b75b19d240e730ad243b5ae11684c3bec52f057d051ba50715063f07a21391a9bad5519825b381e9f1df84eef9b03e513 SHA512 34f446f6714c330d8cff1728ca439af085343f0a2e70ce36c7db785dc4ef2102af92129e5ac92fbe36d199f9837560b1d7fbca03e16dc098e2247121f463b208
+EBUILD dejagnu-1.6.ebuild 734 BLAKE2B c52e11e32e4a17b72971bdcbcf0e219b8c20357d0510c575631994025a4857176c16b974ccbae5f033e06bb12203e0a1a1ed17a35ea47f8645bb785f8d3bd508 SHA512 3430249a58ccf34896abf4c28a66aa875cfb850d9633c34b9a8875eed94805c138235df80a3eedf1176272435410c23fc8e3700bd0ba3e6a4aabf9294be43ead
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
index b6951999aa85..f20678252dc9 100644
--- a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.4.4-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 eutils
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/dejagnu/dejagnu-1.5.ebuild b/dev-util/dejagnu/dejagnu-1.5.ebuild
index acb79530f294..e5c92faff3ca 100644
--- a/dev-util/dejagnu/dejagnu-1.5.ebuild
+++ b/dev-util/dejagnu/dejagnu-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
 
 DESCRIPTION="framework for testing other programs"
@@ -7,7 +7,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index 3c1d667317da..2daa6c53f7f5 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.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="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 23a8d9db8432..1eae570bb88c 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20160828.tgz 501960 BLAKE2B a9ec14a56dfa165345b5cc60e2f91b3da6c3be54b5ca8a89798cf4bcc92a95a586b17ad6435cedcc330c9bb001203e6c7b4f3a302d31591fe890c4a2d5b622d0 SHA512 aa0329578c8b0580e52b1f6aad5c7179bc519c3791cf115b035e28f25e5f48d7a626faa1a322b81365646018a2f8b09f67f4df0629899b50aa5ce7190b022113
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
-EBUILD dialog-1.3.20160828.ebuild 1290 BLAKE2B 465efe5d711d6b4a7efcb4395d4c4d34d00e73e3fb42d7f1103ed36a0b89cb8f05ac3079a09d2248670d4946af43e835867fb00f330bda6c81907e1b0c12bd60 SHA512 f611cb56a20f8b80a192ba7d05319e39b3ea8174d3abb35ddf2b8601aa596bc10ab9fc21d011e43fed65f74b2c65929c686fe4759ae10a342ffaeeb04f1a6e20
-EBUILD dialog-1.3.20170131.ebuild 1295 BLAKE2B 9729eb4ede694286eada521f2850358d910bc5e1f6248c19b53acfc02a34b64c27922fd1fbede1b1c300ee696d1ec8f066f837e4d585da4a617af369f8592943 SHA512 e06f785c9f6d85001470e7314cb9165785543e00efd15b1fca9850e65391b7fe3d695623127ae3019974a6c0f1cb6973d2540b60388009e10ae1e2475bb14bef
-EBUILD dialog-1.3.20170509.ebuild 1302 BLAKE2B 61ace37a93ea4bb328f6adc2eec9378a80d1879c32d63111f79e2291f7c74d9a1bb54225afbc5dbf6e3a5bdb30621182fa46c3c5ef97d48f5a6fc403e1509966 SHA512 7e19e71da7ee76ec74f0b7903c8254b7a377010128f4f6b4d5b83b2b1d4732717d1d1f460e7109ca7134710bf9be229f52365e22d44cee0219154c4d5299e4bd
+EBUILD dialog-1.3.20160828.ebuild 1278 BLAKE2B bd9847da9f7f35cdccc3639ffe919e1dd4265ba495f5a12fb1062b10cf2214309cd84fbc9b42208e4585d6cd2688628ff042c23b239513c64a3417408b03a943 SHA512 fe6672bf50566bab89d8a3c8938e647961fedc0f00ab1f33fe5d02b1973fbccea9c7bf258f96625f115dd4805aa3f8c6d26977547d49c32018b2e73881fe581a
+EBUILD dialog-1.3.20170131.ebuild 1283 BLAKE2B 98c8e145993e5faa0b1855eec45d7f1cc0b5f67c23186ac9d5d435641ece1e368080d6899368db324a1c8a2e71a14f19b5f815e7fe343bb622bc4a734195792d SHA512 66cc689d80812e5f87d480fbf1d376492090c9a85560612151facf102515d7aa3325e21cbe2ae25675613a5bc180294c7ef9c3e8674d12b61ec780b5d7db714f
+EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20160828.ebuild b/dev-util/dialog/dialog-1.3.20160828.ebuild
index 13ab611835b0..cee0aa1f7d4a 100644
--- a/dev-util/dialog/dialog-1.3.20160828.ebuild
+++ b/dev-util/dialog/dialog-1.3.20160828.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="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index c12f833acca8..a3edce261da8 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.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="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20170509.ebuild b/dev-util/dialog/dialog-1.3.20170509.ebuild
index 7e7ae2ee659f..3f4945e5dc03 100644
--- a/dev-util/dialog/dialog-1.3.20170509.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170509.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="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 0a4a49d06109..e3c414d5fc2d 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -5,14 +5,11 @@ AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28
 AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
 AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
 DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a326f31c594917c5ba02122a4e061168344148c113a32e0d14791e59e95a71bb224cd04bef7d1586703fd77fd SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66
-DIST drone-0.8.2.tar.gz 4758508 BLAKE2B f5fa4617a9596d3bd7d03a031f78bce46991200612e8bf6008756ca42ced6e562165a488dc1f3a4c15ec39317a5166966a498c38fe19a146a62721c09c2c0214 SHA512 3bec1b93210349e7c82386b5e16c04c458987633dc56493d52741dcdd6d3887f3f2db454f1e18c4cb71f455eadc7232cd1f089118880a70be53eefbf8203f5d5
-DIST drone-0.8.3.tar.gz 4758661 BLAKE2B 39b08d77921a1acec9834881d08ab2f64a0cf752a90f5cfdca80a5cd276de79bbac9d2815c5d013fb08ae9250076efe213a950b00f5a111022050c41beb3b841 SHA512 f11f0a00ad4cc4071f32275a8e2721e4a2d1bab4ad6b3ae796ea2fd9f838d31e3c9c88dbbf365e1f09b8540e1b6559fdd3ed75d5b662496c528a30e4ba6e11d1
+DIST drone-0.8.4.tar.gz 4759676 BLAKE2B 6da0ef008468e60dec0bfaa0b2f0f6171439d8b7b1ba842173f435eb60fd48992236fbf3c040f6591ba7f84fc91cd7968eac2b9785893319a2d69549ba81c64e SHA512 978f07aa471125dca00e6c6e5a9061c20cabe84f802fe21f2a85a383bf79f59d9baeb305d45acd5c8918aad5f1882e598b39a3174b31a4f6e5cfa226d9bcccaa
 DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
 DIST github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz 229805 BLAKE2B 6ecf7a24405d5881a6dae751a77bcc0a41f2e4d01e8166a1edd92f7d4bc4e7a1ab1fa310765ded55068d20d3a4abdd1c2f54f15fc42ca17756e7fd89b43f1b96 SHA512 8c9dcd0f77916cbf144ee062453adebfb73a8537c0f40f799d87cae9e3811cdf914cec90ecd4526149be0c3baed646b9065ed879c69d185df7c7ecb452bcf798
-DIST github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz 926294 BLAKE2B 873eddc079f9891d3c72c865ac7f496ebea25b6fc2d4cf935f61ac2e422c04e1f8883dd0e9b97e359257c554d8986625a52015c2da2a8a93da4ce4204f858b50 SHA512 038f90bb667b63228b554066fd1efd608eb24615b549cea40314761022e0d0a775d268b6ac9072ad50b83e162467f8280f16b3d8fcd83c9bdace509279f3823f
-DIST github.com-golang-net-a8b9294777976932365dabb6640cf1468d95c70f.tar.gz 930031 BLAKE2B af7aec68203e6226d8c4472a00f2b1c775000de3130f9239fb5511e4092a91cc3d8f9ea65ee35a5b4f063806a3b7eabbb9dc13f5040895ef74afa01f54d76bdd SHA512 ad71e5c2f7e4877eae6a8ecd0e49a2e3cc4836f29ac14838624878237199f7a0739110bfede44eb0fa3bfa43b26b4bacffea7951caf41e4ba82fb71a1c279681
-DIST github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz 268477 BLAKE2B af1775f715a7c8434fe46872d8edf75241c851fb93e1e3f888c5fa1b603397e68c3878c9c69afe618ff1b7ae3d0c219ec96b8648af2fd2c2c9424a33f1710a2e SHA512 07de72078a66528d864da78c88be36351cf79be5235ec9f4ed1d71061a56b9b216fd29984ccfb2a610223a86b80aba2b9ca28a0d36fc2346b23070e25e72e29b
+DIST github.com-golang-net-0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz 930720 BLAKE2B 73434ace62ef2a9db1b551075baf05458b8a8ed25b44ce88ca0780d9ff38a2fc176ab3040b198d5a8b2b8744ba60aa97f57cefdeed5cf1574c010b933bb033c2 SHA512 0e5bfc2f04e44b7eb3b1aa44a77f0a5e40e0df5e80284cb4fca267ee224f44089f1d28d1486cf5748fbeb4bb8818159dcd019de9e1f24f016f06b05c5379f41c
+DIST github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz 269739 BLAKE2B 8f2b6aa86390b6f5df1e8af249a5a7ad268006e8d5da72aab1c76a54acf7b4f9d365a0047ad65dc966b7e3fbb9667c544fa97c76e98db3749b2dd13889096569 SHA512 bb420871f20ab482d1ebefc0d9225d2acc890252cec3cb3ed02bbf4720d5733aaa39b78c9a7b72998be094a77148d121c3afc0c2811ddc3e728819e5d36963d4
 EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f9048df6086853a062436a5a6463b24664ab556a9d3f3bb3297a0ae9c76d21895475e3c29e9257ce3543a17c70 SHA512 26edd24f0e66e13a3f397cac24b14c0ee0237ead70fa8204f7b2a76aa0495670a9783b7dddc7d363c778f2d973fb5bc6c75dcb61c8fc9359ee168a2d3356b0df
-EBUILD drone-0.8.2.ebuild 1806 BLAKE2B a6a17b3d445045ddc33a1bb21d0bd62634bba73795596cfa3b4b2b1d677364776d394fc72447fe112e49775f8e8d1b75bbbac870ff4cd1be374d453ccc08cad1 SHA512 4f33e00b716668793d6f0e5f76d2e74ae1b1e14686e5b24513049cd9e33f25dd546c8a74ea23160c7ed2d3b69193f36d9f18ef2dae6dee2032f1c1365087c282
-EBUILD drone-0.8.3.ebuild 1806 BLAKE2B 8bdf7e123e65cdad8a4cad6aa41856a8415df87da7f7e33dbf2322ce99fde9117e23838ff115ff2a9314e7b67439556d2816ee02fe1b1f22b3f26f8cfa8d9b7d SHA512 c95ec0231c57c6d61ab339aa0f441d70607bf24fdbb0122630c4993cf590d17ca765a91aa118ee854156538ddff8b0bb30dbabf25cbc54ebcfc29e05ab8be86f
+EBUILD drone-0.8.4.ebuild 1812 BLAKE2B 96357aae4cd5aaf5f4b8eff4b4fa4933d4ca00291085e9fbf208b9351f0ef73a4a1b5c5a0528f7d561b8837a96c47a9fbbfe8abcb9d4cbccd00cbecb0d47e70f SHA512 c2874dcfc5bf0177f7fadbc2c751d10bc41e0a4b50a46650508fe25de6bf8ea537e9e7f609578a9a4f9ee10b02f60d5bcd742f1bdc232780f9ffc936d9b64299
 MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.8.2.ebuild b/dev-util/drone/drone-0.8.2.ebuild
deleted file mode 100644
index a2b706395e1a..000000000000
--- a/dev-util/drone/drone-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="956418cae9bef51fb5855c6a7bd881ceeb4fa801"
-EGO_VENDOR=( "github.com/drone/drone-ui cc079b1279f70e54f64cf0c14e1e531b6689232b"
-	"github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845"
-	"golang.org/x/net 9dfe39835686865bff950a07b394c12a98ddc811 github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.3.ebuild b/dev-util/drone/drone-0.8.3.ebuild
deleted file mode 100644
index 3053f1715725..000000000000
--- a/dev-util/drone/drone-0.8.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="3daf6797ab6378d4a27b9fb1d4877e3a55a6c922"
-EGO_VENDOR=( "github.com/drone/drone-ui cc079b1279f70e54f64cf0c14e1e531b6689232b"
-	"github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845"
-	"golang.org/x/net a8b9294777976932365dabb6640cf1468d95c70f github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.4.ebuild b/dev-util/drone/drone-0.8.4.ebuild
new file mode 100644
index 000000000000..0e2a40cfa814
--- /dev/null
+++ b/dev-util/drone/drone-0.8.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone"
+EGIT_COMMIT="75150d4a429da6c95cb851bfecded03a50936675"
+EGO_VENDOR=( "github.com/drone/drone-ui cc079b1279f70e54f64cf0c14e1e531b6689232b"
+	"github.com/golang/protobuf 925541529c1fa6821df4e44ce2723319eb2be768"
+	"golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd github.com/golang/net"
+	)
+
+inherit golang-build golang-vcs-snapshot user
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs:="
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
+}
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
+	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
+	popd || die
+}
+
+src_install() {
+	dobin src/release/drone-{agent,server}
+	dodoc src/github.com/drone/drone/README.md
+	keepdir /var/log/drone /var/lib/drone
+	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
+	newinitd "${FILESDIR}"/drone-server.initd drone-server
+	newconfd "${FILESDIR}"/drone-server.confd drone-server
+	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
+	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
+}
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 651428f64cbe..e035bd5389cf 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -2,7 +2,7 @@ AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b2
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
-DIST electron-1.6.15.tar.gz 4943663 BLAKE2B 867964e23bea77b0892febcc47198bf783f0021df842c40c94c2159abca75ca45cac345323bb2735a9ddc935bedba62126d5afe9ad9e0fc031abefbaf444d441 SHA512 e6e7519db6d272d151e5618976a69feb11c35f1845561d152c64b474696f3835644b232b020df00166f80913b2c492e6e8cefce1a96494a2bb92096936e18958
+DIST electron-1.6.16.tar.gz 4957555 BLAKE2B c72433ed076bc6b68b81b136db4dcf1a0fe17f16c7859e5176c215d86164f0c3d531310d8edbee9f52038722aa6dbc7934d9d9a5511bcb978bb9c255122f1794 SHA512 f657aae526defa8526948c89b8667475d1fb27f1884a1a4655773052cf3b3578483d3d51e35e6aa077579c3023056eec5d2a06f24a2c4013ca078fb82f850182
 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
 DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
@@ -10,7 +10,7 @@ DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2
 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
 DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
 DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
-DIST electron-patches-1.6.15.tar.gz 28591 BLAKE2B 98654829e882874f4470d7bdb906f7cebde6c61c28568c06650464ecd8779cafd028b03711c063445387dd158804a7b9bac5aca836f56f2285b50fcaf3ee56b0 SHA512 c18e53bdf86246376fdac505481e4aa364438b703a47fb82b695d874dabf9a945df5381042b1a0cef102142f0482db51017a031647f8f8ffde3e8d1f629e2f9f
+DIST electron-patches-1.6.16.tar.gz 28592 BLAKE2B bd64ff7ad03a8ecb9422702cc33746d57464228a3ee7ae7fa9ecc30ad5507a8cb2db71caf5f6700cfe1d963e9957d50c1e5c784e148aaabc11aef9d90d2508f0 SHA512 b53b5f88532a0898878abac71b36c410c3734da871266703932238f707e54a4f6af92cc4792dc645ba02069ec5e9e548317e0e121556210f69dfbb63d5a1fa03
 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
-EBUILD electron-1.6.15.ebuild 28334 BLAKE2B d522d9db81c453a9ec775d9e8a414654e9eef804bc26a5e903d01ccdb31ab3a05f5e93b3f3608f29dccf4d66d92bc982b8b2439147588519f272ee9fa52d8691 SHA512 7f291863bbd72226582bc10e48dc68b1c19b5b4b730be0c5a7cc27a7ff5faca25fcffb2067a5ed71d0acb95a76d2e4afc3d293682f0379c81186aa949154f7c5
+EBUILD electron-1.6.16.ebuild 28088 BLAKE2B afaa3c13bff2adb837230c5b44a07a7725b50ea3f4b7e263538c53b5d9f22e837499b089b405b4708bdafb5bfee852c34229c988a5f6c4336f6cc12802868dd1 SHA512 55a4c3c9663294a77d89b8a85a176aad32a4ba9c579be9e5513ecc8742edbf4f2b4e7e94f82a13a44f9d21490735f4a71727938de88864c1d2fc23dd4d7aec0f
 MISC metadata.xml 1179 BLAKE2B f233c35ac72f6b375d7f036671f0a21b6a5b72453713c6cae6b13b8b7d2c5d8b71682799124f121f6fafe115aea6de05f44b440054ccbad4af86b2c03e0833e4 SHA512 3f9a3dba4cad2d4eebd2d90eb5b1d078df6c59f5eda52fbc148b23b999a9ec4318b87e1ab8bbcdd6ec353bf274ed65ae3a19cae7df07465cd86f64abd85018a0
diff --git a/dev-util/electron/electron-1.6.15.ebuild b/dev-util/electron/electron-1.6.15.ebuild
deleted file mode 100644
index d4467b022301..000000000000
--- a/dev-util/electron/electron-1.6.15.ebuild
+++ /dev/null
@@ -1,893 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="56.0.2924.87"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="909c49265493bd095c27cefd999567be2107899a"
-# Keep this in sync with vendor/node
-NODE_COMMIT="9b1683e7000481ec6214eafa3eef7ac4594eb410"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a050a339cfeabcfb5f07c313161d2ee27b6c3a39"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with script/lib/config.py:LIBCHROMIUMCONTENT_COMMIT
-LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-
-PATCHES_P="gentoo-electron-patches-${P}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> electron-${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libvpx:=[svc]
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	media-libs/flac:=
-	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	x11-libs/gtk+:2
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	net-libs/nodejs
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) [ab]/(.*)$|\1 ${relpath}/\2|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Apply libcc Chromium patches.
-	_unnest_patches "${LIBCC_S}/patches"
-
-	EPATCH_SOURCE="${LIBCC_S}/patches" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \
-		epatch
-
-	cd "${S}" || die
-
-	# Apply Gentoo patches
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
-
-	EPATCH_SOURCE="${WORKDIR}/${PATCHES_P}/${PV}" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_MULTI_MSG="Applying Gentoo patches..." \
-		epatch
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/numerics
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/murmurhash
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libusb
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/openh264
-		third_party/openmax_dl
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libjpeg
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/smhasher
-		third_party/sqlite
-		third_party/tcmalloc
-		third_party/usrsctp
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/x86inc
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries="
-		flac
-		harfbuzz-ng
-		icu
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		re2
-		snappy
-		yasm
-		zlib"
-	if use system-ffmpeg; then
-		gn_system_libraries+=" ffmpeg"
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gnome true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_gtk3=false"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared --without-bundled-v8 --shared-openssl \
-		--shared-http-parser --shared-zlib --without-npm \
-		--with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-
-	einfo "Configuring chromiumcontent..."
-	# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
-	# Remove the glibc allocator shim so that it doesn't get picked up
-	# by Electron's build_libs script.
-	rm out/Release/obj/base/allocator/unified_allocator_shim/allocator_shim_default_dispatch_to_glibc.o || die
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-	out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/brightray/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/electron-1.6.16.ebuild b/dev-util/electron/electron-1.6.16.ebuild
new file mode 100644
index 000000000000..58491cdd5640
--- /dev/null
+++ b/dev-util/electron/electron-1.6.16.ebuild
@@ -0,0 +1,881 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 gnome2-utils flag-o-matic multilib \
+	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
+	versionator virtualx xdg-utils
+
+# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
+CHROMIUM_VERSION="56.0.2924.87"
+# Keep this in sync with vendor/breakpad
+BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
+# Keep this in sync with vendor/breakpad/src (and find the corresponding
+# commit in https://github.com/google/breakpad/)
+BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
+# Keep this in sync with vendor/brightray
+BRIGHTRAY_COMMIT="909c49265493bd095c27cefd999567be2107899a"
+# Keep this in sync with vendor/node
+NODE_COMMIT="9b1683e7000481ec6214eafa3eef7ac4594eb410"
+# Keep this in sync with vendor/native_mate
+NATIVE_MATE_COMMIT="fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e"
+# Keep this in sync with vendor/pdf_viewer
+PDF_VIEWER_COMMIT="a050a339cfeabcfb5f07c313161d2ee27b6c3a39"
+# Keep this in sync with vendor/pdf_viewer/vendor/grit
+GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
+# Keep this in sync with script/lib/config.py:LIBCHROMIUMCONTENT_COMMIT
+LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
+# Keep this in sync with package.json#devDependencies
+ASAR_VERSION="0.13.0"
+BROWSERIFY_VERSION="14.0.0"
+
+PATCHES_P="gentoo-electron-patches-${P}"
+CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
+BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
+BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
+BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
+NODE_P="node-${NODE_COMMIT}"
+NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
+PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
+GRIT_P="grit-${GRIT_COMMIT}"
+LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
+ASAR_P="asar-${ASAR_VERSION}"
+BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
+
+DESCRIPTION="Cross platform application development framework based on web technologies"
+HOMEPAGE="https://electronjs.org/"
+SRC_URI="
+	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
+	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
+	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
+	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> electron-${BRIGHTRAY_P}.tar.gz
+	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
+	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
+	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
+	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
+	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
+	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
+	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
+"
+
+S="${WORKDIR}/${P}"
+CHROMIUM_S="${S}/chromium"
+NODE_S="${S}/vendor/node"
+BREAKPAD_S="${S}/vendor/breakpad"
+BREAKPAD_SRC_S="${BREAKPAD_S}/src"
+BRIGHTRAY_S="${S}/vendor/brightray"
+NATIVE_MATE_S="${S}/vendor/native_mate"
+PDF_VIEWER_S="${S}/vendor/pdf_viewer"
+GRIT_S="${PDF_VIEWER_S}/vendor/grit"
+LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64"
+IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	>=app-eselect/eselect-electron-2.0
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/icu-58:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libvpx:=[svc]
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libdrm
+	x11-libs/libnotify:=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	media-libs/flac:=
+	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<dev-util/electron-0.36.12-r4
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	x11-libs/gtk+:2
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	net-libs/nodejs
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288
+			die "At least gcc 4.9 is required"
+		fi
+	fi
+
+	# LTO pass requires more file descriptors
+	if use lto; then
+		local lto_n_rlimit_min="16384"
+		local maxfiles=$(ulimit -n -H)
+		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
+			eerror ""
+			eerror "Building with USE=\"lto\" requires file descriptor" \
+				"limit to be no less than ${lto_n_rlimit_min}."
+			eerror "The current limit for portage is ${maxfiles}."
+			eerror "Please add the following to /etc/security/limits.conf:"
+			eerror ""
+			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
+			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
+			eerror ""
+			die
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	use lto && CHECKREQS_MEMORY="7G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		CHECKREQS_MEMORY="16G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+_unnest_patches() {
+	local _s="${1%/}/"
+	local path
+	local relpath
+	local out
+
+	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
+	| while read -r path; do
+		relpath="$(dirname ${path})"
+		out="${_s}/__${relpath////_}_$(basename ${path})"
+		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
+			"${_s}/${path}" > "${out}" || die
+	done
+}
+
+_get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+_get_install_dir() {
+	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
+}
+
+_get_target_arch() {
+	local myarch="$(tc-arch)"
+	local target_arch
+
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	echo -n "${target_arch}"
+}
+
+src_prepare() {
+	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
+	rm -r "${NODE_S}" &&
+		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
+	rm -r "${BREAKPAD_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
+	rm -r "${BREAKPAD_SRC_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
+	rm -r "${BRIGHTRAY_S}" &&
+		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
+	rm -r "${NATIVE_MATE_S}" &&
+		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
+	rm -r "${PDF_VIEWER_S}" &&
+		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
+	rm -r "${GRIT_S}" &&
+		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
+	rm -r "${LIBCC_S}" &&
+		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
+	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
+		"${S}/node_modules/" || die
+	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
+        "${S}/node_modules/" || die
+
+	# node patches
+	cd "${NODE_S}" || die
+	# make sure node uses the correct version of v8
+	rm -r deps/v8 || die
+	ln -s "${CHROMIUM_S}/v8" deps/ || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" \
+		deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
+		deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
+	python_fix_shebang "${S}/tools/"
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen
+	# https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Apply libcc Chromium patches.
+	cd "${CHROMIUM_S}" || die
+	_unnest_patches "${LIBCC_S}/patches"
+	eapply "${LIBCC_S}/patches"
+
+	# Apply Gentoo patches
+	cd "${S}" || die
+	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
+
+	# Merge chromiumcontent component into chromium source tree.
+	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
+	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
+	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		breakpad/src/third_party/curl
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/numerics
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/murmurhash
+		third_party/angle/src/third_party/trace_event
+		third_party/boringssl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/py_vulcanize
+		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libusb
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/openh264
+		third_party/openmax_dl
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms2-2.6
+		third_party/pdfium/third_party/libjpeg
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/zlib_v128
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/smhasher
+		third_party/sqlite
+		third_party/tcmalloc
+		third_party/usrsctp
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/x86inc
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg )
+	fi
+
+	cd "${CHROMIUM_S}" || die
+
+	# Remove most bundled libraries. Some are still needed.
+	ebegin "Unbundling libraries"
+	build/linux/unbundle/remove_bundled_libraries.py \
+		"${keeplibs[@]}" --do-remove || die
+	eend
+
+	cd "${S}" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf_gn=""
+	local myconf_gyp=""
+
+	cd "${CHROMIUM_S}" || die
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries="
+		flac
+		harfbuzz-ng
+		icu
+		libjpeg
+		libpng
+		libvpx
+		libwebp
+		libxml
+		libxslt
+		re2
+		snappy
+		yasm
+		zlib"
+	if use system-ffmpeg; then
+		gn_system_libraries+=" ffmpeg"
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+
+	# Optional dependencies.
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=$(usex gnome true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_gtk3=false"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local target_arch=$(_get_target_arch)
+	local ffmpeg_target_arch="${target_arch}"
+
+	if [[ ${ffmpeg_target_arch} = arm ]]; then
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		filter-flags "-Wl,--as-needed"
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
+	myconf_gn+=" icu_use_data_file=false"
+
+	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring bundled nodejs..."
+	pushd "${S}/vendor/node" > /dev/null || die
+	# Make sure gyp_node does not run
+	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
+	# --shared-libuv cannot be used as electron's node fork
+	# patches uv_loop structure.
+	./configure --shared --without-bundled-v8 --shared-openssl \
+		--shared-http-parser --shared-zlib --without-npm \
+		--with-intl=system-icu --without-dtrace \
+		--dest-cpu=${target_arch} --prefix="" || die
+	popd > /dev/null || die
+
+	# libchromiumcontent configuration
+	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
+	myconf_gn+=" is_electron_build = true"
+	myconf_gn+=" is_component_build = false"
+
+	einfo "Configuring chromiumcontent..."
+	# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
+	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
+	# Remove the glibc allocator shim so that it doesn't get picked up
+	# by Electron's build_libs script.
+	rm out/Release/obj/base/allocator/unified_allocator_shim/allocator_shim_default_dispatch_to_glibc.o || die
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+	out/Release/gn gen --args="${myconf_gn}" out/Release || die
+
+	cd "${S}" || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	local compile_target="${S}/out/R"
+	local myconf_gyp=""
+	local chromium_target="${CHROMIUM_S}/out/Release"
+	local libcc_path="${S}/vendor/brightray/vendor/libchromiumcontent"
+	local libcc_dist_path="${libcc_path}/dist/main"
+	local libcc_dist_static_path="${libcc_dist_path}/static_library"
+	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
+	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
+	local libcc_output_shared="${libcc_output}-shared"
+	local target_arch=$(_get_target_arch)
+	local l=""
+	local create_dist_args=""
+
+	tc-export AR CC CXX NM
+
+	mkdir -p "${compile_target}" || die
+
+	cd "${CHROMIUM_S}" || die
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C "${chromium_target}" mksnapshot || die
+	pax-mark m "${chromium_target}/mksnapshot"
+	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
+
+	# Build chromedriver.
+	eninja -C "${chromium_target}" chromedriver
+	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
+
+	# Build libchromiumcontent components.
+	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
+
+	cd "${S}" || die
+
+	# Gather and prepare built components of libchromiumcontent.
+	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
+	create_dist_args+=" --no_zip"
+	create_dist_args+=" --system-icu"
+	CHROMIUM_BUILD_DIR="${chromium_target}" \
+	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
+
+	# v8 is built as a shared library, so copy it manually
+	# for generate_filenames_gypi to find.
+	mkdir -p "${libcc_dist_shared_path}" || die
+	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
+
+	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
+		"${libcc_dist_path}/filenames.gypi" \
+		"${CHROMIUM_S}" \
+		"${libcc_dist_shared_path}" \
+		"${libcc_dist_static_path}"
+
+	# Configure electron.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use lto)"
+
+	myconf_gyp+=" -Duse_system_icu=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+	else
+		myconf_gyp+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0
+		-Dsysroot="
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+	myconf_gyp+=" -Dpython=${EPYTHON}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gyp+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+	myconf_gyp+=" -Dgenerate_character_data=0"
+
+	myconf_gyp+=" -Dlibchromiumcontent_component=0"
+	myconf_gyp+=" -Dcomponent=static_library"
+	myconf_gyp+=" -Dlibrary=static_library"
+	myconf_gyp+=" -Icommon.gypi electron.gyp"
+
+	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
+		egyp_chromium ${myconf_gyp} || die
+
+	mkdir -p "${compile_target}/lib/" || die
+	# Copy libv8 and snapshot files so the node binary can find them.
+	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
+	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
+	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
+
+	# Copy generated shim headers.
+	mkdir -p "${compile_target}/gen" || die
+	cp -r "${chromium_target}/gen/shim_headers" \
+		"${compile_target}/gen" || die
+
+	# Build the Node binary and pax-mark it.
+	eninja -C ${compile_target} nodebin
+	pax-mark m ${compile_target}/nodebin
+
+	# Finally, build Electron.
+	eninja -C ${compile_target} electron
+	pax-mark m ${compile_target}/electron
+
+	echo "v${PV}" > ${compile_target}/version
+}
+
+src_install() {
+	local install_dir="$(_get_install_dir)"
+	local install_suffix="$(_get_install_suffix)"
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+
+	pushd out/R/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# Install Electron
+	insinto "${install_dir}"
+	exeinto "${install_dir}"
+	newexe out/R/nodebin node
+	doexe out/R/electron
+	doexe out/R/chromedriver
+	doexe out/R/mksnapshot
+	doins out/R/libv8.so
+	fperms +x "${install_dir}/libv8.so"
+	doins out/R/libnode.so
+	fperms +x "${install_dir}/libnode.so"
+	doins out/R/natives_blob.bin
+	doins out/R/snapshot_blob.bin
+	doins out/R/blink_image_resources_200_percent.pak
+	doins out/R/content_resources_200_percent.pak
+	doins out/R/content_shell.pak
+	doins out/R/pdf_viewer_resources.pak
+	doins out/R/ui_resources_200_percent.pak
+	doins out/R/views_resources_200_percent.pak
+	doins -r out/R/resources
+	doins -r out/R/locales
+	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
+
+	doins out/R/version
+
+	# Install Node headers
+	HEADERS_ONLY=1 \
+		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	dodir "/usr/include/electron${install_suffix}"
+	mv "${ED}/usr/include/node" \
+	   "${ED}/usr/include/electron${install_suffix}/node" || die
+}
+
+pkg_postinst() {
+	electron-config update
+}
+
+pkg_postrm() {
+	electron-config update
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index dfa69804bcc9..690584c6f2d0 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,6 @@ AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed362
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-EBUILD gdbus-codegen-2.50.3.ebuild 1317 BLAKE2B 97698b5d0b339ec65e2eb11f6e641b75df60569659cac119417a427043603d0331b7f84df47c68c422d4b1182952b5fc877be41d8ccbae56517e17aca5a6802d SHA512 360162724e4d55bb05c4d048fc42c761b42fee345973f1f11e5d4df86c2f48c6e7028e7f0b83e8128e426b95e2a5c652843bc02ea5fbb6a06a22a940612b5982
-EBUILD gdbus-codegen-2.52.3.ebuild 1332 BLAKE2B 90405bf7dcf98361e516072d755d1b4243b0a57d7b62f12232b467dfe9c0831ec008dd2e97e28fd77ed59a309ae704715bd5a7ddeca86aaf83885b185ae16188 SHA512 2649c3aeb596e35954a2d5153538d9cf1075230e4f16486b8313ae014d023cd68da55790f39c75654ff5bfd6ebb7e78a86ccb81f7eedf955b70e178739b562db
+EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
+EBUILD gdbus-codegen-2.52.3.ebuild 1320 BLAKE2B 3a1f923eb21e502e26d38c7b7e78c61e75097f0c08d316806a2b30dec20ceafa5d31a01ba1030e3537b5bcdfeac9b5a3098f1a266f53eaeb52d5006e79cedfee SHA512 71725b4e73bdf125d18a534f43425ddad78960d207f78a36c511bac90e1d3e1ea70a46560dec2444aa23ca0805a6990ddb8ec5f92a55ea52d97f2b4c1c5a2363
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
index 8999c14200f2..6fd9a6b75776 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.50.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="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 253853d9ce63..4cbb142890ca 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 9daa1f0e8672..9f675d110be0 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -6,6 +6,6 @@ DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319
 DIST gperftools-2.6.3.tar.gz 911813 BLAKE2B dae223927835f65b819836b25595df2943a0762ac3b6346e3d0186dab486cfa3e4eabc1f5a2ec43314f53ea96a68acb75991b76055591395bc52e78f655630d3 SHA512 6418c382760c8870ef42a535fcb65a623c1a9fd3ab58fcb7cfe2dd5048b2268b434427da36bc0c76beef2c28e13a6926d32d67084d8ca6675b78650a62de77a7
 EBUILD google-perftools-2.0-r2.ebuild 1803 BLAKE2B b81145202e20964c9c5784aa1b7b7afb1bef69659339654375a2019732d7696b2bd6fe0bf0347c7f559146b7c64e4c203ec7ad7626ccd68d3f030b488005a92e SHA512 7fe925ddae89c431f7177c4bc97dc2e5a663452e9fde34d16f28fd5dbfa8e584b961362cc1f65ee726478b54a2d000b15ef3bf81ce4e10c11aee2a78990e3a58
 EBUILD google-perftools-2.4.ebuild 2297 BLAKE2B 7c0dd1e856d745ecf215d3974f1bc2dd057f7ca3381bcc5ca7b8d2ce800b029c831934d27a938056aaa724a500f5799ef792155c2e371ea9fe2be4f0cdec0995 SHA512 026a68d5920847c00fd1af24397ce45575dab9e16f569c9d55b7b0424511cab365be429e33bb7d74ef70a57c38eacc825d3809d44c204678b046c9a76302a460
-EBUILD google-perftools-2.6.2.ebuild 2314 BLAKE2B 8acb369a7a57cc083db393888f10fc0cd1e4ffdcbc377df86b0793f43baf97525eb251d7592921ae0467c60183d7da1d3c34d8f89c25562804e4d834326be63b SHA512 45436e293183741359113af494a728913b351816b263a872b8b519644a0b5147d725e9da68df0af2a1132acee445d848aeca0f1ef45800f2c3e98ad0bd8b8d79
+EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
 EBUILD google-perftools-2.6.3.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
 MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index 915b13494241..cdbf549f9647 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.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
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="largepages +debug minimal optimisememory test static-libs"
 
 DEPEND="sys-libs/libunwind"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index a5751908a021..383f73f9b2a3 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-am-1.25-r1.ebuild 1268 BLAKE2B f6d92d3fec80ca5224c253342d0e53f063c435916e6348e3bbb348c589ba33d75948c7906fef111cd2ff8a0b661e493a97305e044e55aa4ebddac445f22f88ce SHA512 96e5a89b9c42856d37d7cfeb438e6c3ab57ecb90177e794401d0baf6cfebbd7066156ce04536c56301cd90a3ecdb45269053aa9e7b47557f0c45d604bf504cd0
+EBUILD gtk-doc-am-1.25-r1.ebuild 1256 BLAKE2B 2882c5fcc53a55dd662f98b1113f68d9a5e46bb932cfaee4e752cdf16ee4d442db4898d2cc3574d2e7297e624edaeb1f189eb292dfb9add20e4e2cd0ca145dc2 SHA512 1182846602f295e36ee5995d33434d83eee8d68ea19eaa34fa0b26047b5f66cbf704ed7a9cb574a08482b48894ef818756a09d3679dfcbfa867c00a575e8f1ae
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index a787a0a7ee82..0c69ec3a3bd6 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-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
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND=">=dev-lang/perl-5.18"
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 1c817ab97100..ba337f7cb541 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2591 BLAKE2B 667155d493ce9f6ce67ab4d1e560f94f69386e8fd72a085b1c61b58b599a23cc4e3a9700ffa7b7dd4849da2ee8fd072ac8f5f203055801d323c0c30ba346ff1e SHA512 0fb36786bccc6d31b14cd47fbcd2c5f17728cb993b98d1e1406fd75fb0a37041aad8f385e9b27f0960903d033fdb240ebbb6eb744f9df216f1c04bb4365d2b06
+EBUILD gtk-doc-1.25-r1.ebuild 2579 BLAKE2B 37ac029c3b48f3da9891a1d8aa053a87b0a0165fc7ed12d9e65cf7814221eea6b67f244fef6d830f11b8616fff98a2cc6022c525388339d4637e6bc38fcb3fe6 SHA512 debea3a5905dd33846565cd67ded6a92d39e8fd371c6886b15322ac73185171a18a2226a05ea5e0341d70a03acfc0ee6513bd2b192934a72c1b6d1ed3a157974
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 002cb3d2d718..c7c27f2f2628 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs highlight vim"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
new file mode 100644
index 000000000000..12dc524d0d05
--- /dev/null
+++ b/dev-util/hadolint/Manifest
@@ -0,0 +1,3 @@
+DIST hadolint-1.2.6.tar.gz 26761 BLAKE2B bf2693b0073cef553a2f7767a2d90a3af009cebbfeb448b306475f5ec6c7a3e9b228cab5e2279b6a3c3387be0fd58f14c47df1cd21c35045f96f3f3e07678ae5 SHA512 36f25dc040aa93c45f6da8195de7089032c0b777f939aafd77b53103d662d977b372afd7a6e39840498df6496a2a29a8c94ae59748b599aa840824fe28dda8b4
+EBUILD hadolint-1.2.6.ebuild 972 BLAKE2B f8e845180b0284f5b48a990fa425cfed9c6f8cac0200e90b068d48d37f01edced97555d907aaa9443e5145d58c94769b00891f027e6de6600e336d42eec25068 SHA512 59e7a23c7210275a86a6aec7a550958ed14830a7bf5329ceee4cafdbf2a834dae26165f5d6e36fc34ae7f3259e85badb60a4d62b819a875f10a780cd964525c2
+MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.2.6.ebuild b/dev-util/hadolint/hadolint-1.2.6.ebuild
new file mode 100644
index 000000000000..2f335d90eea9
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.2.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile Linter JavaScript API"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-2.0.0:=[profile?]
+	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.4.7:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
diff --git a/dev-util/hadolint/metadata.xml b/dev-util/hadolint/metadata.xml
new file mode 100644
index 000000000000..1eacbb097674
--- /dev/null
+++ b/dev-util/hadolint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		A smarter Dockerfile linter that helps you build best practice Docker images.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 6943c3b5024b..f36bfc4b8324 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -2,6 +2,6 @@ AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r1.ebuild 1011 BLAKE2B 7c77d87124a43a915f983811b363b2ea337d8f35f00bb826ae7f0bcb7952948d5e9bc3cbb39292cee37b9fd82478ecae9e941cfd736aad5990f9956e3d3c6cc8 SHA512 f2c21fc3cae62a6a18dfd5440f2b4499d3e2386a3c750c1d3d642f6759a51369ea14f6d4deb1e74a3c2eaa84f52c9106b87bfdfceb3855a16b3b6cd4f1e7397e
-EBUILD intltool-0.51.0-r2.ebuild 1010 BLAKE2B 71cbec40be07e6285b4ca62d41ce5e6052cec1d6da470e68b47da5489ac5ab64e5fe1c54ec846c4e7654ce09a4d2762908b10813dabf3d1535684e591789d1ab SHA512 2214bd9b25c12bf6886e63e54ec37fd00f16d2a2fb577753be70b0de3af9889952b411be08f08d47906dfcc7132c759141cefd1fc05f5c732f6fc49651999249
+EBUILD intltool-0.51.0-r1.ebuild 999 BLAKE2B 31dad2747e2af68d35064508f51a9e1ec1b31fbb4cd658952493941758fcf2ce9ab0c9e3895a5ef7504dd9550728e98ede882b8b890d218c235a048f9226352c SHA512 3d8f5cdb7f61cee60cc855602cebc319d438bf6759b728ebfc194e73cc29f55889bea758320faefcb0e9116e173b2db1f6fea6f024780f7be815a4d50ca2dbe6
+EBUILD intltool-0.51.0-r2.ebuild 998 BLAKE2B 350f21bed9cb0114e3b18e588e18031b39bf4a63ffeaefc133dcfad4db222e774d1357842f9e86b38e6d21dd8b42e6ef93b02f1f6b8999160527144f12e46ee4 SHA512 b243609399103012c9b3c4d2b0f795e790af15be807fe938ccdbd282f5d5368d6d089b0742b7d8dd142f3b57b36304b7127a7970945a03275d6dcd62cecbab14
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r1.ebuild b/dev-util/intltool/intltool-0.51.0-r1.ebuild
index dce86ad582d8..126bbd071a4f 100644
--- a/dev-util/intltool/intltool-0.51.0-r1.ebuild
+++ b/dev-util/intltool/intltool-0.51.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
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 2bde1170cf16..ce1a0aa2d745 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.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
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index ae5af7794a76..63143869fb88 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,9 +3,11 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 DIST jenkins-bin-2.89.2.war 74294776 BLAKE2B a163d6bd542b01cfcd5781fab524d91ec74ff0dacced3213366832e6839616554f0c42dd1ed580c55fccda693736b5f4041a6eff7bc5e66a6edf608ce3126bb3 SHA512 dfaa5ce0e3cf679fff8f3a1234db8dd88087d221cd1d0f4a84c2a41a5463f9fc2645fa9ba3bcd86f793bb07ef74a0efb3075fd28f3fdf7ccffb18904a8a69231
+DIST jenkins-bin-2.89.3.war 74292096 BLAKE2B 63df34eef6786ae81ed8e6d486b77e13125fb3b74ed6db03ea45d2c57d9f49c6648e2ffcd4b042261de287cd60a13a43a7e93f151b32b113c8847221ce4594ad SHA512 777b4d7cf1420cbc6bc7da22a0ede75fc07d5d66af500f6e7ebde75475c7046051da6c18f695bdfd4dd238b57355828a5d5b43775a8b4eb3bd84db35d18a9874
 DIST jenkins-bin-2.95.war 74275142 BLAKE2B b2865010628940f216bf39847203d786ef63ec8f18b8adabec629b7ef7b01681dbdd381738163cff9c04f75b50705cfa5c9aad9bcf038fbfb9c91abb738fc1b6 SHA512 2002953a49cacdac8a93f24335d489dc4c10c7ae3f3bc80b4f6dd524a5ac1984fc7229c570e0c79dd53c51bf609cc989193c0a6881f2e0b9d8dd49e47bad20dd
 DIST jenkins-bin-2.97.war 74297213 BLAKE2B 374266b466736d8e6b6abdef13718e132336525926f28c6ced413dd1a091568bae81900133efc5a0efa96e41847e17b483e8842884c3efa7457c59cdb4bd32f6 SHA512 e784e35136c079caaae12788afa093830cd4d1d4f657b2f11571db5b7a3fa3271d2cd50a8793097905bc0ba67b8ad0bf78b94db00d86ab722453f4c0a41f647e
 EBUILD jenkins-bin-2.89.2.ebuild 1110 BLAKE2B 19defadb6c4401f2f8cdfa8375dfe2ea7e5c92e2c97eaf59d376bcaca38fb2d02ff618c76da1f1be57a198effb75417dcc8332c65c0605d580b54bc95b70de56 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26
+EBUILD jenkins-bin-2.89.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.95.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
 EBUILD jenkins-bin-2.97.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.89.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.89.3.ebuild
new file mode 100644
index 000000000000..95d08ad47b24
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.89.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 8c21833d3562..3638006acde9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -6,7 +6,7 @@ DIST meson-0.44.0.tar.gz 1102630 BLAKE2B 8365c54ea0ebc72685f4c98966bead90b5c44d7
 EBUILD meson-0.41.2.ebuild 797 BLAKE2B 8d070beaa894b2a3c4c96fa1dd538ec6e32bf62913d12c8a391f93cc82f920c0272521c6bf62ca91dccd206fdea6dc599cf92b9eeef0b15896901dbc1980bc0c SHA512 e713577c98de00817deb4854f845d2dfffe0df0c3cf8a0b994842ffcbaaa6a16fc78d1751aef89e3cf6873b01c2a350a75ce85a62b700224a8bbe46324edae69
 EBUILD meson-0.42.0.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.42.1.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
-EBUILD meson-0.43.0.ebuild 798 BLAKE2B 2696dae59c445e29d0538d6a8cb9656647f3931f8047fe95e6af1c06ea8797ebbe22748fe2ffffc31dbdeb7e152dde1c87bdd4ebd6f49bcbc3c7b02953ae8562 SHA512 89385f25f16ac8d9b289618eb313c9a4d6e44c11ed71ce5e9da2d2f0b160accd02991ce33d412367c3597c153950ee206a5420362b295971ee2e685cf417bc05
+EBUILD meson-0.43.0.ebuild 797 BLAKE2B 3bb4bfd4321dbd0ca3210a84bc11571213f2857d73ce5e3f320b51f29fed811cf95806519761bf403b52864352a473d5d83b28aee21f88b361af9bdc85a6fd01 SHA512 75dd0115dfe1c4ed58d83f81e9f8dc4cdca1b6ad38710d837c6f3946e3cb20de644b69a7ee01648ff241daa9c07084b5729d807365ca310406e6bd76c45ccec3
 EBUILD meson-0.44.0.ebuild 899 BLAKE2B 2065872eed39e54e84cb74dbf28f2e8f9e7230f8ce34bd23a6da35a863859510757416bc0dd422de8d69b34a90e72bfa7a18da7d65ae411519242f115a8740d5 SHA512 024e8b698cb4198edea6d18e93e764f74e7f83a4cf908ac23fc2fe688998325d64c08188e493602beeb31bfa04043f3ea04d837b10e23c2e347cfe9d0f24b7c6
 EBUILD meson-9999.ebuild 814 BLAKE2B 1e7439398a08e8059c0fcd046b136b44ee5f2a1c074914592b052737583ea1d9eea130df41ca9c917c0732a6c451fddcf24a86919e1c8bb78356553450141317 SHA512 e987956ed667d35465300d0db312ce05b2c398dc10a731e9ea416d9645c0f1b9dbcfa74196490f2aa8e595488c16702439992ac49871a1fea397a4e6d0d686d8
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.43.0.ebuild b/dev-util/meson/meson-0.43.0.ebuild
index c4fda060df24..874587c745ad 100644
--- a/dev-util/meson/meson-0.43.0.ebuild
+++ b/dev-util/meson/meson-0.43.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
@@ -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 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 6d650ba932f4..81adac1e8224 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2929 BLAKE2B 54a5e014cbf551281018890b95f7c6ba84e9476406618a81fc575e52e0c4dd22a193c6beec6b522751707b9d65c38ddf28d836d0fcf76b6fa7f428d00bc96385 SHA512 1f0d9a52c45f9796c4844e95f29f621fbeab39c8a1e473b8a130a3873f98919e23b166776ee75d552d0bb58182181f04c6b4d948f76bb5583fcb92f22f05eabe
-EBUILD pkgconfig-0.28-r3.ebuild 3452 BLAKE2B 5af07393e80c8cddc75933ef34a89cb359a547bff5526f012d37ffcb32c91a696e96547c22c62245be19c9eeec19fb30251a853887404db5672d1c68f9b261cf SHA512 9555d23c8b5c0b5251b7b1a509fcd5c29e047f8871fb903420ab6e50a17fb5d387d0f36100660bb24f206ed9d3979a091e3f927fc886803a97ef23dd00c4962d
-EBUILD pkgconfig-0.29.1.ebuild 3816 BLAKE2B 8d62d7448d60d34c80f3a68b4061fc227b1315ac7ec9960b83088b41d9ea1211581b0953ec572c2b3815550d0c1f1daf6dbe5f53fef5c4e12350f7a68eecc1dd SHA512 4fe303367076ead07d7abeac8c21eb29cc5a65c5f962f7294fdc0cc42c10bd715774d4d9e7a0c91536f01619ddbe27677aae40283a9686f9a8deba110726a7a0
-EBUILD pkgconfig-0.29.2.ebuild 3803 BLAKE2B 53f655d2db283ea553df839b1192b216d28b7961e1f648b0a8919fb88be97ebdc19fedd6d7f77d20e2b176684f705e97a3013c6b5af60d384cc86c61311e6320 SHA512 07f0617d4e5ee9b4a67c9979baaf5ed2eed998b7f386e265f6dc527192cdfad01597c725fb860d1d51247d3c87ed9bc5bc3225368e4dca5dbc962ca32cf60756
-EBUILD pkgconfig-9999.ebuild 3816 BLAKE2B 8d62d7448d60d34c80f3a68b4061fc227b1315ac7ec9960b83088b41d9ea1211581b0953ec572c2b3815550d0c1f1daf6dbe5f53fef5c4e12350f7a68eecc1dd SHA512 4fe303367076ead07d7abeac8c21eb29cc5a65c5f962f7294fdc0cc42c10bd715774d4d9e7a0c91536f01619ddbe27677aae40283a9686f9a8deba110726a7a0
+EBUILD pkgconfig-0.28-r2.ebuild 2917 BLAKE2B ae95639874d906788ce1e3511b965f03e64b545e9097d71efca5a2e430ef59e660a164581ca383f87d408d60a36728697ca5b14dd641ada7163a14932eb6c8e1 SHA512 3524f45c92d629a2f615f273897fd792ce760fc47046eeffbebe5f0e619f9d812202da73d54c60d5d142523c409175d4143cdfb8991c27b5e42c6d0ba17edfbc
+EBUILD pkgconfig-0.28-r3.ebuild 3440 BLAKE2B 2a83430e96362e930f23f71b18cf239e846aed65ae2868bddc05e0c5b40150e63142139a87b046e77fd67dec5284afc2b0208ed48cd4a1bb8a21fb09d75b2c8c SHA512 b9f615b244ff8774453aa4a8de547a66e71e34f3cf084f71c8ed27a4761e74a34b6d90a9170b3a1a6d62c5e3392e5204153ea739af5f48818df1eaddcc426506
+EBUILD pkgconfig-0.29.1.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
+EBUILD pkgconfig-0.29.2.ebuild 3791 BLAKE2B 14a5e7f9d94063d68b36512641745c742bffaf996ef170a6c4b2fa73f3fdeb32c1edd4a5d0f56d7362635af2a80496b1fd930e66859afd40f267fe18e816a24f SHA512 33ea45c748eafd8468d9000ab03d67548041310ffd54f1eec1925e8b0d7af15fa6303d11d315a0c970b0678702fc277cb698275dfb220278be8ff4843f5be274
+EBUILD pkgconfig-9999.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index efb880f705d2..9fa7fb11e9de 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-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=5
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 8b858b94d1b6..c94ca03db9bd 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-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
 
 EAPI=5
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 0657ec6b06e7..c5d3bf7ec72e 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index d3d9c4909cf9..3600aca2b077 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 0657ec6b06e7..c5d3bf7ec72e 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 0cd1319b7417..dbeb9d2b3f1a 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,3 +1,3 @@
 DIST promu-0.1.0.tar.gz 1065003 BLAKE2B f56dfda69dae632b1946182b1a92c059cac52867c677d415c2f321f95800d3902f8f0fbd4d4b670870f3dce34603b0c1a50df9311be70404f27e9f5afbaf4699 SHA512 18ad54b1ec9fe8975a0048b5c85609858cd500a2d3aa34e51e5c2c3d07a0df4337bac9648562e2007d5c8572e07c814c6bba7522b94836c258cde457df5815e2
-EBUILD promu-0.1.0.ebuild 853 BLAKE2B bf08063aaa26f3cd4fc3ae3516a0df17e7ffef45690f3de23c960477527b1426ed56a0b235de3687d8448fc9cf2b42800815361cb9e15b096a9f9c324331451e SHA512 3fe36dce670c3f49888edf59ab8629fc2e2f8d8cd3ed1a9eaf3dda3801c889d97b573cc0078b17fa9359d21960a0f5bfca08454f0b15441a53b14bef47e1616f
+EBUILD promu-0.1.0.ebuild 852 BLAKE2B 9233be82753b67b6396d85a6df6f49a7ea34857ee751c3b56dab70a47ce0eb7032d1abedf1d4c36ab83317050468b10598f09bfb2adefbbb43b2c15a5a4f474e SHA512 4bc962ebfd3c78d9e8190fa1c11262e8303d76c6ba95760c1dd1aa4a7d9cb8fbb2e4a8048a22737255e56927e0b09798237252b6cb4548afd97be4dbad1a3877
 MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/promu-0.1.0.ebuild b/dev-util/promu/promu-0.1.0.ebuild
index 6cefcabc0a9c..027fda9afb03 100644
--- a/dev-util/promu/promu-0.1.0.ebuild
+++ b/dev-util/promu/promu-0.1.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
@@ -7,7 +7,7 @@ inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="5e82f2f"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 0cddd1763cbf..c8ab4089c8fd 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,8 +1,5 @@
-AUX 1.8.1-Install-missing-public-header.patch 1815 BLAKE2B 08e95fe9e7df8e105e37075f3974b4caaecbb87a7c8e04935d0de652b0391563514e167c94b3ba5713e70a7e40ca4b483dc7d36e67250ba4b5cc21a6ddfa03f9 SHA512 fa54a14f1ac455ef9a8c502f473f9c45df955d515ea4ec1452f41e2e2d39c6a7e52c06d1178a228482dfbd2d66d0f202b066f55183bb1638d139dca708c879ad
 DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
-DIST qbs-src-1.8.1.tar.gz 1053395 BLAKE2B 1ec3840c206ec253779f016f9bdc2b806007cc0774442e2bf75a62c3148771fcf356d14c7743c1aefcbda0379f632ddaa309f48b7998387b8c37649fdf750d06 SHA512 2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
 EBUILD qbs-1.10.0.ebuild 2975 BLAKE2B 53d92b0f1a40adf3d8bbebf98353589fee3c8dbbd16b62d01a4fe9f76efb1e81a8dcc17c6ad42e467233fed37144809ed5682af722604af6f5987efece017f0f SHA512 f587fbc48e2ea72b76ec0c3a2b2ba3239f51d066c8d21d7540078ca3e589e297b8b63f7d1c8ecff69722db8e17639de0626887cef72708c1e0299d593f5620ae
-EBUILD qbs-1.8.1-r1.ebuild 2948 BLAKE2B 32953cfa42b8a2b6837aea78d947061aef87b2eaca941c11c0bb9b18b7768cb75eada3321cca478a81ed2300755e9df5d06dbde00184fc19c8cc6349116bcb5d SHA512 8ce928a55a420659ed73ae5f6e537f71059dfb6542bfcb0ed8f0253a62f6fc0d629a83bd8828113b76a565acdc78e05fb44a3362bb1bf912a91061b948c6457f
-EBUILD qbs-1.9.1.ebuild 2866 BLAKE2B c674362cb9994f9028b26a1f0d4446bb85f859b0d069215ff055e7db1eeec6faabc98eae2ecc66f4a422b8831a6425dd128fa1db2eed1c0e87acb5eb15204b1b SHA512 b81d2f56e10be6d34c67e0b2bb78161793a53cc1fe03e45df55fdfbcdc48d8f93b9750d6602569fee40d93124a19113d75234465b74e4f8f875c67831eca8a82
+EBUILD qbs-1.9.1.ebuild 2865 BLAKE2B a090c3f484cce5bc105d5e7078975f3f79af9264cf68abe8c3ff79d73741f7c8e9156b21770a87d3ffe9372834598e3444d9bbff1b592dc1ff5b5093cdd1a6ad SHA512 28df0a53335da532fcdc0585587d642abdf66207d74815421f60e1d04381ef2b6e2d64af6f425590ee928ff47c80ddfbb8039193c5895493b090d62baa0b3d9e
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
deleted file mode 100644
index 09aa6aec519e..000000000000
--- a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 10 Jul 2017 09:49:19 +0200
-Subject: [PATCH] Install missing public header
-
-Since commit 7ccc08f3, tools/version.h is needed by a public header.
-It must be installed.
-
-Change-Id: I79cb243463abb9390a581144467b3cd89f46eadd
-Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
----
- src/lib/corelib/corelib.qbs     | 2 +-
- src/lib/corelib/tools/tools.pri | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
-index 1b137925..6dd6f082 100644
---- a/src/lib/corelib/corelib.qbs
-+++ b/src/lib/corelib/corelib.qbs
-@@ -405,7 +405,6 @@ QbsLibrary {
-             "stlutils.h",
-             "toolchains.cpp",
-             "version.cpp",
--            "version.h",
-             "visualstudioversioninfo.cpp",
-             "visualstudioversioninfo.h",
-             "vsenvironmentdetector.cpp",
-@@ -435,6 +434,7 @@ QbsLibrary {
-             "settingsmodel.h",
-             "setupprojectparameters.h",
-             "toolchains.h",
-+            "version.h",
-         ]
-         qbs.install: qbsbuildconfig.installApiHeaders
-         qbs.installDir: headerInstallPrefix + "/tools"
-diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
-index 0fa91147..fb0c225b 100644
---- a/src/lib/corelib/tools/tools.pri
-+++ b/src/lib/corelib/tools/tools.pri
-@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
-         $$PWD/generatorpluginmanager.h \
-         $$PWD/installoptions.h \
-         $$PWD/setupprojectparameters.h \
--        $$PWD/toolchains.h
-+        $$PWD/toolchains.h \
-+        $$PWD/version.h
-     tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
-     INSTALLS += tools_headers
- }
--- 
-2.14.1
-
diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
deleted file mode 100644
index 4cad93eff2cb..000000000000
--- a/dev-util/qbs/qbs-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	# bug 625640
-	"${FILESDIR}/1.8.1-Install-missing-public-header.patch"
-)
-
-src_prepare() {
-	default
-
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
-
-	# skip several tests that fail and/or have additional deps
-	sed -i \
-		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
-		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
-		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
-		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	# requires jdk, fails, bug 585398
-	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
-	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${WORKDIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/qbs/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/qbs/qbs-1.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild
index 881b9a2b5bd7..cba25cda6a75 100644
--- a/dev-util/qbs/qbs-1.9.1.ebuild
+++ b/dev-util/qbs/qbs-1.9.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="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index da4b24ae5d83..b35dd8955b0c 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,3 +1,5 @@
 DIST RBTools-0.7.10.tar.gz 171957 BLAKE2B c92c02d2aa9598e063098316440b85842a2c31e5d32894c01b2345a49662b9f1091bb20077c6533c78618fc888f78f447f39580de64d4f48308e4c4aac5c6ecd SHA512 d4495cc73315e10d31d9b6c1517734fc58cc8b795a2d5eb32c9900b7108c57ad5b5f559e0fc7b13de0b00997f014a8f832183da46376f1480abaa5ebf5eb4866
+DIST RBTools-0.7.11.tar.gz 171777 BLAKE2B 67a0cf7d2f1e019a6b5b280a6448747037abb70d498c15b3bb2b0a415a1234e25e159929fc66484f56ad27acdbfe6bcf7bea9adb7042addbd96b88e4a9150ecc SHA512 ea02fbf02f7972d73a90097bc763549e54d130dc81e6325f0b65906d9e03819d4a9202b1e286a04bad5a17c2440b5e84fb9abe447f2b7717acc0f2c46de783cb
 EBUILD rbtools-0.7.10.ebuild 688 BLAKE2B 2769d766e8c88a8f736195a24e14db5be723a96ab9206ba7bf4ee88cdf8138439eabdf4766b75d486a53e904c45d4c00a50735ff3e3966e25d71afea70ab6778 SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118
+EBUILD rbtools-0.7.11.ebuild 690 BLAKE2B 46a716b5e53345deb3d75490445f149d35267f4b5ceeab7a1724372345abf69be67737ab30309e9c8910df2524bf0130849285474c5ddb7ca5b98a35fe669e72 SHA512 3258c7570e96d5d7ce8593232aca797766c0f0951a089533322be81a24dfd0b1c460464200985a45b13e2c48f5e2f9acdd4e1cf4546089d1b70a16e01cefc45e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/rbtools/rbtools-0.7.11.ebuild b/dev-util/rbtools/rbtools-0.7.11.ebuild
new file mode 100644
index 000000000000..94ddd77d3d6b
--- /dev/null
+++ b/dev-util/rbtools/rbtools-0.7.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="https://www.reviewboard.org/"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 7588ecda885e..b2f37051c851 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,7 +1,5 @@
-DIST ShellCheck-0.4.4.tar.gz 105979 BLAKE2B a2f875ae3642ffa6210533ad0c528242c190fc461f6bb19fcd68bb271c6066979083fbe1027a3fcd6db09871baea80f75db08fafa1d1a2db726cc18baca3964c SHA512 2b78f167932b2f7880ccb892fb89923a23eb5a885ba4d2ce892e14214ee4df0a86d4110af64ee49e45b39347dd140d6d6646ca34bc7bdb4ce3f6c9ec0e5960a8
-DIST ShellCheck-0.4.5.tar.gz 109721 BLAKE2B 4a8034fad6ffb5fcaa90fe42605191695423c02687a67610a850269d8ff87c63e127a2b3ff0e0ce0ccad5ab2d5d43d9c8c6616e863a40b74ec0da7f989e1ea6f SHA512 eb6e286de762e73f1916add169176d3347bc489504be848859c88acba93e02c4bfc7e75725fe3fcf041a7c2082a31f26245831126c8c9fb1b91e3e1ecd959ebc
 DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
-EBUILD shellcheck-0.4.4.ebuild 863 BLAKE2B c9b72a6ed1da86efa89a3899357a11a173e38cd831c9156bf77a24367ca8782d296d7139adcb3a5495ccc20e6c72ab4f9e36e3c6e003c640379025d2d03e0655 SHA512 7fb8f3028c5f941f04489316d6c0dfb729b3ea0f8ebb0af4110435407d3e47ea70020ea73b400ecd6d975f3d2505b95cbfa9ec61ef3b9cb56c22c561cc89bf1b
-EBUILD shellcheck-0.4.5.ebuild 859 BLAKE2B f156360db97b0dacbae9debc7f1faa6afe6d89521edcd1b39bab4ce79fea5bec6acfabfb8673283ff33bc56a2df67db1c132206e757c7f86157a06e50462762e SHA512 79c4d7593d9a0d29785a5ff94f94cbfe487cf47ec814e878b0d07004cb87f109a1ca6770c6f9291dcbf463ff9ef1527778948464f56fe82ed8fd58c85985bcf7
+DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
+EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.4.4.ebuild b/dev-util/shellcheck/shellcheck-0.4.4.ebuild
deleted file mode 100644
index 22146ef9d1cb..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.4.5.ebuild b/dev-util/shellcheck/shellcheck-0.4.5.ebuild
deleted file mode 100644
index 19f437b98c86..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.4.7.ebuild b/dev-util/shellcheck/shellcheck-0.4.7.ebuild
new file mode 100644
index 000000000000..78dd5b5e1aab
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.4.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/json:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/staruml-bin/Manifest b/dev-util/staruml-bin/Manifest
index 8b642c69c316..6f7fe869d859 100644
--- a/dev-util/staruml-bin/Manifest
+++ b/dev-util/staruml-bin/Manifest
@@ -1,4 +1,4 @@
-DIST StarUML-v2.8.0-32-bit.deb 41749126 BLAKE2B bc65671d376ef204fb04b83e4c0f1b807f267081e42cd66e4c5a84cf2aea6431b44c1877416036325932475fd2046abac36b4c21ce8a5aa16b42fe13da6dc206 SHA512 e6baae6ee6202a682b3aa3b570a8899378dc5e8ac21613ca940268ce7758c51216d7e8ea6a8e317b50f1d96bef26bfbdaeef7b323991c7f1dc4af10f050ce693
-DIST StarUML-v2.8.0-64-bit.deb 43585506 BLAKE2B b221f07f261ef6aadee13c6c26753ff9699328e91ea0360b5e29eabf2e30642572378cb10d28b1bcc840b30b76044a86a9a171d3a4c7d84487abbf924f37068d SHA512 faadb8971386a7cd6c6d5a9cb37772ece9f7f92fbb756d1e7d4203c1ba5874e36afa46402697eb0d4246af60c114e8957789b1f75034dbea9badf7e63001f010
-EBUILD staruml-bin-2.8.0.ebuild 1241 BLAKE2B 6270a8f7be6d1ffc262e5b0b5ddf04ed74c75809865f90f7717229517d28b737b729558c2d5f7b06cbc4874caf8b7fdfbf74baa84c8d639503d6b6542b3739d0 SHA512 44efb4ffdc96c57c3acfbb53471300e4a5ca3e8f4063a99c474e4b5e4dda634e273f33c7cff1fbbe2ce45c8ecb587b6a3989d175241b06b2c591366c8f3b626d
+DIST StarUML-v2.8.1-32-bit.deb 41755234 BLAKE2B 2963a3bd90d49aab3e62c94446d7d6fa113b54a7bec712f5ebb3cd97d4cee76b31a4229a9054ef993c55076244003d36fcd0e59f9b4bf3dd53c30922a1b54050 SHA512 c91251574c8b815e02eee63d616bb821178e3b1494e18accad74bd299e5321425f21435731dca3518aa57369788d6cde59dc2287f789701459242d55a92d5f29
+DIST StarUML-v2.8.1-64-bit.deb 43609354 BLAKE2B f0cbfb16ef36a7ff010a04f2919c7a9035dcddf98e1229e67dcb1e3321b1552baddb3edd26503b8ffa5442b0379a89f17ab9b4cd595b65c5d3730fa734403278 SHA512 97c2a33f437c043b5f236ec304a8329dfcf931f69080bb7e47ec1d9e881fe1bcac0f8a0497ad3f8d11dc4c17a887023f46edfa17a612c1a5a6785f3a580070f5
+EBUILD staruml-bin-2.8.1.ebuild 1241 BLAKE2B cfdbb6ade41d75bfdd74883e959232b544269edc447ab88bb1e5e5afc211fa6e56acaa533f444fe3bcd0976e9e29f47efd4775e25428bf9d7d38afddcf325666 SHA512 8068cc89d452d03fd411fdc6b07713da3af646c333d6a7ce685a469ddb1411ec685da26ab05e8b531513f4250a6144f5e65eb3ef81420e6988ac23f126772b2b
 MISC metadata.xml 383 BLAKE2B f3b107fa01c2b2424847e376abf1ab653cab845eedc35dd34f0613a47c513e71450c7ebcb6a42f68be6ce9002703b584f9e40fb19e6272a872430029501752be SHA512 43b9dc9d256d23f9fe81341771dfb4ad64776552c44ebbe3333f8b3136e9e37d0db4b90d0a2d962149f84e93a4fdc43ca0f65e955bbd7b2da9b41975a8849644
diff --git a/dev-util/staruml-bin/staruml-bin-2.8.0.ebuild b/dev-util/staruml-bin/staruml-bin-2.8.0.ebuild
deleted file mode 100644
index 6961a4594d22..000000000000
--- a/dev-util/staruml-bin/staruml-bin-2.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker
-
-DESCRIPTION="A sophisticated software modeler"
-HOMEPAGE="http://staruml.io/"
-SRC_URI="
-	amd64? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-64-bit.deb )
-	x86? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-32-bit.deb )
-"
-
-LICENSE="StarUML-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror splitdebug"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libgcrypt:11
-	dev-libs/nss
-	dev-libs/nspr
-	gnome-base/gconf
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/pango
-	virtual/libudev
-"
-
-S="${WORKDIR}"
-QA_PREBUILT="opt/staruml/Brackets-node opt/staruml/StarUML"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-MY_PN=${PN/-bin/}
-src_install() {
-	mv opt "${ED}" || die
-	dosym /usr/lib/libudev.so /opt/${MY_PN}/libudev.so.0
-	dosym /opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
-	newdoc usr/share/doc/${MY_PN}/copyright LICENSE
-}
diff --git a/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild b/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
new file mode 100644
index 000000000000..e554b4a392e7
--- /dev/null
+++ b/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DESCRIPTION="A sophisticated software modeler"
+HOMEPAGE="http://staruml.io/"
+SRC_URI="
+	amd64? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-64-bit.deb )
+	x86? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-32-bit.deb )
+"
+
+LICENSE="StarUML-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror splitdebug"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libgcrypt:11
+	dev-libs/nss
+	dev-libs/nspr
+	gnome-base/gconf
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/alsa-lib
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/pango
+	virtual/libudev
+"
+
+S="${WORKDIR}"
+QA_PREBUILT="opt/staruml/Brackets-node opt/staruml/StarUML"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+MY_PN=${PN/-bin/}
+src_install() {
+	mv opt "${ED}" || die
+	dosym /usr/lib/libudev.so /opt/${MY_PN}/libudev.so.0
+	dosym /opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
+	newdoc usr/share/doc/${MY_PN}/copyright LICENSE
+}
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index 7c68ba2eddfe..6b0370579395 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,5 +1,5 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
-EBUILD unifdef-2.10.ebuild 564 BLAKE2B c382ce168dd04b8fea6fefb3516f0df560712a215263b16b06c12f6fcffb20d2c6769cff52d3a18835f2f9ca025956c8a0c35131e625d44a6309bea56335a097 SHA512 435812ff5d0832b094bdab063614fe4c992201e6507e6d6c8be0101d1a1a7a2af582a7544a8df5d0c69bda0de79db6bd471f799d45707f536653e9d5e8ca4641
-EBUILD unifdef-2.11.ebuild 586 BLAKE2B b8a59d788c51e1bdc25acb626e3de122704d0194a4009e8999d7f4537e19a2e4632b8e9221f6effd3e65d47011a4110e3ee7993f3a64d5201f8855de4e4fdd43 SHA512 81d896841419e609ec28bd53958fa313443a407c3f273a6182ddd49e67ed5ed064ba8dd616dc4df398f2a0d488f7352f42e6e49c8c9ec33b201204a57ed094d8
+EBUILD unifdef-2.10.ebuild 552 BLAKE2B 8c99246187b5c3e90cbbfc450083fff6b3770c1551d3fd04e7d2b65edd17b4f7cc0e4005aecb271838e9fcbfbf781f070d3e9237016df3d9a74cb06158cbde55 SHA512 8d3fc896dded85e9e2ac52376e8fee4fae726b403332d7af6e3750771c547cdc914adac25ccff906c474367d9a170ed913487df4690588d36a9dee5fcf8e11c4
+EBUILD unifdef-2.11.ebuild 574 BLAKE2B b7f2c61dc7a1c1deffcd2c24b065f6556a97dd92db37f9d91b55807dea70b7f77167638a9d288bcac156702f49be248cc35521e416e8c850fba5f98f389f77c8 SHA512 f815b777dd8aaec261bd19e3da43527c13314c8355bd25441f2b638f035eebadb51ac9dbd26dae309dc6d6061479d81ce28e92bd53dd5fdc9226c70b56dd63a7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 784d2244c3b1..c552129e314f 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.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=4
@@ -10,7 +10,7 @@ SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index f28f46c74f52..6eddb8283ecf 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-2.11.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
@@ -10,7 +10,7 @@ SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 9af211e42a71..8a3fc93ce3cc 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.13.tar.gz 91599 BLAKE2B 7cc9a6aca8cbd259d3ff79659c38e3d51b5f0ba75a7485872fd922543d75867fcc1689b0f7f8915e3195905b47bb0a467d9646bcb29082e9c04a1557e19b3717 SHA512 ef0b811df0250899e23e30ee4b240cf8b54e510231353ca86202661fd5f0826b9faeacc9268849e51bd6a1c71c1514498dec04a7a4ed79f00a5098811525e3d4
-DIST vint-0.3.17.tar.gz 95358 BLAKE2B 102840bc2311148af5c20499c65417459d1abcdcaae0b95bd0bbb3e1569f98f0f0abb30ccae653aff844750efa340fc38a0f8905ee70b3aec8fdc5a8fcc0a6f6 SHA512 c3df61d47b4adf68ecfb8903ea0c030acbba3e72ce95514ef25823a5321181ebbf783c1a76613de9927acefb088edd890a0a776b40888cca62b2063e436820e6
+DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 EBUILD vint-0.3.13-r1.ebuild 1286 BLAKE2B a7c10f97ad9a9e03860ff03e78d38e9dc3b8b44fca91b7a4f05c1a80b96917cff3607040f3e45479bbbfbd08d8d61967e8d831bbca6aa464bf4ddd1718050517 SHA512 97029069852754b6a87fe81f3fe79166ede0a34481f1110a4a1dcd7c69e4f319759f41f7e4d1e8312d81ffe5decf90a0a715f1dd36698419c05bba3c107a2cd0
-EBUILD vint-0.3.17.ebuild 1327 BLAKE2B 17167817907a28122568ae874b3b4289aa10a2ce8a7753062d0f095fddaacd3fbf46dd91e9f2178f0bf6936d6500379f160021a6f462c6f967a0146122d3b329 SHA512 8d27cbad3f6fe0faff91c7db523c2c775c0de49417cb7582b7ff3b50a62ac222a84d71d752bf478dc9c4197aaec3c3f67671af7e61c60a44d005e2a091750797
+EBUILD vint-0.3.18.ebuild 1327 BLAKE2B 07db1c17ce7d947d6877f4cff87c810cf8149a9c8a4320695b547abd60bb3993d62e9c11f74bea6fec38633dc01c491a83ad99365ed1cdff9ca25dc0dd5c432f SHA512 712bc373397763c714c50bf06553fb57139007af6aab4aa33eb80afa249cbf06042e8961c18ea2b7fffd81d4afa7fb29a68a7b292818d9ff70a649c0aa111952
 MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
diff --git a/dev-util/vint/vint-0.3.17.ebuild b/dev-util/vint/vint-0.3.17.ebuild
deleted file mode 100644
index e24dcd2fab20..000000000000
--- a/dev-util/vint/vint-0.3.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lint tool for Vim script language"
-HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/"
-SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Don't try to use an installed vint executable.
-	# See https://github.com/Kuniwak/vint/issues/22
-	sed -i -e "s|'vint'|'bin/vint'|" test/acceptance/test_cli{,_vital}.py || die
-}
-
-python_test() {
-	py.test -v || die "Test suite failed with ${EPYTHON}"
-}
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
new file mode 100644
index 000000000000..00895d88442f
--- /dev/null
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lint tool for Vim script language"
+HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/"
+SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Don't try to use an installed vint executable.
+	# See https://github.com/Kuniwak/vint/issues/22
+	sed -i -e "s|'vint'|'bin/vint'|" test/acceptance/test_cli{,_vital}.py || die
+}
+
+python_test() {
+	py.test -v || die "Test suite failed with ${EPYTHON}"
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c2c9405e202b..fbd902c0072f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index fc18897073b6..1e374d54b99b 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,6 +21,6 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r11.ebuild 3007 BLAKE2B 210cf09bd7e860c202ebfb1478f5373bfe65c7bf8cf3b44249e3caffe440e28508cd2e5adc00f32cdb28fe158924cd5234a1bd4d87c91c202683ae1b242c3042 SHA512 d7c9875e3990bea839ad68c5d3620dd4762841386554a52543c9cd36206e393f08ee277514cd48aaa6d1bd370b6abf77434d80364c6897029cfee6d6485bca00
-EBUILD cvs-1.12.12-r12.ebuild 3003 BLAKE2B 4dd68db1fa0149a28c983c116d69bc344bbe3f1dda3da5c0e59eb80b5a42672ea7d92705bbcb52028ff3f339fa3b18cf0afd132a5d6aeed9d2e42a1ef1a09767 SHA512 13379d493918e3ecb1788b73de23379e5e408597ebdd8657ef99c5181d54f69d1008012bffe9924095683ba200db128cb70fe24a294c31b38d7e98e09c362851
+EBUILD cvs-1.12.12-r11.ebuild 2995 BLAKE2B ad5bf94a3039b07f6c32a14e8ff99feb209c1e4ccaa6ad922cd8f93ec705594b1fdd7e18d697897ea994898acda877b63c38dea149d7f919f7a1416621d3257a SHA512 51ac321b9d9d1cbb4a7ee8fd46e36c1f5a13559e3f9fe0a42310748fc6c4f5c1348caef72a45d6ac1fafff468fcb9ff6aa13bb2283a6ac07afeac891b8e2d09f
+EBUILD cvs-1.12.12-r12.ebuild 2991 BLAKE2B 162a13b74e621a943a441a0d40de0453737c621251f7675210e0cb54815edb288e2d26b19e8b816dc280da307cd400ee4bab62d98727ab1d8fabfeafe5b01d91 SHA512 d183c00cd4ed5249a6190b6e176adf24abb5e6a34d0a8df04c233baa3c82e6dcd77a718061b2e7cc0371481a7ec910fc399e570ddeac5a89a6fc3c99c3d12306
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
index 415a2fa36d27..0688f5bfeeef 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r11.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index fedc3d363758..2683223b594b 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 7e21578a7250..6eb935e518d1 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -5,7 +5,7 @@ AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a82
 DIST cvsps-2.1.tar.gz 61634 BLAKE2B 32bf53c574ac8e7937ff14aee5a229e1bb2b4f0ddd4360d0b8d57a5d0fd5c6f683897140e235cdd6ab85e94f3977298fd38e8187db08529f8a8d814a4a8070a8 SHA512 8ba703fc4dd1c7a8201f4cefec533a6e228943f53f5380d8d17107718d8cb607c861a733d7ad1d6ed9288c4dbeae9fd59ceaf52172f16885a00d000a667e0e38
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.1-r1.ebuild 937 BLAKE2B 4ff859b37d9480b78a7e260679d30098e6d460482c2f53757b99d45e13dee698532485653e1064ec5400dffcf978ede03045fdac84552ddb0e442eb16d473c05 SHA512 70d4586291b8530c6c8e4f32938846fe9d2434cf8244a4fd335dde9effddb18b586c00f16017e2585651c004fa31ada33f2b4ac95587fe5efda0665be0df7cec
-EBUILD cvsps-2.2_beta1.ebuild 958 BLAKE2B 2706329d6c0e7f8d8333b252b28740f542acc9c4ec62a49fa4351043debc9357445b671ae7469f8efb3ac633501eed79b594283177a548e38e03933e00ad6f5f SHA512 f80b8948df6bbefe985734a2d25f4c6d53f9ea646f323bf3686f0e5ec27309e85c498b13020835076c6a26b4af6f30f031c52de078a076e84f53fe72958bd803
-EBUILD cvsps-3.13-r1.ebuild 1039 BLAKE2B d0333c9d15e9b070b0c1f66456b53418a99a8720be908b950be08ff1856571007e8278e58eba6136549a0fdaad1687d8c0a680552e4b61d4765b8aad40c895f8 SHA512 7ec4f75a65fa76e699edb9950f0102749cac5789c04f9a03da24a6cf72e2330ef563ecdad60c543ecf8509aa8f79eaafd639d7e2edd3d104bd0bed9a9c0f8c0e
+EBUILD cvsps-2.1-r1.ebuild 925 BLAKE2B c208fced3a73bd707b2075c2de9df9aa67e4ac2e1e17bfb8dc78d4b66d3d8f7a4fd1cbcda5683a3ac0c887eeb5dbd6734eed256b917ce96c70e44deedff32cdd SHA512 8d75302c2bfa37d3dbeac828f82894149c2624337c3b68e72b7bcbbb4291672784fdcc6e1e5b9f84ede76fe6b4dd217b6d804cace2d6f804e9809b37f826fea6
+EBUILD cvsps-2.2_beta1.ebuild 946 BLAKE2B 477bba801f33dba9727c712b9a85cfe9f0cdcf32f6d2b6f000d3383e3b45cf0e9750b94b462f9add42b493901174e417b9941dcd3c7e3030b0bf1dd332930049 SHA512 28354f7290690857d6fc7133d708072efa98ba9ec5991318bf3a5d5fcb31bcd1a474479efcd70f808360ce9faf123ece7eedc24462cd459c667b2e57fe532c87
+EBUILD cvsps-3.13-r1.ebuild 1027 BLAKE2B fb4b806cdddcc4ada6506c47ff5896ca9125e4650a3f62e059285bc576c2560485d686e7ddd78b67f1fbda5c67cc3a95419be81cba28c48ce149adbffb608604 SHA512 7a1388399b823b4582dd36fa178ca802042b13a955f1528e71e7521e6430b136b098f560c7af1b550f0f31fed735c8a2a3980507d66a8a05f3eefce90078279e
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
index 1b0d6215d688..fd8222be9f86 100644
--- a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.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
 
 inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
index 4b5260759586..6a49d259752c 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.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"
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
index 986c1aeef865..dd9a9f993277 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 9f6fa1a9f74c..1cad6bff9ce9 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,7 +1,3 @@
-DIST fossil-src-1.35.tar.gz 4642421 BLAKE2B 475b8d59876b824f2c2987c584aa9851b1d36ef7681a23bda904e5fcfe12861ca0f410bd5ad363d640c71aa54e2aeacec1a17169262b9ed17ee9e12e6c1aca7e SHA512 2a31530d81a316b69daba446e91236fdb94ced17a7228c094fc6053f9d75e736b6a50a93d97b8e875a4750fa4ff868b0dc78b494131b8ed118d160fff8995905
-DIST fossil-src-2.3.tar.gz 4898441 BLAKE2B b4b49113a24e4ebcce1c0c191b6b867b479561764c720af678d8871ed2d74aea0e061f61edd2e730986342ae8267d2f66e49565c98828460c490123d383e9779 SHA512 41f87a9f79b87895b1972d2866b27205da34076eb35200b60fd38f1921162bf9099a71caac4063c04b919484208b39c7184dff661dc0b5ca7716d8edd11462cc
 DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
-EBUILD fossil-1.35.ebuild 1280 BLAKE2B 52aac85acf13a09ebbf293d6cddc4d1815850c41e61716f331cc7033e1809a203ec3c30a134b9a90d397658716ca423b2346c07cb9ab316fa7a0bfb0a73217c6 SHA512 676cb1621623705b4af679afa003814518a62b303d51f8ec8dcb01b9e13a8d4a9a98921ec4352e6190551d0826a0f2a839048e275bb2d3ffcd08a2345122170d
-EBUILD fossil-2.3.ebuild 1411 BLAKE2B c052fc11027519bcd30b94aabfe2011fdfd0cddf9f61b0ce85d2018d776475b62c42c44ceabd3675028e43f2c2885e917d83cf84216eaba0b125d5338a037ec5 SHA512 dfa53e88eab5f66b1a0ca804d4e5f01c1dded2df7f70168654e8610fc52516a2322d9e01aeec274ebb67080f99dd96705fe76b74ef85795052bb40ba8d51a7ad
-EBUILD fossil-2.4.ebuild 1489 BLAKE2B 91c07f327105685a81a97210135adf120bf4573e05be9e81d2f866ffd6585d761edaa2353570503a702ae453e547e12b57bc038aaac0689c6969a89ba6bff773 SHA512 f2788d37292adcf3d0a908742055fef863d64af50d616956c64dbacbf98e0e888963e665881bb5664109aaea50755cdfc0425ba8468a5a1173196212392b9ce5
+EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
 MISC metadata.xml 1208 BLAKE2B c1456c3215431a9e787c81a58aa07c60818be4ece4131effd64ee9321c9d6fff9489c29a60d9092a126f8cab37641125baf747befbf5bb0004c7425861eab78f SHA512 e7debd6c174169ff43fb94c5813c7b6713fd2417b25e435b2fa875d68a41bf1ae1e60033d3c026f817b70059b7975275563c43b94f3dde2ec844c7010c57c0ec
diff --git a/dev-vcs/fossil/fossil-1.35.ebuild b/dev-vcs/fossil/fossil-1.35.ebuild
deleted file mode 100644
index 9e81c0a7483e..000000000000
--- a/dev-vcs/fossil/fossil-1.35.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-src-${PV}
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug && myconf+=' --fossil-debug'
-	use json   && myconf+=' --json'
-	use sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.3.ebuild b/dev-vcs/fossil/fossil-2.3.ebuild
deleted file mode 100644
index ff869df46b88..000000000000
--- a/dev-vcs/fossil/fossil-2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug fusefs json legacy-mv-rm -miniz system-sqlite +ssl static tcl th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.20.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug && myconf+=' --fossil-debug'
-	use json   && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
index e1925ab383a7..cd6f4caf4918 100644
--- a/dev-vcs/fossil/fossil-2.4.ebuild
+++ b/dev-vcs/fossil/fossil-2.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
 	  tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 57feaa4f117b..079803b070a0 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -3,8 +3,8 @@ AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8
 DIST git-tools-2015_p20151225.tar.gz 12635 BLAKE2B c5414307d0db6975034f6a04b007fc5872e4af9a46cd398b3a0675470cf3f4fc328539f2907faf5e75a36570e3d2131ef7a8023a981e05df8ff671b68f07480c SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0
 DIST git-tools-2015_p20160201.tar.gz 12702 BLAKE2B 14c77495f66190c18362e889d3f7a0254c3c09da2524ee8cb9717db3437e834418f0c92bee5fdcad11bb65a40524163e651af5dcdc454ce06b1f7d7e9ab33fc1 SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995
 DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
-EBUILD git-tools-2015_p20151225-r2.ebuild 1437 BLAKE2B e7cc180a2ec3413a3feba3853f7b261b5bd20026d23db6aa41933118d2b904757cb721c7ddfb866b22e2762ed6c772c46284c4a13fd597f599bc24a724d83b06 SHA512 3068af4da8b476049f014221858cb2a7b7e6c7edf914804e48f82e4e84a1aa0db4afcdd50172cd5f98b9d377f3f920e0284bdc9010c6c64d326353a8f578382f
-EBUILD git-tools-2015_p20160201-r1.ebuild 1495 BLAKE2B a61d068904a3e61674ce306adceca29821381b68337337ee5be4c7c7367bbe61d9c45367c27a1ac894473c0924f74ff27fd4c5b69a26f211fa43dc8e8158c7d4 SHA512 377fed838758fd267e7f3071360359a89cda3a486c674a08e8b9573a5cc0c4042e4fb2efdfbf181b31d81c7deb6b81d5a2559984235f37a769642e09fb1754a0
-EBUILD git-tools-2015_p20160201.ebuild 1438 BLAKE2B 48c9b82d837e1dfb1c9a6eac246a8c83fc151174e01d743537667132a7af379c0dfdf12f60b99d0e318b2c9a3302485bbbd7f91967572f646ea00f5ddaa6ff8d SHA512 2c16dfd268a6efbc34ee9a99282348258600fcd0f717a3681b7d0137e702238060314a3206b7f63bf6ef12218a53a473b4a08ce18ca30e9d72352c63874be5ec
-EBUILD git-tools-2017.10.ebuild 1002 BLAKE2B cdbdf22b6c9317f4a18d8b73e0e10a7663230cf18025d0712c5ebbbcb363a3a5f8942825adc2f0575d0fc66efd56864c4d2d4c8c1602328bea616db0d88b6d5d SHA512 e8ac21dce882f0b6d778241f6b6fce9e2bb7e25c9b67e249dafb65cb81ca8874f49123b91343abe053c3888dc30dba4cfd11e7c095f57dfed1b5ece61392ca69
+EBUILD git-tools-2015_p20151225-r2.ebuild 1425 BLAKE2B 7d7f36d88a6197b8a7bbd122ee48fab05d8bf19a96b8c6218567ebf61ff4858683d3a6d6a63501f92b5b8691b6ab9d0557121bc923ab2d19349b7537472d7f2c SHA512 cfecf4797c7cef63909a73d0d9882f77093841146b43d3dc8562ff13ceae1a307deb421452ea6cb2de16dcba4aee9af738bea62e64e9ae58f5daaa4ddecaec69
+EBUILD git-tools-2015_p20160201-r1.ebuild 1483 BLAKE2B 0880c63cb63d1cb998078664f6e429564489a5e4e8e955d5b184a4691caf792dd4a2f5877dd8bdfe4af52a44a06d45ea8cee1938abd49a940cefb89e2c327d17 SHA512 9a82bd81eabd0b321a7e6f9e50d7d4c118c2ae3d4f0889ae47d28799c9eac6268ccc958047609c89f36190040c163511d1145255ac99cd9e52ce65f8f36bdfa9
+EBUILD git-tools-2015_p20160201.ebuild 1426 BLAKE2B 6a61da4cd5cd83b632d48544f6c1a73a1e9a3ea159ef66cad1b5c0e00694d7152300d9cb1b91e186f2b5d61631904ba9ea0432026e2c77bfb430e28bdeb7a316 SHA512 e2c5983254f9c4b25924fc57c7b5de44acb51d787fb913fd2b97ec7c9c42857a67ab3b5fe79da26697cc990e9c311b59c8121b83ae97895d750bbc887a28f2a4
+EBUILD git-tools-2017.10.ebuild 990 BLAKE2B 5a79acf90c49ced38457e3da6cc6fa02176121e92570865276484f2016823511eee32f32d5df9d4e4b4ec538ade31041291c9e026b8ff97b63f55b7e5f81372d SHA512 da803ca684574a8c4ed7897b8cc848fc3ea521d97a5074dc48644d79dfb20da52d9d923f7ce5ce312d58a6300be3c7c76354b53950ff8da37b259a7b4195186a
 MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
index 89fae4dd6d1a..f99994408b46 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20151225-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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
index 3111a50cea5d..9eab3cbf380e 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
index 41ab4ece6c17..da7ffa5eede6 100644
--- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201.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="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
index a5ac828c614e..22bb3d5f5880 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.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/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f65d58ebbf02..9dab928f40e4 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -15,20 +15,24 @@ DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebed
 DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
 DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
 DIST git-2.16.0.tar.xz 4961856 BLAKE2B 5e7e3476de93f718c85750a39ab0923b41ca573708c4bd82af37577c2cb6067c4a989b50262f04c34d2594ec51a47b3c80394ab7910b9a47bb1aa1ca09cdd1d3 SHA512 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812
+DIST git-2.16.1.tar.xz 4961656 BLAKE2B d94328da5d027cb82f1f23804a12dfc5df1577bf2c28cc376d4bb5c9e34d317886437f7eee2ac4503b8e2639d2e24c35660ab82a50207f500b7ed6fb104d3624 SHA512 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a
 DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
 DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
 DIST git-htmldocs-2.16.0.tar.xz 1159956 BLAKE2B eb38d27ce2de42b18971afbabfef8f6527e3c330cbe841dd0c6f35e821974cc6c6c432e8a55cec19413224b597cd3e37e56ddd039161811cb90809d72a170c99 SHA512 bfc501adb325b8111e327359fe1b7f788f6c6fa459ec2895c2bfc7ab9d794c59eac314504b2336da9d69b6ae6121764e693e8417a26ab5f12cdd485770f88707
+DIST git-htmldocs-2.16.1.tar.xz 1160372 BLAKE2B d426fbc85772e5f04550071dea50a75e6d581fd040e8b37b3b342a8d6569d0dcf456445bab1dec3d84e254e82468c900afff7c6be1ebd6771e7fad5884b92515 SHA512 f2bb8b88ab5aa3d6204874aae583249d5137193c5fe3925df7ae1bcdaec0564b496df9a648c180bebb0c8ff4573f27e330802020d3c9207c2738ddd5c52d99c9
 DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
 DIST git-manpages-2.16.0.tar.xz 417192 BLAKE2B 43369365cd9c25035d863057aff3909aada3ceac59599132aefc4d7e26933e747c568140fad957822f8a1ef1d3e370dfdaeadbdee12e0e254dbab02888714446 SHA512 00b08b1a3a33af2dd4550225ee03e6efe12eee554f78257cdfd20af7cded64ac11879032384f0ec987c1dc04d18b3007319de9a02fdba183c92cdc382e23e139
-EBUILD git-2.13.6.ebuild 18885 BLAKE2B 097dc3192b7f71372eb3c001bf8aaa9f86b5d3f0479087c7daeaa13fcb77acb987463a565bc394e0aaa3014c72726e6364fc138ede07abf77062561711db80a0 SHA512 931fe26d4f73ac6ffb7794f913581041768dd0db0ec142640c8b2470b92adfd6198919e148e9675151cc1d67b1753c4259089afb6ebda8ea26a8733d8c2631dd
-EBUILD git-2.14.3.ebuild 19363 BLAKE2B 7b06642fe92fa81859c400ba03c2c3ff97ea99d57451510e7597bfc9d94e0259aa465bd6165a0940534eb175cee49217d76b7869feb9065a4a900edc6244b67c SHA512 a315292faf871312cfcd89b702a1c1449461fbb02c63746c24344bfba1ce94b4bb078f133d09655b6298b0b41c9f9007675508d7db194b2b6f55fa90e789de84
-EBUILD git-2.15.1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-2.16.0.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999-r3.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
-EBUILD git-9999.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+DIST git-manpages-2.16.1.tar.xz 417188 BLAKE2B 239fb33967d17c8b10efb2e0d1963f7be3404b7f262b49f89b3f4a538135d80268fbe7fe0e561c9cb2d86840eb46b61653ed363d8da27d1169c435d8e1d5e851 SHA512 20c7646b5f1e3c633ce6aae5ee5fcbe4ca1e59fc9253ec9a9e45c7cd8a8ac7a5e71e36258eb747e3bd6d51b3b7971137315dcdbdff493e0f8774ecd3e309735a
+EBUILD git-2.13.6.ebuild 18873 BLAKE2B fcfadcf919089dcf671c4a24e5b54899a885324bfba40296b8092f4c65dd82b76f4b22928c281caf4cda79cd15bda0f5a955ef6d3332f7efaa38e1a8de42a495 SHA512 f766ef1934a15dbc3008af5b7c505c4b0f8baeaf34fe8f04a0512bb9f3f89ca86df090a66c08c4cddf59d014403f9a24b72e8df66770843fad77d791d460c8a4
+EBUILD git-2.14.3.ebuild 19351 BLAKE2B 2ec4929e180ddf213ae5deb0c5d17f75a79385a8e0538e42964c20ed8ed0bee03656caead8f208948323b9d4f36c1f33431738b704d0e7f42cf8c153aeae030c SHA512 48473d28e68c39280729782a349b8fb961a8a2884afdc1eed9e25cf6da175ab4fc4d5bd9ed9b23e191b314dd0edb52a973e98ac2e057f04577af454fb351c443
+EBUILD git-2.15.1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-2.16.0.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-2.16.1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-9999-r1.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-9999-r2.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-9999-r3.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
+EBUILD git-9999.ebuild 19354 BLAKE2B e7ac05e2fb0bbc912b277e3be45767b59f22783bc5c4593c9cfc3dcce95a62b945e51e5c836a75de0b0c54b61e76db13b781da3c3f85d8e2a30c7f28ef0b318b SHA512 6cec84b79f870f6a6bb671947865124bb1714cd03be233c2e87e120ca7bcd19283ed32c4830a936133cedffbf1a7b2e0eebe3c63db41d4192725e9385e1005c6
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 3f4dab26bde8..2983583a5a36 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index fde79e887f8a..e5c4ab4671a6 100644
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.16.0.ebuild b/dev-vcs/git/git-2.16.0.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-2.16.0.ebuild
+++ b/dev-vcs/git/git-2.16.0.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
new file mode 100644
index 000000000000..38599e3b1c29
--- /dev/null
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -0,0 +1,696 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+		myopts+=" HAVE_CLOCK_MONOTONIC=1"
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=" HAVE_GETDELIM=1"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled="t9128-git-svn-cmd-branch.sh"
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index d3e89d0092f7..38599e3b1c29 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 0a3a09dbd82a..70f0f30d1653 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,7 +1,5 @@
 DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32
-DIST hg-git-0.8.5.tar.gz 96675 BLAKE2B b40b031754a6e5e5c5f954b6f17904eb4456a709bc4e10dec47af8cbe0665f80e0b661f029873ba99b60e04e8831519840119be21aebcd728d97147929b8a009 SHA512 f03c118b58c1ba4cb34ba8c953c7b1d57207548cd613d1f9f716691cbd131008b802ef21baee484881c72318f46c78b946c2d3fa77ebf5efb3ab0b7e1b9d4ca2
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
 EBUILD hg-git-0.8.10.ebuild 710 BLAKE2B f25d6c95473260e35cbf9de15438bee4ddd3bfbe11cbdc7ad92107a37b422425dc2416fc4a1a0a98ad0d4c0c0a11a2cf5a0d5e259d89232a30920d8d29d1f50a SHA512 6c2dc7d32d9e2c1473cf139d663c864739c563918765006bf32e2b778aa3db1dcd317faf3053b95c7bb34542536dc90813eb4bbcfc83569e5dab1907e10f7e7d
-EBUILD hg-git-0.8.5.ebuild 746 BLAKE2B 6e1f58d9d19bdcef2145733a300d7f71943aa33ad33c84551eb0ed51822b2bb421172562c749c67c1817a46f54a8359e7501a36217239b177d3a59f0cc4cfe71 SHA512 84cd665f482d0e7cf2217f9822646cd532dce89053cbee562783c81bdb160c07950301e58c273744747ef0ea128e7eb4b6c92e44be076308237196e37a968166
 EBUILD hg-git-0.8.8.ebuild 701 BLAKE2B f2e08830007b605d2a9f0e9eab8e3744445f8bb2d35759d5381a194f5a829cec4470e76bd4f87d86568d19ecf13c2d5dfdef46a20f3fb3ac52fa529e3de423e2 SHA512 021f0208a2ffbf06f32cb3fbbff682015d5c7a4ca56577eb87ced69eaec176b3bd9ac746f2c5c40bd1edbf84cd839127785c4769b0df2aa35e14266f7ac85ebf
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.8.5.ebuild b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
deleted file mode 100644
index 639c573a4194..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
-	<=dev-vcs/mercurial-4.1.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index e15ce5a506be..a81e152d1481 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,14 +1,10 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
-DIST mercurial-3.8.4.tar.gz 4775341 BLAKE2B ea43b2e6c630f5d6293c40b0cf28ce66293d26ed892a79de9e0e35c381c1c0094a912fac1c13c700655bdff3cb885da3bbc7348b7cc0775c2fc69211c5b38ea9 SHA512 2ee785f631f9ae346e10ca77251a9ce6d3dacd598588c39f1a69ce1f4b668866f6109d682428512c37c300b26741b74672195538d66845e85cfff5ead886cf4c
-DIST mercurial-4.1.3.tar.gz 5134965 BLAKE2B 93d4d72160e28f77ff8c2833ec0f5ea5adc47eb1cd2d8b2383f3eccbd2e4c65e595ed8dfa6f2133e50e3f39a3c14902628a98eb3bc81bfb1d981eb668a75bc23 SHA512 794c513b7e061bc56d270ef57adc0fadeffd5bcc988da0934b24db686b76bf573aef2bbaa3baa9220f31463795bc6e6a99fc1284ebcf8d7e49f42b8129347811
 DIST mercurial-4.3.3.tar.gz 5491634 BLAKE2B becfe01fb52af6047d570d2b8a674204f5e698bf42c2a3ff46298de40112ace3c367012eabdfc3ac4257e1618a513a75ff27b75050ecbd7f796e847715c95f70 SHA512 2d5249b6b2ec6b21c548702af2cf6b8e0858197a370514465aa7a880391f2e9efd6aecefb67fc547dfb8759c1c678009dc5a33fc48743bee30fcbdd853ee1cc6
 DIST mercurial-4.3.tar.gz 5469979 BLAKE2B 5a0df1bce4b3343a9101b634aed44c7ab3af5ed9a07883b20f87829bedd5abdae92b476a3d108a9ccf093dad18f7c82b36d5d6a6622346e156bca6dcbaeb3c9a SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417
 DIST mercurial-4.4.1.tar.gz 5636532 BLAKE2B 07b91da192db30a925bd9798c5d6ab02336501c04f9d65bb9042786c2f5e6f8c16f6ebe6817f68ac746c21f79e39dbb8284b7590063d7a6ef615a8e2b6dbe821 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8
 DIST mercurial-4.4.2.tar.gz 5647013 BLAKE2B 3663517e5e53525e50852fd4941f7c71cc446fcc1255ed09d3e8375fcc14aea01f00e4c05a1cda2876d96b4f935b0d5e3d887567bc62c9c4629954b2cef8617f SHA512 3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993
-EBUILD mercurial-3.8.4.ebuild 3540 BLAKE2B 0aa5da4ba02db827a332ee78b0acc70bfc44ac8be4e69f353a6c5f5925a5531de454825474b886b26a6723748f15e7a810b0bfd57cc4db8e3cabcdbe1a24f5b1 SHA512 da16f58a42571c3c7f0bf754f3087431bdd1a357db7b38193982f0a25026a061e7d60cc191d87236584c2be9119fde60dcd20dc3a7834942b0ee22ccb816f12e
-EBUILD mercurial-4.1.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
 EBUILD mercurial-4.3.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
 EBUILD mercurial-4.3.ebuild 3547 BLAKE2B 21d755c364cb4a6f38c3b50742ab2c1266d559868fa6cd234de9f644f456ecfb3ec9e26ce198232e1bff3d0d828ed2520c5863f92ea8c3216d7fde05cca36763 SHA512 e12beef3deb63a9d375724bb2781467f7f8b3643ba50821d7501ee8e0b93f59b08d7f5428ff2537ca2725ac54246f53473aaa4e3e867fbd4c86c1bbab0d04d2b
 EBUILD mercurial-4.4.1.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960
diff --git a/dev-vcs/mercurial/mercurial-3.8.4.ebuild b/dev-vcs/mercurial/mercurial-3.8.4.ebuild
deleted file mode 100644
index 24f50bfae3ca..000000000000
--- a/dev-vcs/mercurial/mercurial-3.8.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-4.1.3.ebuild b/dev-vcs/mercurial/mercurial-4.1.3.ebuild
deleted file mode 100644
index f29a2c796da8..000000000000
--- a/dev-vcs/mercurial/mercurial-4.1.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 46fdd53fc119..b304303e9de0 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index 9d22166e9d73..425da7e85bf1 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -69,10 +69,18 @@ xpi_install() {
 	[[ ${#} -ne 1 ]] && die "$FUNCNAME takes exactly one argument, please specify an xpi to unpack"
 
 	x="${1}"
-	cd ${x}
+	#cd ${x}
 	# determine id for extension
+	if [[ -f "${x}"/install.rdf ]]; then
 	emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \
-		|| die "failed to determine extension id"
+		|| die "failed to determine extension id from install.rdf"
+	elif [[ -f "${x}"/manifest.json ]]; then
+		emid="$( sed -n 's/.*"id": "\(.*\)",/\1/p' "${x}"/manifest.json )" \
+			|| die "failed to determine extension id from manifest.json"
+	else
+		die "failed to determine extension id"
+	fi
+
 	if [[ -n ${MOZEXTENSION_TARGET} ]]; then
 		insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/}/${emid}
 	elif $(mozversion_extension_location) ; then
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index bdad14cfd37f..0ebc77cae879 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/gambatte/Manifest b/games-emulation/gambatte/Manifest
index 4765c5acc79e..7a0bbb560735 100644
--- a/games-emulation/gambatte/Manifest
+++ b/games-emulation/gambatte/Manifest
@@ -1,3 +1,3 @@
 DIST gambatte-0.5.0_p20131102.tar.xz 353212 BLAKE2B ad17289f29a00230d7ccec2825d6487ed994a6148a931254a9d5c941c5dbb643c5eb4dbd9f43decfcb86fb693f82358e795a4912c4d40258b27b0d8611961ec1 SHA512 9f27af85d2fceb128231eb3e5bf2806a1773c575990296f37eb3c0a14bca5c72f7f161cdf77f710f4ff85b2b3266db9ba098e5ef6772bc5bf7b2c97b8281999b
-EBUILD gambatte-0.5.0_p20131102.ebuild 2080 BLAKE2B d8938429524def3e0f8f91d2b111773c20ca8d35b10f4473890382d14c9a3a4c72a25afd07838fffdd7ecb57e5e45557932c4ab65fc0b4d617e62eec9248f7a7 SHA512 6b3e1e48fd0e3ebe413ffce22226c79a9545d2b8982c4f5a693dfceca16f0e841e12d840a0c871e870b9fcaf14d177798652caa7766b471c1fb6638044236a57
+EBUILD gambatte-0.5.0_p20131102-r1.ebuild 1671 BLAKE2B 67666777e3dac153208f18d99b2e271659f41b93192e9b332e58aa5473fecc40fc109ec485a4c52b138043de790ba6edca742598610ec18eeef0aab2db36ed89 SHA512 b05f7481fce21327aa7a596fa80351e1325a7fd45307c1b5c1e8a94ad0049b8167dfed111629db594a693aeb99b444e23c9691142bd0607feabd016cda8ac5be
 MISC metadata.xml 331 BLAKE2B b739e6db5361a25503fed526b7417578fff92612b1ca90c4a6e8578bd678f3b3b69736238a9ad882a654c7c9bd66b8d1ac296899129610b23ab96918067012d8 SHA512 c46ee0b944bbf88420eb47c11f60d00a6516fe2bb28b5078e8f11857636f16381969cac9edb98d554d07d0894c224817e12560410092ca532da036e697433b1a
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild
new file mode 100644
index 000000000000..5f6d72d5af7b
--- /dev/null
+++ b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit scons-utils games
+
+DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator"
+HOMEPAGE="https://sourceforge.net/projects/gambatte"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[X,sound,joystick,video]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+fix_scons() {
+	local i
+	for i; do
+		cat >> $i << END
+import os
+import SCons.Util
+
+if os.environ.has_key('AR'):
+	env['AR'] = os.environ['AR']
+if os.environ.has_key('RANLIB'):
+	env['RANLIB'] = os.environ['RANLIB']
+if os.environ.has_key('CC'):
+	env['CC'] = os.environ['CC']
+if os.environ.has_key('CFLAGS'):
+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('CXX'):
+	env['CXX'] = os.environ['CXX']
+if os.environ.has_key('CXXFLAGS'):
+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+if os.environ.has_key('CPPFLAGS'):
+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+END
+	done
+}
+
+src_prepare() {
+	# Fix zlib/minizip build error
+	sed -i \
+		-e '1i#define OF(x) x' \
+		libgambatte/src/file/unzip/{unzip,ioapi}.h \
+		|| die "sed iompi.h failed"
+
+	fix_scons {gambatte_sdl,libgambatte}/SConstruct
+}
+
+src_compile() {
+	# build core library
+	cd "${S}"/libgambatte || die
+	escons
+
+	# build sdl frontend
+	cd "${S}"/gambatte_sdl || die
+	escons
+}
+
+src_install() {
+	dogamesbin gambatte_sdl/gambatte_sdl
+
+	dodoc README changelog
+
+	prepgamesdirs
+}
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
deleted file mode 100644
index 48dec7caf06e..000000000000
--- a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit scons-utils qt4-r2 games
-
-DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator"
-HOMEPAGE="https://sourceforge.net/projects/gambatte"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 +sdl"
-REQUIRED_USE="|| ( qt4 sdl )"
-
-RDEPEND="
-	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/alsa-lib
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-	)
-	sdl? ( media-libs/libsdl[X,sound,joystick,video] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-fix_scons() {
-	local i
-	for i; do
-		cat >> $i << END
-import os
-import SCons.Util
-
-if os.environ.has_key('AR'):
-	env['AR'] = os.environ['AR']
-if os.environ.has_key('RANLIB'):
-	env['RANLIB'] = os.environ['RANLIB']
-if os.environ.has_key('CC'):
-	env['CC'] = os.environ['CC']
-if os.environ.has_key('CFLAGS'):
-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-if os.environ.has_key('CXX'):
-	env['CXX'] = os.environ['CXX']
-if os.environ.has_key('CXXFLAGS'):
-	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-if os.environ.has_key('CPPFLAGS'):
-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-if os.environ.has_key('LDFLAGS'):
-	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-END
-	done
-}
-
-src_prepare() {
-	# Fix zlib/minizip build error
-	sed -i \
-		-e '1i#define OF(x) x' \
-		libgambatte/src/file/unzip/{unzip,ioapi}.h \
-		|| die "sed iompi.h failed"
-
-	fix_scons {gambatte_sdl,libgambatte}/SConstruct
-}
-
-src_compile() {
-	# build core library
-	cd "${S}"/libgambatte || die
-	escons
-
-	# build sdl frontend
-	if use sdl; then
-		cd "${S}"/gambatte_sdl || die
-		escons
-	fi
-
-	# build qt frontend
-	if use qt4; then
-		cd "${S}"/gambatte_qt || die
-		eqmake4 ${PN}_qt.pro
-		emake
-	fi
-}
-
-src_install() {
-	use sdl && dogamesbin gambatte_sdl/gambatte_sdl
-	use qt4 && dogamesbin gambatte_qt/bin/gambatte_qt
-
-	dodoc README changelog
-
-	prepgamesdirs
-}
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 028f09a313c4..97348b86c3a2 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,8 +1,9 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.54.1-build.patch 1525 BLAKE2B a5c3307d2dc59b57a0bc44b80c017d0096f7e3331a041cec6cf899b660886d81617ec03e36f5d64ef104a8281f2923b7236ad21c9c26ab52fcdefc9ebeeb959c SHA512 846b72f0733c13d2f7fb943f670943d20963a9f7666c016fc7e8f4e62afeb1ad479523cfc14fa93752f175b8cd44d599e300ace7a981d604b0284052d0914d12
 AUX snes9x-1.54.1-system-zlib.patch 7925 BLAKE2B 231ede4d63b3de7eba6933c05b852f269e6333f1f6db1cc631e73a9bf96fad5bf63489ca6de40c23b4b4cb29feabfc2d3759435ad0c17684911b9334f3fc234e SHA512 02026d5e59f7e016583d15996694aac41fb777541dcf426c8266a9136b59c022c3f13ea211473408d01c76b040af78d70cc5bba9d94a945823674d7f68beb482
+AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
 DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
 DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
 EBUILD snes9x-1.54.1.ebuild 2679 BLAKE2B 2fd6a90eb94a351fcba1e698bf3730cba4719156299d258f5e5eb7b320eb1ed722a8db38e9798a56768375b58dbd6e4df593983ebfabfd2fa62631da40c715be SHA512 e15f019f095854a39b237dcaf04c6e04ef71d6a1fe63c860e2c91aa3013da22813d6d35fe02f4529acf8bca7b995eb8175aae8f8948adfff1e43a92896b2d988
-EBUILD snes9x-1.55.ebuild 2542 BLAKE2B 4c06bc430cf7c25f6629c12f831dafc6dd5ec0cce555522c18c8f6de9dda8f0f15a23f6b90338f8b660d849dd3b7e328c5319ae481a7bd90220c98d095381b8a SHA512 78fd5fc48433eebec5d117702aebe04c44f433a32e1455a17ab3999b1281f1e6f983727ce8ea657caef2675b2f4b57c6b798a3db595ae86a9decf176786f3f25
+EBUILD snes9x-1.55.ebuild 2684 BLAKE2B 44e0bc96353fb4d9cce8fde00c3de7aed84a1a08eb35ef4b55d9b53fb0ce66cfa1f2b2361737147db1102ff3ff887aa840a5babed165f15838803ad67bf14d92 SHA512 ee41e0138dd5d7e42cddbd172749db696ef3f9a8628d39fa2d823418492d07debe5e9ebe4e4429fc58f3a8afadc544056d6d9f914b1a35a1ef4ba4fabd17364b
 MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
new file mode 100644
index 000000000000..30811ef421e0
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
@@ -0,0 +1,63 @@
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -33,7 +33,7 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
++snes9xlocaledir='$(localedir)'
+ AC_SUBST(snes9xlocaledir)
+ 
+ AC_ARG_WITH(debug,
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -56,49 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+-	[AS_HELP_STRING([--enable-debug],
+-		[leave debug information in the final binary (default: no)])],
+-	[], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+-	AC_S9X_COMPILER_FLAG([-g],  [g])
+-	AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+-	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+-	[AS_HELP_STRING([--enable-mtune],
+-		[use the specified value for the -mtune/-mcpu flag (default: no)])],
+-	[], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+-	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+-	[
+-		AC_MSG_WARN([-mtune failed, trying -mcpu...])
+-		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+-			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+-	])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild
index cf70b572d8cf..f95ee81863fb 100644
--- a/games-emulation/snes9x/snes9x-1.55.ebuild
+++ b/games-emulation/snes9x/snes9x-1.55.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic gnome2-utils
+inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
@@ -40,7 +40,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}/unix"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.53-cross-compile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
+	"${FILESDIR}"/${PN}-1.55-build-system.patch
+)
 
 src_prepare() {
 	cd "${WORKDIR}"/${P} || die
@@ -110,9 +113,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
 }
 
 pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
 }
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 4ff93b99f026..72c58f391a78 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/games-envd/Manifest b/games-misc/games-envd/Manifest
index 89196ae88ad3..c3563f83a01e 100644
--- a/games-misc/games-envd/Manifest
+++ b/games-misc/games-envd/Manifest
@@ -1,2 +1,2 @@
-EBUILD games-envd-0.ebuild 1331 BLAKE2B 3706f9770cff7361309b099be4ff2f66b1fde3503c66376226f8c51aac7421a76f5ed74992d6ee5a0cc8592064bcc9ec837e9a7eb9b577ac650b0fc7f339aa4c SHA512 1c5104bf169f506e73afcb394fc7108d3749be4fd54f449843b910c13c02f31300399d65ca0298262e1ee35eb14394030c78b8b48e05b554308290ee9219ec30
+EBUILD games-envd-0.ebuild 1319 BLAKE2B 595aacf33f8dae1e8a8ef5618e9227976ecc01921a84d1250be2901ef766ffcd5d38a6b4b411e2a300c0f905e9685eb3890fd52005fd44608619ba4b76925c7f SHA512 9cf66e5252ed3e35e37b747c5bd541f162c5f8a5f45b2afd555e34077156cf87979ea3c268bfeb96ff07e5ecee6711cb796bbe3ff4b8911f3f277d480645b1b5
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
index 4cf3739f060c..c9b1f79c699f 100644
--- a/games-misc/games-envd/games-envd-0.ebuild
+++ b/games-misc/games-envd/games-envd-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
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh 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"
 
 S=${WORKDIR}
 
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index c0d1467d88d6..a9af87657025 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index 2910a0b6edf0..bab50e20be0b 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -1,4 +1,4 @@
 AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
 DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-EBUILD arx-libertatis-1.1.2.ebuild 2435 BLAKE2B a6211c361a124d47544c02d04b3e6a9cec18f6b60a315b7175dee67162c6fee966f9d20ae4046f962381463b3de54748d2e270a398b8b6fec667f296d7e4eeb3 SHA512 40bf47db0ae3fff9e1bd21306d6f81590d9ca11ca35d9963bc2880ea79828a8a0b271b00dc71e4c4e8ae363658223a6eddd91372e7207aec08759df36aac0280
+EBUILD arx-libertatis-1.1.2-r1.ebuild 2475 BLAKE2B d97ee646fc453258b83ff90305887e429321cb85c41e8b8b3690afe344a85cb22b9d2cf846d36f30e7088073b1422d74af75ee0e952ee9dd988aa88a395b5797 SHA512 5bd56b938de00f8864194a3575bc7a43afe81315e2728f0e138ccbf273d7a2acafd7f035262c1dbec0912f28b34c542b4841014c360e5073e24be565f0ed51dd
 MISC metadata.xml 2564 BLAKE2B 13a668c7bbdb5a7184dbc3334a49d7e342c6400c39af01945ec9fb25ce001faa5267ef874237bafdca399acd38e322ea49f0fcf2a1b5c5eb4089a5be2decb2e3 SHA512 c34718413d4e273abffb224a307075529a3845ac3ceeef7bd38157e16ba0b222c77a2d4b7de2508901a6e0c6602462d907e269d8b83f1554639e97e3dc7133cb
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..6d505c464f01
--- /dev/null
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CMAKE_WARN_UNUSED_CLI=yes
+inherit eutils cmake-utils gnome2-utils games
+
+DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
+HOMEPAGE="http://arx-libertatis.org/"
+SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="c++0x debug +unity-build crash-reporter static tools"
+
+COMMON_DEPEND="
+	media-libs/freetype
+	media-libs/libsdl[X,video,opengl]
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	crash-reporter? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtwidgets:5
+	)
+	!static? ( media-libs/glew )"
+RDEPEND="${COMMON_DEPEND}
+	crash-reporter? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	static? ( media-libs/glew[static-libs] )"
+
+DOCS=( README.md AUTHORS CHANGELOG )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# editor does not build
+	local mycmakeargs=(
+		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
+		-DBUILD_EDITOR=OFF
+		$(cmake-utils_use_build tools TOOLS)
+		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		$(cmake-utils_use debug DEBUG)
+		-DGAMESBINDIR="${GAMES_BINDIR}"
+		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
+		-DINSTALL_SCRIPTS=ON
+		-DSET_OPTIMIZATION_FLAGS=OFF
+		-DSTRICT_USE=ON
+		$(cmake-utils_use unity-build UNITY_BUILD)
+		$(cmake-utils_use_use c++0x CXX11)
+		-DUSE_NATIVE_FS=ON
+		-DUSE_OPENAL=ON
+		-DUSE_OPENGL=ON
+		-DUSE_SDL=ON
+		$(usex crash-reporter "-DUSE_QT5=ON" "")
+		$(cmake-utils_use_use static STATIC_LIBS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
+	elog "  games-rpg/arx-fatalis-demo (free demo)"
+	elog
+	elog "This package only installs the game binary."
+	elog "You need the demo or full game data. Also see:"
+	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
+	elog
+	elog "If you have already installed the game or use the STEAM version,"
+	elog "run \"${GAMES_BINDIR}/arx-install-data\""
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
deleted file mode 100644
index a8df744d1029..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
-	media-libs/freetype
-	media-libs/libsdl[X,video,opengl]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	crash-reporter? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-	)
-	!static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
-	crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-3.5.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# editor does not build
-	local mycmakeargs=(
-		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
-		-DBUILD_EDITOR=OFF
-		$(cmake-utils_use_build tools TOOLS)
-		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		$(cmake-utils_use debug DEBUG)
-		-DGAMESBINDIR="${GAMES_BINDIR}"
-		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
-		-DINSTALL_SCRIPTS=ON
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		$(cmake-utils_use unity-build UNITY_BUILD)
-		$(cmake-utils_use_use c++0x CXX11)
-		-DUSE_NATIVE_FS=ON
-		-DUSE_OPENAL=ON
-		-DUSE_OPENGL=ON
-		-DUSE_SDL=ON
-		$(usex crash-reporter "-DUSE_QT5=OFF" "")
-		$(cmake-utils_use_use static STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
-	elog "  games-rpg/arx-fatalis-demo (free demo)"
-	elog
-	elog "This package only installs the game binary."
-	elog "You need the demo or full game data. Also see:"
-	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
-	elog
-	elog "If you have already installed the game or use the STEAM version,"
-	elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 8ea62fc2af3a..8761e314b36c 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 91cae85210e4..0fdca2b9c2d1 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-17.08.3.tar.xz 144400 BLAKE2B 07f400eecea1f68b9b9e96d463741ae72400578b4250a750db24784cba9f23f8b1b7706373ecca80ef5187b8f2f2803dd6eb70658b4ae8ea0e7a4807d190a75b SHA512 6cd64bb587ca3cd3b51cefec246b9860f7ad63e9a86867fe4630422a9d09c30522c3ff933edded27b8adf4ca71737790179cc884990cabee5007b37c1e424e93
 DIST kross-interpreters-17.12.1.tar.xz 144452 BLAKE2B eec5b71291e039ae4fcfb32c7a48696c19d18ee9611232398eb4a63a83444178423bb921aa9a5fd0cc4f6b176c2e767ee6edaf7869f2d7026e2a83245783144d SHA512 81701978abab167957306229ebea79a910c7c86f573b2bcbf82e1e9d1dba0bcd7e32954b86ff4390ce00d5d9bc896ba98b081c9eaa1dccd097c3372dfdcc23f1
 EBUILD kross-interpreters-17.08.3.ebuild 491 BLAKE2B 837a7816fb9827a6e085119553f27c304221c3b73165ba133c6153dfae8456da88cef139615c7a01a09beb45c7396b0ce6d680bb84bd76ded12ed6a0b8d82f2b SHA512 664ded28b14f45c900800bee627d81554f6f5dd2e1ff7eca0640ca823b3829daa4f703fa7759d276eb191147deaaba551a3354612cd6a0a14e4c5db47df1ed35
-EBUILD kross-interpreters-17.12.1.ebuild 744 BLAKE2B c8deb48a67e2ecd8b4f940b2dbf8cecad75806a22e34dcacd597ca0af7992b9d21af933f4119fe16399ba6efebe4d81b0be13e4d6e18ede0636cde0fa52c6c37 SHA512 42cbc345751c9bcdb46509e73f1997de2e55850d89615c0165e19f6eeffa82a35b6b1f712b79d387532aad2e900fe9bbb8ac54d4da54b6689922357af6b1230a
+EBUILD kross-interpreters-17.12.1-r1.ebuild 744 BLAKE2B e8e856d15a363a12c9ac3ea170d8a9754925be68c6e65379e47c61a42c5e6f1e5f776559b57ac266c66576c40a633434a07971cf257af1c8cd17199bfc91f96b SHA512 1aa47b44fb8c66a99c935efcef0bd23eaf6c009bc971b9a5ddd796c281b7dd19f07ab92e2be2ca1075b2025beed2038cdec154c90d7957604404df1e60e0f494
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.1-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..f1f7ac570239
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-17.12.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23"
+inherit kde5 python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild
deleted file mode 100644
index 2a316da806a5..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22"
-inherit kde5 python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 33667112d556..627640f02a13 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index 452ec744533b..ad0f8f92b0d6 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -13,5 +13,5 @@ AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 BLAKE2B 19df42a9b0ba3f0ab1b6a5d990b4
 AUX kdelibs-4.8.1-norpath.patch 788 BLAKE2B cdf6f6cd3df45f53782d81be09ea85051e90e1a9925972b608cec1a9324c2a5d364821b2ef63076c50140f0558ffe46e1f13b7f1754c4c2e3da2c805c3c49e1a SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89
 AUX kdelibs-4.9.3-werror.patch 1525 BLAKE2B cf48f41c843ef00493c0cfe99dc97c63ff09446f8822ba17d73de40dd09561c07f6b0020d8318a3fb7df8393315b8f7bacb0f1fda158ed869701c526ccf37692 SHA512 d2df35a0330bc98745cedb0dba1733969198cb3024de8b1b70bc552b4abd0bcf42c8f17a40519189b29f4ab2d054ba7ee28436e274c8ed674c9b12620b07814f
 DIST kdelibs-4.14.37.tar.xz 11642272 BLAKE2B 6d4384b9de08c557ba2a9af856825985bc26e71ab6deb515f13ad023a5c6f74d820666f13a6b719d51aff6fa03243f8606c3bbf568d279532ab7eb79c6cd5b2f SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1
-EBUILD kdelibs-4.14.37.ebuild 8078 BLAKE2B 9442afc9b31b7fdce97c8bc77fce8427d5572e208d832700b41ed6178a56bb6cd17466aef4fd8e9fe910476b86acee5b7be679be9d8f1f658fa4b47422667306 SHA512 56e48c2fdb81b25605bdbb784a3a3d5d423220e6c54aae1392992ba0642c5eee0e31441c8595b64c3f099a45139a35d0758d7a85c2bb00d3c44d266f600ffa8a
+EBUILD kdelibs-4.14.37.ebuild 8064 BLAKE2B f78b529e6464155248ad094fb81e990a2ff12f493880dc9e41c4eae11458d8ae1e1d01ac148e9e86b0e93a428e06f108808bbb76ffbc84d4de8525dfeeda32f1 SHA512 2cf2725df4a339667b63e3416d44225b00b137482f218a9fe68fe12f7b285889b0a5ff67c6fd3949ff03a0beb78c294e8638e8184b3b7c59702c92abc32b614e
 MISC metadata.xml 353 BLAKE2B 3048f8a7581ac3c5f1178e2d17aba931887ea4542e529ec098af1b1f61b369d407613bfb2b4cb8ff931cf486475246c52cdaa4362ee16e8d7449695849faeb46 SHA512 6dae9e92d4f396fec1c208d028b9590cbc3b874a8c5e5968488b236e93d99fa763a87ce3ff22383721f7cbc76949c79e1e1bfe85c4ebdd7266ed986fda782587
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index 63019bdb243c..c724b98b9d82 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -89,8 +89,8 @@ COMMONDEPEND="
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 DEPEND="${COMMONDEPEND}
+	>=dev-qt/qttest-${QT_MINIMAL}:4
 	doc? ( app-doc/doxygen )
-	handbook? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
 	nls? ( virtual/libintl )
 	test? ( dev-util/cppunit )
 "
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 7d51cf57e46b..4153e66e16f4 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 5cda4cb9efa4..db318e3d0072 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -2,6 +2,5 @@ AUX yakuake-3.0.4-qdbus-crash.patch 1425 BLAKE2B 841120c4c714858157d0982582291d3
 AUX yakuake-3.0.4-qicon.patch 1405 BLAKE2B 5d423fab1f7e9f3ad50017f58047d5d642e312f89502290be00341034a85975adcc38a4769b01c01820e26379248f16e1d1a5ec59e0162b43d9559302d385181 SHA512 fd2c68341a77cfedf4d34a854efc7c513c16741cf2e3cf4300c1b1ee4e45560d9e5f318303493d4112141255bd3288437db2b251a722db0ec410c2241f842b44
 AUX yakuake-3.0.4-qt-5.9-wayland.patch 3408 BLAKE2B 9c813f0ebb7b8044a62e4db14c478e235f19f20330edd1b696e0557a66b0254a9c1105018110f6142635394bb2de140538d76aca921f35cfa21d25d3416e528c SHA512 1c0486b186e3443dc20c828cd241b2b07093d3314263a6cda16b97ae4aea883281124988f0c989d2116ecc3fa832587b54fa5027555d12157fe40bdd5201ce42
 DIST yakuake-3.0.4.tar.xz 367788 BLAKE2B 6c151ac1fa70d7cf3cfd00854d8f5ab553345a9d12186514d405428e8e7ad32d8405b1c562b420c46a713347d1e00e037b92e20801c51cd90a81e299e94c51d1 SHA512 e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659
-EBUILD yakuake-3.0.4-r2.ebuild 1339 BLAKE2B 9e9489017d9c8955f626bb321b76e6af24bba97e9ea0f33e3e73df2279a929331751003d79e11be730bf0b4252bd1ba1c562c10c110111d82bbbeae2d63ce6dc SHA512 0056d9c525b970dab5691746467602564d113b8c4bbd3309d914ba7b9043ec1920713a116df2ecce22940ca23fc869643202268085d102ccd34b7caecd689fe8
-EBUILD yakuake-3.0.4.ebuild 1213 BLAKE2B 17094bafdc0cd77815a9dd5b2fc13005b09fe14078699130aadcd3989d510b35216c8205ff31af6e50ba909140d55f2699e0df9aac7e56625642953bc700886d SHA512 0613901cfa2d84b485c8ef3677f21b92c9eaf54770af211777b80923e7c13bb3cc3939cad9b4e18c7c85c941e6c46b78b78ec4ae9ad553d4f781648cea7039fd
+EBUILD yakuake-3.0.4-r2.ebuild 1337 BLAKE2B 654711bb31bd14c19813e9d6fc71257a17d7b34c3a92dbe21aee30a348df84170c46f134eb1bab3f640540569f51c1cd95211175c395b60a9aa6576ee49c741b SHA512 821506da700802f928cf940ad19cd69894464da2d8a920199cf619aefe4d5ce90fe3865c805f7662787bb522d9e31a22b7475e5f34ed96696319f1718880255a
 MISC metadata.xml 527 BLAKE2B 6550b2f9744eaa38689006f338b02f0f5bc2a7a19942552176aba47d03832e7d39b5049515f768d819bd0f2f5bd26d4a8f572ee8d731b69940f286c3b31102d8 SHA512 9076d81d5e1f7b60667653334a649be515ce8c5b8224422bad089a5541b2438922d515abc11c66918a7bc0d00f4fc6f15f4a3cd20dd697b714195977d1c7baac
diff --git a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
index e82c0cbc12da..cd59332d3ebe 100644
--- a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
+++ b/kde-misc/yakuake/yakuake-3.0.4-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
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 fi
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/yakuake/yakuake-3.0.4.ebuild b/kde-misc/yakuake/yakuake-3.0.4.ebuild
deleted file mode 100644
index 7665f978c98e..000000000000
--- a/kde-misc/yakuake/yakuake-3.0.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://yakuake.kde.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep konsole)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-misc/yakuake:4
-"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b73e692a6180..c66e5d80bf36 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index b9f7a73e2196..6ebd69c1f9d3 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,3 @@
-DIST bluedevil-5.10.5.tar.xz 144576 BLAKE2B d8a3fc88f2af954aacd32287d23d230ded4d1cbc20787bc30afa3c75024eed3202f1b6276e758e63e0bd30c4e37ec6eb0c06010b515743795aa2c5741d879b95 SHA512 fb4b58dd9a98c72f74125245fa1d89048a6deb02c0bfa538338c58f3efa5f02a71d14a0518d0354db4c7ff79bf3690489f1d3172480217ef118aaf7ffdbe113a
 DIST bluedevil-5.11.5.tar.xz 153380 BLAKE2B 1342ea233c6ea2b7a325eefafe1528d27d1f060bdf628ecd6c7dcddb0323ed10d6dc11ddcbf96a9f6913202ea327979a4f06d9cc7fdc70d02595b0a593a9a819 SHA512 273c1d3a649c7e78e78f27a10199057e2b06940e281eeeb7555bd2d40a6d9f9f7aaa38b5c0a84549f3ff13ec3209b63dde00dcce2ef8855a0cf46030f477594b
-EBUILD bluedevil-5.10.5.ebuild 1027 BLAKE2B 0b160c7a8361e96b232a148f51430d75818967765f44463173ac036e9a50ca0ecec50f748196ff7156023e26ab1ad915744f5e783f898df0c039c0e66db96ebc SHA512 561a94744c111b3356331f654fa774379440b24bc81caad5823436c3e512673b6a020e36158c2228b0262134d0b6186806bd584a06f12218f307a601b7d2d484
 EBUILD bluedevil-5.11.5.ebuild 1003 BLAKE2B 57d5960097bbd4ac906c8f3e9d276d501c0526a8fb66843b3ceb3f6367142ef44f2a0a49a66eb128a1f71f16b423343ea7f2d31331f621d02c73231cf88dfba1 SHA512 671c68e6b660dd79464865cc0a98a460a5e6db41606d54b95ac232aae44b12e5e11afc6af19f3b7c2b51ba1db5648516dcafebdedfe5c49d93b5639c1a9cc323
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.10.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.10.5.ebuild
deleted file mode 100644
index 4b984cee5513..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.10.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 45a43ebdee35..c71a92e3d429 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.10.5.tar.xz 3132960 BLAKE2B 5e09c1a9d0d535ef36c0443eae75245a45190e47eae481a7472cd70af01197bdf90ff9830e6980ec45ac0b4fb19328f1f30cddf6aafccbc8f8df8c98df1a5cb0 SHA512 918ef829f00adbaf2e791028c92b24f7ea9c455591017afd5c76fa82c66a6e7fae48c8ecc9817bab0551316af0b8397c1ff41422537178004de1479439290f1e
 DIST breeze-grub-5.11.5.tar.xz 3157272 BLAKE2B 1c4f9bed314f4968b00e7283203ce24ffa7911c4e7fcd0631ddb942ece5eaa104773bf267ee23449125cc902a20e7d8eae5be595d12c7b1eeae055455b5849d4 SHA512 87802343c23cf4a73160a669fbec69cd529b992c31fb6d4a3578e31f5c9eeb4bc418ba811e705d95c37b1e2047bd08619c369f3e16208dba7fcde1f8d56bd6f8
-EBUILD breeze-grub-5.10.5.ebuild 398 BLAKE2B ca7736590928786de56d6482f36b9e2acb9f899dcc330cf22d86b65b5427e085ebcaca3ed3a2be3de1ab10922280f59a7dc27fc961c2c2c3d18fe0814487be2e SHA512 db0442c0feddc91ed1bd7da6c6d547df7a9b7ace8a6d6be27436f861fff829f19acfa1e0eea3adac74b8adb2105841ca449e47767d618843a081824d7cf6beed
 EBUILD breeze-grub-5.11.5.ebuild 398 BLAKE2B 34128bcfe78858a3695db8c09bc6666396dab77c982c12bf987c0dc727eda420cfb8b8474e8dc21e0575c4118854bf33f84a81057b52ee619d4b43180f831c50 SHA512 06527001727ebde78101ce6e8672fa30393b4652d706c54d94e463aa1aa062b15ba2ec85adf555fd418465d3802e43b2acba0490fd1279b596e628ca5fd4d353
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.10.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.10.5.ebuild
deleted file mode 100644
index 10e696f29827..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.10.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index aa260c70681e..b6996188efc2 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-gtk-5.10.5.tar.xz 211368 BLAKE2B cfe3512475633a8510d06cf144bf310309abb79afa91d625be2b4443198fd6b289080f3188560026f3c84ab77bdc6c55711130a0fb9a1cf258e7ea55b2b6954e SHA512 3ba76d370ff5dca9e31f6aa609a308725a9d6f4ccdae6a487d5f48427c5faf5566d877ac199d4dbd9d7bf01bce09ed305dc0c9146c608fed2d69f3cea6dda497
 DIST breeze-gtk-5.11.5.tar.xz 218340 BLAKE2B 9f729336e0a5844fc8258f9900f7e5dc738c33e4d6a63f3a8b7fcc0f5fdf202d36a991397568dcdd3c608e3a93e9c5ff085d47b2d91a345f7b6587b530b035b1 SHA512 d940624cff5b785d2b32ca6329f463b4c545ae613fb5e7364537703086900f920fe72c25f5731ba24409e27469e2281b5d74bfd36ffedee66cbd8ac62be0c53d
-EBUILD breeze-gtk-5.10.5.ebuild 319 BLAKE2B 0197681e3707de33dfb7f2b8cd8e41f780c476830d4beb65c19ab2a3434081d622ea44a7334f068c22443e933d13f59b04688e801f80711e45646a61c57dfdb6 SHA512 aacecb4af2d09e4eb1a2ccde02b56b540b8868541e2ec1576d99c2562b81645314a2386800222bf9fe58878c463d610e1f155f34ff5ce46f429a5f000026a968
 EBUILD breeze-gtk-5.11.5.ebuild 296 BLAKE2B f1bbe6e13a0a65a151abc8c8a7cf5ec1e0db57167c3237236d061b500c716fee97e9eb7aa3e20d41d7b5d6b898cebe388914390bd7220e1142ed2a2a8d4e767d SHA512 c6cd9fb98a87e8c9ee53dfb708645cf340182e4bc9b88a830d809e642f3b6c3db300fc377865657240b4d110cc9a206be75af38715007aa22efa38f1825723d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.10.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.10.5.ebuild
deleted file mode 100644
index ea4082ea1e13..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.10.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index b6119f0082e0..5e5f52072d4f 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.10.5.tar.xz 104904 BLAKE2B c3a13885c98d5c9720abec314a26ce5e100d9ec04a62ee4d97491cc87e28e9b774debc13bc8f95c29bf0da9f9a17a38a917ccce88f68e89f32544b298e0a742d SHA512 179f3f61198ef983812fe97e1f62898a6fb943063e21acca441ac4776d38192fc0b5f1ecf7f7b73f1e4efdbcc6fec31ec669a6a47ce7ea1b858a2d6b63c7e5bc
 DIST breeze-plymouth-5.11.5.tar.xz 106612 BLAKE2B d2f3f63e1f04f31de8b98a4ca63a529cbd2282db64527fe6faf030bd6bfa441da9213b467ac441eddffd870028f3e5bbfe79562fa7eb3f485d5f391f4c7d1dae SHA512 218045bf35efff475bf9aa4f1e8d117b42b671ba036a7dd67a2b6a8538ee4317f84415e53ffd17bb9645f7971bf575beae1cc1de7b6f67e37166fde25cf92c44
-EBUILD breeze-plymouth-5.10.5.ebuild 459 BLAKE2B 65407aeadf1509790cb6979fb2b379170174edf76624d52d1f5e1a605b6e7fe39ebda3def2ce6c2590b4502760e80b02f7809b158d5b53f1d84a543e9d25244c SHA512 07bf1570129557eeb0a7a9be2478be152e2e6d8985b45bb8da89541ef826f9537005a86a2a6dfeb39b27ccd651780d62359b0718e9543a3b98e69f99b37524de
 EBUILD breeze-plymouth-5.11.5.ebuild 459 BLAKE2B 25ab42a671b0dc5b5f299843f8c56d583cf042ad375ba7f57b60d62510eae9760937a50d8b8cd3ca4154e829d4712970df5183cd88d8c7c125aa3cc48285f41c SHA512 e47b0896263d14f388f5f5bb2dbb8635a075bba76046f2a03e77473829d843393dd4b4eddac6869ee03dda7dbb8fd235c1b2bc99655e580cae138865a0d7dcac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.10.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.10.5.ebuild
deleted file mode 100644
index 58d4da73cd2b..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.10.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 4d6fcdc1c7b1..1c8217d639b0 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.10.5.tar.xz 17426192 BLAKE2B 587142752a7c2f11fca3463d73200a073a99f225bb377e77b48cc093c5851f45ed37303b6f361ead925a6f661ada24f2ed0e38f14664acce6176e9ea21d8a753 SHA512 4af601d1b8f446d6e9d0a381e84ec932294de862f8b13b8e17d01c81d89249d4d841b236498094f21e4402f1448b4f103a49f8010fef90ce603a8493691c3747
 DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df
-EBUILD breeze-5.10.5.ebuild 1643 BLAKE2B 7464694b71105f641ec2b5470ddd640b883ee29edddf8bacf099f77918d6bc6929fe940d8a0e4bf3dd4cb26624a0ba024c7be1593fb14bdb69be839100ed4723 SHA512 efb094d5ac6d8f7752fed85f04a17f999bacb45b42a548ddcd0632f2dd64f2c31dd104b314828793191e9fdca11d02e2a5c20415db6f27f7e7d81c7926bc30da
 EBUILD breeze-5.11.5.ebuild 1867 BLAKE2B 24ba84df08da2ed59de370a074062e35195d0460e571c405c1aede248af731438b9c94e7ab6fea288790c0021e8ee0be332c42007e79b76a0316419bee6cb4be SHA512 2d93e0dcb6ce34f3c042e5b7edc3b098aa9ef7cd72efae48cae3966ea355064a584edea9e42ec86ce5b3410247af1a49cccb1ad1bb2347f0a670ba9e17bc585b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.10.5.ebuild b/kde-plasma/breeze/breeze-5.10.5.ebuild
deleted file mode 100644
index ff171d4d30ab..000000000000
--- a/kde-plasma/breeze/breeze-5.10.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-	qt4? ( dev-util/automoc:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index dc396268af59..9f6b3e1dba81 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.10.5.tar.xz 84528 BLAKE2B b495aca1cec3f5ce5cc72d6da2124030b93476ec7ef08c3ad62a5cb91e906d3ae001b1272dc3a687b77afc94f4c4d6815fd55ef53d7aa83fc26d59858a86fee0 SHA512 97215cbbbb22f75e4244e2e16bfec97612eade16a1e0537698452a823df4198e28e23934b96d988b304afd090df6caa9657708eda53324d78bf509793ae28673
 DIST kactivitymanagerd-5.11.5.tar.xz 89720 BLAKE2B b4fea473744ed25abd44831418a2e427b86b865385392044aea8b3bada705b8038c2e85b6273f05874c2bd26d6f283e7bf674f082f5435690a08b2348ae2c1f2 SHA512 8c10b5a8716580dbbb42883bf7acc78e23877797e30208400cca9b37d7d921a2873854733ffd730fbb37b6d79b0b44aebbfa6274376123fdfc0999f362793745
-EBUILD kactivitymanagerd-5.10.5.ebuild 886 BLAKE2B c1167477d136311f3655dce595d9d122e7959f71da4db7c9573cd27a63ded6e23b91e52e2f67b0ad8a575b779dcc2e1e6529512718e358eeffca9aa2c45dd1e8 SHA512 999be814526b39eaa26cfa2de5f7536f1553e500408d17cc58bd092f13f48f310c58f9d92525e4e0327dbc820324698e7aa029e2f0a3c05f8c5f438c1f2eb3e7
 EBUILD kactivitymanagerd-5.11.5.ebuild 886 BLAKE2B f7585849689d9db572c6157d21e7784fa70efafee71596809db33fcff09f2a76b60eaba7b75ef2becb72ce241f8c28b42fa7fb2c895df887f743e96545a4553e SHA512 f9536e1bf8f5271ea2e833ee3b21d4487e08ff0ab25dd509f4ed4f9cb011cff363ea81b9f5705b3fa6140b80fc36625d3354505e4214bee51259057c1f707de8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.10.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.10.5.ebuild
deleted file mode 100644
index 921e75228a57..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.10.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-	!<kde-plasma/plasma-desktop-5.6.1
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index c6861ca19ec5..a6e1554503e7 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,5 +1,3 @@
-DIST kde-cli-tools-5.10.5.tar.xz 502000 BLAKE2B f34d6c7db98aa50632b93af3234178c2ebbc743f4d734c59319e5bcbe4d3b828a857e20d1e085a1ac7e4ab910ee54074325ead5f7e26b47686eae8a06f3d99f1 SHA512 02836ce8760d8471a9c800c070d78c2e3513ce7a69ea04e2dabb33d5944fe53a7b480f48b9a47d339ec53b5bfd4f9798164b656f3c2080485f62d47703c5ba91
 DIST kde-cli-tools-5.11.5.tar.xz 597040 BLAKE2B 8e17d08d45699c618325710fd4a054e1acde34e17965b65fb9054111d77e8c944fb4806d7d50e5073debabc948c79bf167887243c68e3227fc0c74c31d5eea74 SHA512 1f1363026d7d372552a06db19630a7deece8228bba020c0469971012f6393d4439fc56645b7348fca777b27dd86f7ffe8299c6e024384aaf7525d91baebe4b48
-EBUILD kde-cli-tools-5.10.5.ebuild 1403 BLAKE2B 78835860aa6376c9fbbc12d73b5e7ca7b90723aa508d981dbace948dd6b194dd027d13f7e60b5a3e46628e3de9772ef3348aeb1700226b606581677984ba2dd3 SHA512 9a29bafbf70ee783ec8a464da68c76b1f2af4c9322ee7bc4719032a1a51eb3d3a00157bf06d8f5109119c2c97e1130f054270fd85664352903741d5239091204
 EBUILD kde-cli-tools-5.11.5.ebuild 1415 BLAKE2B 62733ac6b500c63456858a16de37fd9feafe80d9e06c1965f7b5d30e4e659f6f76ddadd54e46c4acd6cc85e4310c3e27e1cf1ee7e3de05acc7e2a97d5cc6a2e5 SHA512 9e97dda7e652e8703e0a74acb425f6949fcb09a11ce0db6cbdc5b48ea7f79223e07fcd6c84f5b29ac1bd574baccfe4c97e01c26b5ef3954ec379ca7b722c1eb2
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.5.ebuild
deleted file mode 100644
index e8d69bc9d9cb..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesu
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index f84a0381d078..513bd85f4694 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,4 @@
 AUX kde-gtk-config-5.4.2-gtk3-optional.patch 578 BLAKE2B 7e528903187c1cd4e8f3edf4d3b7234d5e944761740a1d6ed1b0bf7b34375781e9c4b2a283f544614ce07c71131698dc6cbd6f7e6066cbcef7d6f8fc2f902d13 SHA512 f4cfdae004dd0c6d26eca2b46a1d28bded9576c3488320b4436742020835ac5029a163f7e5859542d087181e07651b66777cb3199d79c1aa1fac682edbf20617
-DIST kde-gtk-config-5.10.5.tar.xz 152488 BLAKE2B 48fcb70619d7d002c5bd767dea5c2485244ce68d3a1f1455ce8956b0aed66ec88bccfe13f4451884e885bf15513815d5ded0418e59ee18321e7246d014faf56b SHA512 6043b8f37ec291bb0add449ea1a1777fef89d7aa246fac9af0fa4aa417e9c9551429a4c9ca1918d0079fb93e1bde13d82b1fdf83c615d2951f74558b013570a3
 DIST kde-gtk-config-5.11.5.tar.xz 159700 BLAKE2B 3de3d056f47cedc7d04191853a7642e783d8e03af60a5198e9dc3f8eb49d14f2422324972a1e3569816df36869c19c1d34bfb5e7c0ce9bf20b8543c26029ab20 SHA512 bcaf0e8c6495fa2418caa92e4fa30f6369b7ed6d45ed288a6f4d071661cefad9240e990c57727aa709e398c1947a4caa6bcf77f3ef53c24127a5696186c989df
-EBUILD kde-gtk-config-5.10.5.ebuild 1355 BLAKE2B 8fff1dcf763f7ff226e218b0c3a37fc93c1faf2101eb0b8c0f8b2d27ab5c8ac668bd01336600d48b10bb15b54b77db587cde2199420b70f8c0b3705d7c27814c SHA512 7a2e94c5a12cac8841cde25a8f3d6e9e5e4c7704cc3c5799bc57196e5b7243fcc86ddd4b8547dd10bb02aa9a32fcf64fdadf04e2f975102d7c66a2abb2b91c2a
 EBUILD kde-gtk-config-5.11.5.ebuild 1355 BLAKE2B c4b16ad68736ba32664ea01fdda00bd66ca2836669346f17373c61ac379e2c4aa46b8fdb03df1225e205159fe3101c12977e9418a9b4edf806bbc30ce4a41b5d SHA512 9ed7f5bf17eb3408d632860a9062180f567f2cb10d572f122b094cca866c02f830195dc5d26bb7a75f14271d3b22a064e7fe38251d6fd27101ca0185a4df1acd
 MISC metadata.xml 333 BLAKE2B fe2211e8c1798fa7f3d3863ca5182a360f3ce2c5091f57c6ec14cd64733c1bb16a15fb57007e19502a2fca7761a54f0aeb2f228df10d23db3ee1e9a4911e1283 SHA512 ce7ff5491e0b8e230a07d5170efa584645eeb59b83f5e446569d230ba1b7e86e0419648fb11d91d81dcbe96139524b2371ad9b9266d1b97f147784674c64c326
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.10.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.10.5.ebuild
deleted file mode 100644
index c8fc25764daa..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.10.5.ebuild
+++ /dev/null
@@ -1,58 +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="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+gtk3"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libXcursor
-	gtk3? ( x11-libs/gtk+:3 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-		-DBUILD_gtk3proxies=$(usex gtk3)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 1810c5e066af..14aeb9bba1fd 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.10.5.tar.xz 35604 BLAKE2B 7eb820e7fb0bc828d29706c3ea7ca97f87489b7a40f1d46e20efcc4a06aa3e25ffffee6af8a90a66df5d3effc75a1833d3aeed37ce53ae23b1a22504db45bd5e SHA512 23a75d237a607d2cb9b7f9ce4cd1f378e791d2774354870bcabc3232b7546775db6770f840e6bbd2f843421338e4fd56122a042520fc4b10a98929c3cacf709f
 DIST kdecoration-5.11.5.tar.xz 36280 BLAKE2B 64a8bbe8d9891f011bfbce69de5b989931f2129a87d01486378ae2a327c11615baca1223113c6a2e21a9bd2698cee7c908a6454b598389fca6082788df8f683e SHA512 a7dbec450e7a67b6c029ebba1663ffb3fa199f4c855322673ddedc4411506b20ff922a1dc6c728a6a8b5332ca8b0eb542fc52dad91ce3d01ed39d5bc5efc4cbc
-EBUILD kdecoration-5.10.5.ebuild 368 BLAKE2B f4c9d99f09d0b9f51cf69198bc8e28872cf5a050fef973d3112c4d66924478f5e1d2c5cebea35c75c81166996e80ca37eb8a315bd38d997de628d9bd1cffe002 SHA512 5a68ec24343ac4ac9f0becbf67338e703e268c2259bbd2c8efd5ab0a98f525927164ca6f6df133d5d9aca2f856a989c04dc49f10ea7753a4684f03be4e2c4fa8
 EBUILD kdecoration-5.11.5.ebuild 368 BLAKE2B 6926d03e513b21a5d09bf629fda76c1e351709b0ca5e4ce7cba51cab88f9a3eefd2038b269090f16bef9ac78a5724cde7e6880bd8992afb35c5c3d56fed05935 SHA512 940302029114e1ce499159a58a6fa0881cb31f4b5ef61f53eafb726142bfa79d22dfe04970771ca9711bc66ec2cc2fc7058a7a9e845eb322da7e22a60197efa4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.10.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.10.5.ebuild
deleted file mode 100644
index b1c42dab82d7..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.10.5.ebuild
+++ /dev/null
@@ -1,16 +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="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="$(add_qt_dep qtgui)"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index c7b2112b5426..f0ba2fa490d2 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdeplasma-addons-5.10.5.tar.xz 1373676 BLAKE2B 96b23bd2fc06466c214414ad173cd3c8322023f4312759e34c76541f5accdaa74585ee116e1f82369090de09dee6e1c795299615197fffb6a5664d97640ad80e SHA512 dc9ee0cfa52333b98afe3281914e0ece38caeeb9c29b3fd8a63e5ad657fd68aeeaa4eaf10e7f8ee9470d4b76493ae7249889efb810426b708a213ba4e3c95942
 DIST kdeplasma-addons-5.11.5.tar.xz 1459308 BLAKE2B e64360e7607b7ee653953dd487bc4bc087be349304909f88546f6f7bd1c79903f3b67d239bbca63d4b145cb95317e4542e3b8fba0cfc5c7cd470c3b8c9bf9d94 SHA512 b4a2e191573dc72d6a32d3f1a612153ccc502232fe7908dea90a7dc869002da6e50e6126a0b6b921478fe687479eac096971fb105ed757d82bacbbfb15fed471
-EBUILD kdeplasma-addons-5.10.5.ebuild 1428 BLAKE2B 4ad9a315102cdc2383db62a070b0651879e4aee2853002fb83bf9063b6e4905c64381eb7d9b13694e46a66c625b5a6f289c518ef4450e1efaa28227e1762eaa8 SHA512 59baaf03c04dc4d304fb42add096afd1ffba9f9a416fab7c1ffd8ff79506bd3e0a12948708e2842319d2e020af5621c1fba695d6da8b39af9fa4ca4558a071c1
 EBUILD kdeplasma-addons-5.11.5.ebuild 1428 BLAKE2B 4fadc397cdf4d30aefa0e73685c73348bfd812368586e4c6643bc1d3f006fa377386763fd56bbf3671d59d7e5d8164136e5695f18cb2f2a42708ef0420e7b795 SHA512 abb8c41db8e794901603934b4e202b4a770da70637595bf0b2ba7767a55679d6d1d16c1899ac5b74b32a380f49dc74358a44acf063b76b3ac680544f7569f406
 MISC metadata.xml 355 BLAKE2B c12db16f1d75de14fa8c5afc4b6927322c568d40cc39f430062604a17f3cf91f221b3d5db310510253f8b2be21235a98226c1c5129d46e5c7da7d3148ef625fd SHA512 bd9ac9458ccd15750d9659d507459a09c4b5a3297ed6dc91ebec544cff055438a79a28868623cec7e2c08ddcc1352287cbc7dfb9c93774efd14062993f2738ab
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.10.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.10.5.ebuild
deleted file mode 100644
index 6f554581ac2e..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.10.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	share? ( dev-libs/purpose:5 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 90eebcac1477..3bb890451d26 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.10.5.tar.xz 60564 BLAKE2B ea6767d13a5ac3f048026440713b53d3e0cd44325fa30f6bb4c8ba88cc2186611b59c41be0e31504fefaaf88e113910a3567976830fd8659736e51e90ce4ec8f SHA512 2a57b6ab38b6412bb4784fe3e057c2f34ec678b2ed1d3220ba6332cf991f376ea2471128622a657f6d25ca096dc80b39323b6258bfb483e0ca96d278a6973a3b
 DIST kgamma5-5.11.5.tar.xz 64108 BLAKE2B 0eb21c1c79a40c60e066f7aa80e336768cbd89405a0083019a299d6dc379d7ccb9100efe01ccb1481413d465afbdf61f64db546337c4b2c1675e18a54951cff7 SHA512 ac923f6e899b2b35ce80ed990315c3e72bfd239ad79a8630cdbdfbdc3248dd72608ac219cbeafd1d20e768496dc6bd2d71d1d326017a84f30b681b6c65e604df
-EBUILD kgamma-5.10.5.ebuild 538 BLAKE2B c97ff5dbcca63524646e994d982f8b84e9429ccb80270aa2494f8f2c0b124b4fef542c15864f28197bb0c99257dd72c40980bc911ca2f9151e2fab89cc3bcaa6 SHA512 85a0c8a5e88aea4cd8d03c609bafabcfcfe914b6b7850200ece75b026c6c37e385cdffa7004f9387909fcc4acd7a15234da856810a3d2665ac2c4a69297e5b70
 EBUILD kgamma-5.11.5.ebuild 538 BLAKE2B 02f28fdd2ec410f5068f3c9a27b484aaffc1063901e378cbeae42fe7e05ec93b885f4c608a9b87089c9cbca466335e01a0b2752755cc08c78129813446ff773e SHA512 0cce38f8e624dc056254df3e7ef7e5fe4cbd974533e88054edc864f5129e7f56b9a43faf1491fe9fa30799809c0d4a6d8e316bcb6e74b85a4bf466bd52822059
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.10.5.ebuild b/kde-plasma/kgamma/kgamma-5.10.5.ebuild
deleted file mode 100644
index 44dc9a668dac..000000000000
--- a/kde-plasma/kgamma/kgamma-5.10.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 8d44fad0d588..e62063719d54 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.10.5.tar.xz 699072 BLAKE2B 215c0dbb141ac2e81644dae2c5a8ebdced549383e3f704d2fa265a99f8130a8ee25c71b8ea0e0c46a1937648f71dfbb296c2a0df117137b8e05600e53ab8671f SHA512 2886565c6f859b68129d74084639a4ef7ab37cf752bae902b7841cd6fda6ae76bd196d259e3aae256d3c6dcaaa75d076b7fb28d8437da4a617134e850411d47d
 DIST khotkeys-5.11.5.tar.xz 1071588 BLAKE2B ded5b2936068cc0a540ed6ec6f0229c62babefc8038db76578180625f04214dd98d3c06da7ee3d4b8a7d7286319039c2fa8c1fb5107f595cfaeb2109a9677c25 SHA512 fbbe09514cba58749945fc310b67e4ee716a49c38e602087c26e9c531334e0d1483a388778ef013678f7705ef575d18d403d922d83058d6025eedff0420693a3
-EBUILD khotkeys-5.10.5.ebuild 1122 BLAKE2B a0f89ffa5ad651c8adc40e96cfd9edbb7cfa3b7096e2423b6f1589e14e57fae0c53187d2f7f026fc7737d40b3f263dabfdc694617a45734899495783635a86d0 SHA512 94eaa494c10b926ad7fcc0b06592322ff805ee129a12434732b085d36c7ce6e35c640a7f1e927d80465d9a017bde92462e179cc31973b689fde57e856d413a07
 EBUILD khotkeys-5.11.5.ebuild 1122 BLAKE2B b5616561f00ba86f251105234816129dd58d8acd2cc82fe354cc8d2789ab71b6412514b6f03e33343bdc0fc62bde837bc898e7d7dde5ae66237743eb549e69c7 SHA512 ffd4f3918a03554ecbe8f330d01f18715732dbafecd9dce39cebd4344943f1e4ed2354d541fa1a7468b80e14d4274db9da9b49068fe487438c1103ea4167e72c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.10.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.10.5.ebuild
deleted file mode 100644
index e00a05f3011a..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.10.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-proto/xproto
-"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 93beb5a7e706..80664af3f8eb 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.10.5.tar.xz 1263864 BLAKE2B 4e51abb8c8e91c7cb121e6aa61c355fa4fdf49a3a0bae07e111d7b92c8fe07cbc5d0443a42f0f2521cc4922d05c928b13b3b103152033edbe289a7b148d04519 SHA512 556bb7e369f28ce1203129f02009bc01d3c018e6e0cc7c3c18382fdc7bb6fa54e9056deb5ffbfcb429853b5f0076e537ce01be721cf698d493a531777ef1225f
 DIST kinfocenter-5.11.5.tar.xz 1302960 BLAKE2B bd938c9c330c8f335825810e3fc8e8c97b1629d89bfeef0eb18bd4852f939f5ba0fb55640338b6d817c08d0b8f0099cdc303a19874811af52c35afd2a63a728c SHA512 d64cf466b4b883c9a57a0dddfe5a1d1cae0687655897803e5f14bcf73e90c1ea05d96458dbe131428c6d19a50d92b2614036136fdb897e422b1c1fc3d38f5303
-EBUILD kinfocenter-5.10.5.ebuild 2420 BLAKE2B 26e957331cc79acda2632f72d685188dfc1da3bffc1b2a10c2e12bdad79eaa9ff47ff627d237ae5ae147b0f61d88c8806e222a3d033362428dccfb059447d4fa SHA512 b44310ab7c29838aa0e46f2c2442233e73c3c8cadded35e2584de0e2e236fd5526b46aa7a7e54f29ce4a3d6741ef96ea1b552e3092d3d805449d38549307f41d
 EBUILD kinfocenter-5.11.5.ebuild 2420 BLAKE2B da22bd0116013b3b79246f2a579b353381d9ec018efe97ddcf770a72ee76d57fdde18d52d4378851da577d9757f0fa507800d426a334c595f4ac0e4e8a174a4c SHA512 3f16d3bc5cf32511d53695315edebf42059971cb66e7d1c373d72ac71d883a56b3f887545344263e235a3a9477f620ba1e9fa4797023b6f6cf26002691b9a806
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.10.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.10.5.ebuild
deleted file mode 100644
index be15b2ccedb8..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.10.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gles2 OpenGLES)
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
-		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 4e6aa63444bf..304d9854995c 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.10.5.tar.xz 650320 BLAKE2B 5fefb6e9e9d498b66e43ccec31eb0f00c59f05cf1ef88642bc56074a8578632b7bb30b7b237b77afbb13f1381d82481b3b7e8ba689413552406d2676f8e599ac SHA512 cf5b332f37fe4e1b89a029f5e9f407063f54a7dc0250322887164c21d69f44a96b5973589ff62ae29f1a7ec50951bfe3840708344c0bc37bccdc8162dc0c072d
 DIST kmenuedit-5.11.5.tar.xz 663336 BLAKE2B 2a3adeb669c00cacb0e5334f7e5c41f38683926db315714d2026256b702cef9788c8d9014dbaf63c6e68b28de953f42b9421ec5a94a165e121341e7d945ca2f7 SHA512 65fd7e67eb67c56adad3f9dc422f8005fefa40fae37a29444e305a20434a1e228c63c8db04c4f031cf60f9f06d07d794727344ad10d8f3d5681119ea44e3c5b7
-EBUILD kmenuedit-5.10.5.ebuild 1051 BLAKE2B e173c3a32965daadba9700d3ff34f004e2f10b06e11822da1644c6ba475f94b3a8e13c2e14ebb2d6601dd188e018959bf2d9ee7522995b0c91f4a9cf8b6a9a16 SHA512 eb8acc72057ff4297b49d1c436d9490d60f9802ffc2481945efd6d5dbd32f89c3aea4812eb63fa73926bc80bed99fe0d00aa333b6c95201d57271d69356799e9
 EBUILD kmenuedit-5.11.5.ebuild 1028 BLAKE2B 61939d330fe0251115207ac560cdce1b00517a31f97c0e176ee335431fa3da77b498b1346fdb668d7120af7a2850e2f02bd80a258fb13dc15527e69b3cc2f46e SHA512 7c150deda5597fe3cf45a74a53e08375b38731b770f09c0836fceeeec1dce0656a347d5d0eb2276f0605217b89570c6ae5b81e6e2560e680d2edd5d4fad265e7
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.10.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.10.5.ebuild
deleted file mode 100644
index 5e446918b5e8..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.10.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+hotkeys"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 371e7164471f..7ef5d2ef2382 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,3 @@
-DIST kscreen-5.10.5.tar.xz 116752 BLAKE2B a30aee6a78ed0b38b9bd2370e0a22600ebdbb32c327851c9238f585f036c10413503c406b058a8dcb67209a3677532b62434db7104776f657741ac59e094b9bf SHA512 e51dfc358a008ba2b1d48c35ef1ab80292389a772008a07cf960c6b302cd9275b8afd1b96bd825a2d2564c5e8f207a547970682a1cd5433edab462e521511d57
 DIST kscreen-5.11.5.tar.xz 124060 BLAKE2B f9af27d740c3467700aeab51b8cf75cb087379dff833f2bb43c1fe4c958fc28204af41c81247d3835bb376516ccc2e400272b4cc9d0f9778af38a0fdf17b65f6 SHA512 a6224de2c9f3c2e539e97461ef2a7cdd626c78dc3a1e3eeebdc63b12368df26c83315497d647abd008f9246f9b7aa2f1b94425a2c6d366200811725b64d012ab
-EBUILD kscreen-5.10.5.ebuild 917 BLAKE2B 15c8b6c16c3141f3a7fc19ddc2f25feec9d34c061112fbf468d871577491a4371292d34c172755e5914647b59843cd09412396126c3503dcb122592fd978d27d SHA512 2212d44def3665f1b1a887159c75b221d472b323509a92f8641c0b48c3d5ae49a15a87aac908bf2acab53ea4412578982b7f166baa6d90171263c8cd51466096
 EBUILD kscreen-5.11.5.ebuild 893 BLAKE2B 96a21fedd04dd1f65d9400bc67aa2d2324c7b39bbccb2ed937f53c11a42386d1f14f8661d74720228b31007d610ea791f1095c1b5e69f1c602c245c16d367de0 SHA512 806d196ec98ca72aa1e2b81d5ed136cc0e61ca616e2ffed6ab0f08ea46dee62fdbb093bb891c73b473053b11a0abe8a74cd884f36f8c3d657067cd32e8182f5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.10.5.ebuild b/kde-plasma/kscreen/kscreen-5.10.5.ebuild
deleted file mode 100644
index 852674ec8caa..000000000000
--- a/kde-plasma/kscreen/kscreen-5.10.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 5c1a3131f1fe..4885ca91a41a 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.10.5.1.tar.xz 118440 BLAKE2B 5fb9dde17a5cff1bfb4b1de855cf51a0d8c47b2a0ec345f51c87ad3fbb4a154a73f7a56525fc9433f8879b287f7e2ff71feeaa46893f997331145e7ab14ca96d SHA512 cef3a7f48f9cdd0b3967a403848a5c8a37d1253d6d7fc73cdb12feddfe088e7a8a9128f2ae8d53e1847c75d64b369cf92facce725f17654ea085f9d03024a70d
 DIST kscreenlocker-5.11.5.tar.xz 125528 BLAKE2B 32bad30682da09245cc567f3cb79c0e0fd4ffdba26b47ef0c49c3094374503640cab7718033cb9c366ef7acddb6180995f4121b61ed1d04bbd867e1361e9d7ea SHA512 20eefbb4f970b2476d3df2e36bf74021d854f0ba61cba4946b3fc7190cff9edc9fef753d3bdde24ab135cc0dc5ad826cb22063db7b12ce817007355a98a3011a
-EBUILD kscreenlocker-5.10.5.1.ebuild 2078 BLAKE2B 6f7c5378a30a4d8756f83e2a4b750b6c4524f96fe299bf2908cd0497f93a2429cad40e0cd186fda061bbf6996dc0df01a10b8282543e66e1250e3e88bc5d5739 SHA512 c39743d3317f6fdc07ce79d82d7620390015454232897ce854c49aeaf4a98cf05b12950576a25fe375dfeb2f02df865e25707b6527e954a31615fc3a503b24e1
 EBUILD kscreenlocker-5.11.5.ebuild 2088 BLAKE2B 467a8c4a4da242250fb776c4b6e9a83777ea81296cc917d7ef79460b083ca0418429cc093964a259d6eb9d1b56237df15b0411721ceff9ab4694cf8dc00c8370 SHA512 1e133cc0cbfbf6505df1ceae6ec5b730e6f4997d68b00787e7cc5a934b843ea7d567febe5b83e7e1b2d2c37241ea0e11fafd1ae7eb40fb07bbd1106c0ed4a4d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.10.5.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.10.5.1.ebuild
deleted file mode 100644
index 900ae567e91c..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.10.5.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+pam seccomp"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-
-RESTRICT+=" test"
-
-S="${S/%.1}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 140379571089..d3c2c39fda43 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.10.5.tar.xz 20316 BLAKE2B 64417511cb1f5092a7cce0484d0862b9e57cf29034078fb620466c696179b7976a9fef4933a26b1f831bb4256143ffce633da2164ee79c9c0f2e09dc42b86641 SHA512 bf55ea1b5b79b43d1720c32bbd569aabdde1516d818de3ab567de95736e967327a58055e1e4f73c895c90b35b8149ecc4e736c9b067a05a13852ae4579d0cd6b
 DIST ksshaskpass-5.11.5.tar.xz 23168 BLAKE2B 74d10be7c303d0b7d1d8765e08a89986b4c1745e5f601982dd406cefc7c73ac684c1c05acdd355d45f5078e034ab9971467b4b76c0ae3a94800ce6480fa8c3f0 SHA512 34a8fe5da983a0fcc6d5d223120f2d23e0168a534d29941e83024110eafe981d6c46ee503abfb7bf8e072dc64060eea373c191ef0f8dbc5051cb2d968e6d49d3
-EBUILD ksshaskpass-5.10.5.ebuild 1258 BLAKE2B 84522d25c498e89e747946b6b62da85cdacac86d870b66acf5d2fc007e5a00225bd273a49aa209bf373977ef5b7c257681eb1f50f683324f75fcd15352fb0676 SHA512 bff03bec28e9118fb931db6258aa842d8922db51439fa10ec82e233e560b5015a4f44c1299f0ac917aba19b1f34f1ca48dd754203edccfc8df8dcdefeae2834c
 EBUILD ksshaskpass-5.11.5.ebuild 1235 BLAKE2B 76ec180a4af4bf1b0f861f3f86e8ba4df59d796a58bfd95dcf1e1dac2dcf9eb7e7682a714fef94cfbe1609518381e8d812b10f6665d2aa2100b6ac337181f5a7 SHA512 02ef5de19976e1b1aaa20ac0c6534bca3094a4befad0da39d557199455ec37d8f058e5aecea2be2a808bb98d5723ca511147ab7148a205fa39515d960d3b41eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.10.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.10.5.ebuild
deleted file mode 100644
index b500cb99227c..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.10.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 59329cc0558b..eed68eba0987 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,3 @@
-DIST ksysguard-5.10.5.tar.xz 486420 BLAKE2B b871dfe1c49ed46f532da03cc3888a16e24b6d607909d50dcfa551bbbb5df4004f5144585f6d06c508a7e2394396684a8bda56d37a36cb7642d0aa5275c7675c SHA512 ce94cca9a0b2b68355a650d0355d243c02ab0b551add1d4fd779e8baae90e2110d72e204c9515031d1faf028f4cdb752fa351e7404b7df356d65a2b37bc8856c
 DIST ksysguard-5.11.5.tar.xz 502228 BLAKE2B 49e82c26ea1c032e8e036e509c6a46c5da409f4092679a623bc26342f34ffa90d96306fb5638b1fe5a4edafe6f48af6ee12876286788b11145c00c1a32765edb SHA512 62af21b0d911abac5b66ccddeb0180c08199c0cfd8807d461fcfe444105ce7912efb5b8286e7f4955e97cb537edc32f046d646e82ecfc2d61ec39b2a53ed4d93
-EBUILD ksysguard-5.10.5.ebuild 1143 BLAKE2B a5d98c3979c6f7453e062218236ddddce81f2720c5ae51f9357966ea020e1689ce302633b1a0baf25eb992eb18b349db3e085965fa8afddc4af323f1bffd8c39 SHA512 2f2e59859ebe5ea562a57fe3c216d73ea88c568b869ead53b9874d9ea7e7933f7900977bbd645d6d03ceaf665f16925439f499cd55690bf8f275e00d6532d4f2
 EBUILD ksysguard-5.11.5.ebuild 1143 BLAKE2B bc2409ea028c763c822431abd58fe334cf5f3ab8430b43ec61cd53336e278f4a8bcb518e01d1de86607053fded35b8924bce024ababea2c904bd89159e57a6cc SHA512 3f50f88f16dde5a45742d8012d5a5601955b59c191aa82d0fa410425fa56e13faf3f8370a4f86d2eceda48790d9ffc12aeaf647a1689f5c1310ade072a8037c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.10.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.10.5.ebuild
deleted file mode 100644
index 12064cd2d20f..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 529aeea34c27..89833ae31127 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,8 +1,3 @@
-AUX kwallet-pam-5.10.5-check-graphical.patch 2956 BLAKE2B 7a4061b651eba332c1b01ae2131d486fd72e45f08932a7f325427ef73acdab3768dee486466e56073f29b0d1de451af6737793736cc4012934cd87c921623480 SHA512 05541b77a1aa21a157d6af1d8c4e97a1b229de098d121dec7784b11f37a8352bf51b69851aeccf135908805270052143f426db165b1a160fdeb0b5400b863ff9
-AUX kwallet-pam-5.10.5-cleanups.patch 6488 BLAKE2B c24a5793ad95f76144252278fb54bd40b1c1d7198da17197c98032189c38c679228ece35e6ed9ec967ccdecba0e55fe41cc634f96971fc86bdadce601476912c SHA512 19791dfffb8f9978269911cf6d8ef7b3ad1c658f3c377ab6d4f967b821fba49952a67c157a818bf79343162acd9d273bd809a370baa0971a4c9b460caace0335
-AUX kwallet-pam-5.10.5-privileges.patch 1538 BLAKE2B 3fe2d76222a83d359c1d6fbc890d2753ba5bb3dada8ad3a7e9b65d4ba3b45edc25a9faea9bb42dd21a1934403270cd34819573be998a9c4ba9fe79834b08faa5 SHA512 010e1be15771d3a3c141fdc3cbeb989c295efc46da885d175c3dd76839cad6bdce3e74937619de6d54a94897a827bc8c78ef73b04b4561c4d7d0e55aee350a9b
-DIST kwallet-pam-5.10.5.tar.xz 17908 BLAKE2B dc1a49c25b8d87dc51cc4940016f1ca84964e237126f33e18f71e58ebdce92a00e37d7e0cdcd1abdf25c70a6af423bc571d29a68ec45233b28b100ea68d86051 SHA512 7a2e1a0a85ffc7d9dfd6a1dc8a16d7117f30fc3b983756e28fc11a19bddf99a273842a1774ccf93c5c879a1d899212f6b6d0808fa14eb17260396f5c207e3dc5
 DIST kwallet-pam-5.11.5.tar.xz 19060 BLAKE2B 814199f67c9026ca420c66d0dbe48ef9f1cab2d30bf3784cb3441af56ceec9ab3841dcf41021bbc5d42edffc0fc0849b714c1f279065c974bba794924fc0879c SHA512 1602ef0eeec86c653c2a99c1c514133367e7dee07d11ffbe0533066d895c71e3b7dd90187cb353446b717738600143cd09de1a5baffad5113152fd616bef90ee
-EBUILD kwallet-pam-5.10.5-r1.ebuild 1616 BLAKE2B ea187d1644a55c5b6ed3c0a8bafa406f6ace4244b3b32a7b2062879747a15669257f91b1e3fa58f31c172e5c8c7ea8b3992d6c936f82719aec19c8b0b4bfcb8d SHA512 1246397b1a1ca458613e81e03470aee6b59bec8ce0638bad870bc0944444d918cf5528d163a95b59a7147499e2086bdf48257c94363926f1cab22a1d757e622a
 EBUILD kwallet-pam-5.11.5.ebuild 637 BLAKE2B e60fd96ae3c9b69d8d79975ea5fa340e625314f6769a82ad46546b1f7791bf28e95a7e3aae40e1c07b68b373a32c0b52930951957d36f087d7b3bec384314a84 SHA512 502c7e484ae0da13c6c19042308a8cbf7c95544c4f302b42f6743cafaba8214a0ac6b0f05f743c00806c73dd5001f8c238642191e5d893994adf562e9965e444
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-check-graphical.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-check-graphical.patch
deleted file mode 100644
index 61ea4604586f..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-check-graphical.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f3b230f7f3bf39dc46b97a216aa7c28595d20a7a Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 3 Aug 2017 09:50:30 +0200
-Subject: Check for a graphical session
-
-Summary:
-Avoid running if it detects a text session. This can be overridden by adding
-"force_run" as argument.
-
-Test Plan:
-Put pam_kwallet5.so as optional in a global common-session pam file
-that is included by all other services. It is not invoked when logging in from
-a tty with getty, sudo or su and still works when using SDDM. When adding
-force_run it runs in all cases.
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D7125
----
- pam_kwallet.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index cba57e7..46720a5 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -72,6 +72,7 @@ const static char *kwalletd = NULL;
- const static char *socketPath = NULL;
- const static char *kwalletPamDataKey = NULL;
- const static char *logPrefix = NULL;
-+static int force_run = 0;
- 
- #ifdef KWALLET5
- const static char *envVar = "PAM_KWALLET5_LOGIN";
-@@ -98,6 +99,8 @@ static void parseArguments(int argc, const char **argv)
-             kwalletd = argv[x] + 9;
-         } else if (strstr(argv[x], "socketPath=") != NULL) {
-             socketPath= argv[x] + 11;
-+        } else if (strcmp(argv[x], "force_run") == 0) {
-+            force_run = 1;
-         }
-     }
- #ifdef KWALLET5
-@@ -246,6 +249,24 @@ static void cleanup_free(pam_handle_t *pamh, void *ptr, int error_status)
-     free(ptr);
- }
- 
-+static int is_graphical_session(pam_handle_t *pamh)
-+{
-+    //Detect a graphical session
-+    const char *pam_tty = NULL, *pam_xdisplay = NULL,
-+               *xdg_session_type = NULL, *display = NULL;
-+
-+    pam_get_item(pamh, PAM_TTY, (const void**) &pam_tty);
-+#ifdef PAM_XDISPLAY
-+    pam_get_item(pamh, PAM_XDISPLAY, (const void**) &pam_xdisplay);
-+#endif
-+    xdg_session_type = get_env(pamh, "XDG_SESSION_TYPE");
-+
-+    return (pam_xdisplay && strlen(pam_xdisplay) != 0)
-+           || (pam_tty && pam_tty[0] == ':')
-+           || (xdg_session_type && strcmp(xdg_session_type, "x11") == 0)
-+           || (xdg_session_type && strcmp(xdg_session_type, "wayland") == 0);
-+}
-+
- PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
- {
-     pam_syslog(pamh, LOG_INFO, "%s: pam_sm_authenticate\n", logPrefix);
-@@ -537,6 +558,11 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, cons
- 
-     parseArguments(argc, argv);
- 
-+    if (!force_run && !is_graphical_session(pamh)) {
-+        pam_syslog(pamh, LOG_INFO, "%s: not a graphical session, skipping. Use force_run parameter to ignore this.", logPrefix);
-+        return PAM_IGNORE;
-+    }
-+
-     int result;
-     result = pam_set_data(pamh, "sm_open_session", "1", NULL);
-     if (result != PAM_SUCCESS) {
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-cleanups.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-cleanups.patch
deleted file mode 100644
index 38a333131e93..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-cleanups.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From a33ec22b96e837899528b05963eae8ea6b01171a Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 3 Aug 2017 09:02:14 +0200
-Subject: Several cleanups
-
-Summary:
-- No cppcheck warnings anymore
-- Use snprintf everywhere
-- Avoid pointless multiplication with sizeof(char)
-- Avoid memory leaks
-
-Test Plan: Still builds, works the same as before.
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D7123
----
- pam_kwallet.c | 44 ++++++++++++++++++++++++++++++++------------
- 1 file changed, 32 insertions(+), 12 deletions(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index d88c5e0..cba57e7 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -151,13 +151,14 @@ static int set_env(pam_handle_t *pamh, const char *name, const char *value)
-         //We do not return because pam_putenv might work
-     }
- 
--    char *pamEnv = malloc(strlen(name) + strlen(value) + 2); //2 is for = and \0
-+    size_t pamEnvSize = strlen(name) + strlen(value) + 2; //2 is for = and \0
-+    char *pamEnv = malloc(pamEnvSize);
-     if (!pamEnv) {
-         pam_syslog(pamh, LOG_WARNING, "%s: Impossible to allocate memory for pamEnv", logPrefix);
-         return -1;
-     }
- 
--    sprintf (pamEnv, "%s=%s", name, value);
-+    snprintf (pamEnv, pamEnvSize, "%s=%s", name, value);
-     int ret = pam_putenv(pamh, pamEnv);
-     free(pamEnv);
- 
-@@ -240,6 +241,11 @@ cleanup:
-     return result;
- }
- 
-+static void cleanup_free(pam_handle_t *pamh, void *ptr, int error_status)
-+{
-+    free(ptr);
-+}
-+
- PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
- {
-     pam_syslog(pamh, LOG_INFO, "%s: pam_sm_authenticate\n", logPrefix);
-@@ -297,14 +303,17 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons
-         return PAM_IGNORE;
-     }
- 
--    char *key = malloc(sizeof(char) * KWALLET_PAM_KEYSIZE);
--    if (kwallet_hash(password, userInfo, key) != 0) {
-+    char *key = malloc(KWALLET_PAM_KEYSIZE);
-+    if (!key || kwallet_hash(password, userInfo, key) != 0) {
-+        free(key);
-         pam_syslog(pamh, LOG_ERR, "%s: Fail into creating the hash", logPrefix);
-         return PAM_IGNORE;
-     }
- 
--    result = pam_set_data(pamh, kwalletPamDataKey, key, NULL);
-+    result = pam_set_data(pamh, kwalletPamDataKey, key, cleanup_free);
-+
-     if (result != PAM_SUCCESS) {
-+        free(key);
-         pam_syslog(pamh, LOG_ERR, "%s: Impossible to store the hashed password: %s", logPrefix
-             , pam_strerror(pamh, result));
-         return PAM_IGNORE;
-@@ -385,9 +394,8 @@ cleanup:
- static int better_write(int fd, const char *buffer, int len)
- {
-     size_t writtenBytes = 0;
--    int result;
-     while(writtenBytes < len) {
--        result = write(fd, buffer + writtenBytes, len - writtenBytes);
-+        int result = write(fd, buffer + writtenBytes, len - writtenBytes);
-         if (result < 0) {
-             if (errno != EAGAIN && errno != EINTR) {
-                 return -1;
-@@ -450,6 +458,7 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
-     if (result != PAM_SUCCESS) {
-         pam_syslog(pamh, LOG_ERR, "%s: Impossible to set %s env, %s",
-                    logPrefix, envVar, pam_strerror(pamh, result));
-+        free(fullSocket);
-         return;
-     }
- 
-@@ -459,12 +468,15 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
-     if (strlen(fullSocket) > sizeof(local.sun_path)) {
-         pam_syslog(pamh, LOG_ERR, "%s: socket path %s too long to open",
-                    logPrefix, fullSocket);
-+        free(fullSocket);
-         return;
-     }
-     strcpy(local.sun_path, fullSocket);
-+    free(fullSocket);
-+    fullSocket = NULL;
-     unlink(local.sun_path);//Just in case it exists from a previous login
- 
--    pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, fullSocket);
-+    pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, local.sun_path);
- 
-     size_t len = strlen(local.sun_path) + sizeof(local.sun_family);
-     if (bind(envSocket, (struct sockaddr *)&local, len) == -1) {
-@@ -477,7 +489,7 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
-         return;
-     }
- 
--    if (chown(fullSocket, userInfo->pw_uid, userInfo->pw_gid) == -1) {
-+    if (chown(local.sun_path, userInfo->pw_uid, userInfo->pw_gid) == -1) {
-         pam_syslog(pamh, LOG_INFO, "%s: Couldn't change ownership of the socket", logPrefix);
-         return;
-     }
-@@ -655,7 +667,8 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
- #else
-     char *fixpath = "share/apps/kwallet/kdewallet.salt";
- #endif
--    char *path = (char*) malloc(strlen(userInfo->pw_dir) + strlen(kdehome) + strlen(fixpath) + 3);//3 == / and \0
-+    size_t pathSize = strlen(userInfo->pw_dir) + strlen(kdehome) + strlen(fixpath) + 3;//3 == /, / and \0
-+    char *path = (char*) malloc(pathSize);
-     sprintf(path, "%s/%s/%s", userInfo->pw_dir, kdehome, fixpath);
- 
-     struct stat info;
-@@ -666,21 +679,26 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
-         FILE *fd = fopen(path, "r");
-         if (fd == NULL) {
-             syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
-+            free(path);
-             return 1;
-         }
--        salt = (char*) malloc(sizeof(char) * KWALLET_PAM_SALTSIZE);
-+        salt = (char*) malloc(KWALLET_PAM_SALTSIZE);
-         memset(salt, '\0', KWALLET_PAM_SALTSIZE);
-         fread(salt, KWALLET_PAM_SALTSIZE, 1, fd);
-         fclose(fd);
-     }
-+    free(path);
-+
-     if (salt == NULL) {
-         syslog(LOG_ERR, "%s-kwalletd: Couldn't create or read the salt file", logPrefix);
-         return 1;
-     }
- 
-     gcry_error_t error;
-+
-     error = gcry_control(GCRYCTL_INIT_SECMEM, 32768, 0);
-     if (error != 0) {
-+        free(salt);
-         syslog(LOG_ERR, "%s-kwalletd: Can't get secure memory: %d", logPrefix, error);
-         return 1;
-     }
-@@ -691,5 +709,7 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
-                             GCRY_KDF_PBKDF2, GCRY_MD_SHA512,
-                             salt, KWALLET_PAM_SALTSIZE,
-                             KWALLET_PAM_ITERATIONS,KWALLET_PAM_KEYSIZE, key);
--    return 0;
-+
-+    free(salt);
-+    return (int) error; // gcry_kdf_derive returns 0 on success
- }
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-privileges.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-privileges.patch
deleted file mode 100644
index 8b45b293bbf9..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.10.5-privileges.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1a01e1eb870e1ab1d96a8641f1f3500af646c974 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 3 Aug 2017 09:27:10 +0200
-Subject: Avoid dropping privileges by initializing gcrypt secmem
-
-Summary:
-It's a documented side effect that initialization of secure memory in gcrypt
-drops privileges if getuid() != geteuid(). This results in breaking setuid
-callers, like sudo or su.
-
-Test Plan: Can use sudo again when pam_kwallet is involved.
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D7124
----
- pam_kwallet.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index 46720a5..20d9603 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -722,12 +722,18 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
- 
-     gcry_error_t error;
- 
-+    /* We cannot call GCRYCTL_INIT_SECMEM as it drops privileges if getuid() != geteuid().
-+     * PAM modules are in many cases executed through setuid binaries, which this call
-+     * would break.
-+     * It was never effective anyway as neither key nor passphrase are in secure memory,
-+     * which is a prerequisite for secure operation...
-     error = gcry_control(GCRYCTL_INIT_SECMEM, 32768, 0);
-     if (error != 0) {
-         free(salt);
-         syslog(LOG_ERR, "%s-kwalletd: Can't get secure memory: %d", logPrefix, error);
-         return 1;
-     }
-+    */
- 
-     gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.10.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.10.5-r1.ebuild
deleted file mode 100644
index a92f06b64222..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.10.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cleanups.patch"
-	"${FILESDIR}/${P}-check-graphical.patch"
-	"${FILESDIR}/${P}-privileges.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				elog "    ${1} - ${2} ...GOOD"
-			else
-				ewarn "    ${1} - ${2} ...BAD"
-			fi
-		fi
-	}
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.a Have the following lines in the display manager's pam.d file:"
-	elog "    -auth        optional        pam_kwallet5.so"
-	elog "    -session     optional        pam_kwallet5.so auto_start"
-	elog "4.b Checking installed DMs..."
-	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
-	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-	elog
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 54e9924fe5e8..cbfe0df548b7 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.10.5.tar.xz 18600 BLAKE2B 3201bfbc02e551b8e77a1838700a365e0a487620ac19855ced9159ec22cdb81044258e20ecb00a880f838d4917925cf98962edbabfa1e93ee1afcce51c107272 SHA512 fb8342f476c4ca51fa720f8767146ca19597d600877762bb467810b66073de172111ba3aa469c1fb24125a2cf60a87c0158dc90a9c036c48bc0c0ce387be1440
 DIST kwayland-integration-5.11.5.tar.xz 19080 BLAKE2B 3f1bf365f4886398fee77da4a1716232cceb691746ed6f313d6bb48f46d5813eacfb32381b9cf3665cfb7706a04b863d3545be4ddb5749176ac25055e5d643ea SHA512 246ff96d30d6a212aedbc9e7a5680e20bedfcc398591f670b0c96f68127aab547e21537aa11f2db68c505845c7897ce8be657b3430b420033100a774bcf6c1af
-EBUILD kwayland-integration-5.10.5.ebuild 526 BLAKE2B 5b5eca0d3b109a7edff0178f8f7db18e7ff4125cc618fc7dff52cefb025de52b33184cc5fe9a3abb243fa05659126d520f77c1f3539a23890ede7f024c0fd778 SHA512 914ec77089d49cc2475aafa06dc0666fb88d94cfee0325580f552552e62291d96f0bd6390a907a2f3561f4a8339b1fa3403e4480f945d3ade838e981622dcb71
 EBUILD kwayland-integration-5.11.5.ebuild 503 BLAKE2B 1b4b9be2a97f6051ab0e45da929edd0c106f056f06f8918e2482eeb22087ba790a0eb4a5b3234481f107adc7315d1dc547439cd04c6e82460a9a59707267fe65 SHA512 c21a517a77603c7560c7833cdb53dde7c4599ba5d777c90987e8d606c22ff8a1e4a43378611bbf820f4e65d1238d7f1a5e98f8786f48c8a28dc73512473bf923
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.10.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.10.5.ebuild
deleted file mode 100644
index 6b378b2569d2..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.10.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index bda8b2c3f194..925ec018972c 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,8 +2,6 @@ AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771
 AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-5.8.7-glibc-sysmacros.patch 1016 BLAKE2B db65f2af7eb305398649e3f73445a3e658725fca426fa4d3785e3a1aae669005b776499c21237ecfb834e1b4b95664dce754e367452ac33a346084453f7eae1b SHA512 9b8d8754a4e0c8a9421bc7bf04932b5dabfd9c0c7f56fc1ebe6562afcdbb2d3495c009f4cbfa0a8a665e363ffeb9ac9bf3c7a5fbba7f7d1da7571f7cab6908a7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
-DIST kwin-5.10.5.tar.xz 4674932 BLAKE2B 5e10f20220f750e49394395e3070ae4259aae3fc6109dbbb5540a92b6ecafbacc8c1ab2187be17413abd60a0d9b01071b2216bc44a80cbe3754ee13311dfb980 SHA512 b679dac07b7cc71c9ac7f4755282f8e30d5c2757c7cf9f29ed4f7653c70832140171e1227299a726af8aef1919db83b115dc4091ff80851b0afc53a4cf06840a
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
-EBUILD kwin-5.10.5.ebuild 2344 BLAKE2B 0bd5e7f96a3acb77f99944a96cf26748cac7ec7ac48288bbb29d1f10584d31a88bbea908821c9a3764d2848bc1fbc78ac72d41cd70936e1e1947f598cb46e889 SHA512 d8194a55406f9299772e80cde1afa6363b689efb7bc7a289c72925f92351adbb18c688e7908ccab476eca40a35561a0ef9eb0a2f435b70ee08459268ea20c5a5
 EBUILD kwin-5.11.5.ebuild 2413 BLAKE2B 3cc059fee6f94872050cf63e5d15998de7a25f9b2f22cfe31a11cd8f4b632f43d6b7b77902ed3207620b5755389a102d10902e8b7cf464d7b110f3f718a9c575 SHA512 93e83dfd948e22611a514b084bf964eacdeea645b49330e57df71d522438a4766836e71d60742e53890022d4e5a4cd9b3130fd026c6738a00ea70c0dda3f263a
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.10.5.ebuild b/kde-plasma/kwin/kwin-5.10.5.ebuild
deleted file mode 100644
index 43f5862227f0..000000000000
--- a/kde-plasma/kwin/kwin-5.10.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.5
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-	test? ( x11-libs/xcb-util-wm )
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 883f4a99ad61..51e17164492d 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.10.5.tar.xz 20392 BLAKE2B 1b2f46d4291e466015bf307d5e6b87a0bc3ad4dceb27815e604fb68567c95a9044a2c08be7b6bbf5b2d2620d5e012e3ca9b1ab68137b5df2d916953bf0d43afd SHA512 f5a8de41d75a522125d04ab294a02d34850755587ce16e9be43394fa87267f69168325e0d17caa0b1b47901e8cb174f20af10e22107ee646d28150d3b2a3c698
 DIST kwrited-5.11.5.tar.xz 20672 BLAKE2B 4d976948ec85e92981a28e99a291c75dcb888159e1203cbfbe35a238132e13fee682cf1566b455ca7cc2bd39c84e4449fca915cc25037a0a149836ab18272833 SHA512 a8ef4c899aa4b38265c470cbdb0c1b47951567f2637255837febec344cb79920986dda6838c60723aa9474e5d632fb8209e6b3090c52a723b1618e134ecb6246
-EBUILD kwrited-5.10.5.ebuild 501 BLAKE2B 9669dd33b7144d5930198fe77d9c356e5ded21f04c8c93957ba19f328b7e1afcf766ee5988cb7d7fb4032baeb198d8107c79cc74eab0636903e780dd9a422ab7 SHA512 87f8762fc6e560229909304a863fdcd5f4dc08ab43c3af16985997fb14aa0a4fea35b6703e719ab7bb188eb615225a3a435306609e853bc83f53840904625138
 EBUILD kwrited-5.11.5.ebuild 501 BLAKE2B 10c4a3455ad22aa30db3d80773b354a1d5db3860625103e325099b06de6f3b45093f74d538f1fbca081f3ea926a4c4b91e738380a9a5abd2b624255ffc9a7c80 SHA512 aa11e4f344edb76da01f6e8ccedb8be4ef3e58eccb1de6de2b39550c8faba29308c8759671ed03d1d720e8dd0fc1787db343349a2885c48bd911600611586e3f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.10.5.ebuild b/kde-plasma/kwrited/kwrited-5.10.5.ebuild
deleted file mode 100644
index 771cd37316d5..000000000000
--- a/kde-plasma/kwrited/kwrited-5.10.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 2d6d0aa5d883..8267dfae9522 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.10.5.tar.xz 94176 BLAKE2B 2df73d2dd83321ab520c2f6026026d0eee2103aef197fe7b3163d145b1a8f8e415297cfe3876f6828903f77dcd583e17474325557fea45fbe936c65079399c84 SHA512 5f9306c6c3ad2ba923884786a733e2fb334602e18711e39397819acb790cb4968b5549e3666db49d6db9d646e83b78f52173367fa52bfd68c4e38e0395573d5c
 DIST libkscreen-5.11.5.tar.xz 96556 BLAKE2B e0744934eab4e8f906000ba61ccb0bd8dadde9e699118195c1ff795a97c6625ee89d8478f67f19fcf8c990b339ae9eb5f088b9530a555e98bc55d4d190eade05 SHA512 40f5753d08d7bbed5693cbd2696a680565f4012412b6a097048a773ccc15af59a37659e3b73c3695c012b6c7435a05ff04f05009d9cac7971e40d75696ffacec
-EBUILD libkscreen-5.10.5.ebuild 501 BLAKE2B 5293d2254b5c655fb6cfcbe2515c0a526736e7ee9f9222da278eee8501094b1d6074f85bc7d6b3921fd25b70f7e24c03a3c10aff4324928c026e0b53dd70215e SHA512 d655fc1d1230bd119317706fb7327e1499905ac8d47fe4a9ebabfe52c5911795d9f6cd61790354b67089473c3a3eff75298b424b388153a2d8d4f8d53e051465
 EBUILD libkscreen-5.11.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkscreen/libkscreen-5.10.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.10.5.ebuild
deleted file mode 100644
index a63d704e24c4..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.10.5.ebuild
+++ /dev/null
@@ -1,27 +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="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b9ef0d45e550..b9c33dd1d580 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,3 @@
-AUX libksysguard-5.10.4-unused-dep.patch 1848 BLAKE2B 2b365319e9c66ee0d09ffcc79bb1310e10906eae8019bde9e1546b596b43cd89e122809c8209d558c9bd5abc6229eb67bd81fe4db9154bff8f60230934fa2bc6 SHA512 5d0ce5dcb5d61f6203eb9a537fd40595b6b993a3d130d114bebe2ff3aee050286cb2151371ed78ce5bef0cc5f66c827a8c9567acc574df4e8dd57052de471847
-DIST libksysguard-5.10.5.tar.xz 565180 BLAKE2B 543f7ae83e728e5f88e286f6f6cbfb13c46d52b8691a176756ae225d3dcf1a7015c4f397fb87e53f2134779a9d1eef5eed37cb547d0d3cef387ce126ef166f13 SHA512 18c649a0fabae7b79159ee70fa1aa60c4dd6d179bdb485f2dfe80d0254d937dee811874c19fe204d8ea164b5907b45ba0ca971b4229551bf5f9330e85916284c
 DIST libksysguard-5.11.5.tar.xz 576200 BLAKE2B 8e17dc3eda1a69ea2a37664c80695c77087779138e8b4b99c9ab0ae444074d9f78194db55b00170d3d917310c0c1ccbc5c77d3aa07dbb2a31210ff4e8a9155c3 SHA512 3a4c08aba07a71841643fc830a77ae4684ed41a8f26e6222d202738fb3c9f7ee2e816f15bcbbf5b3032fc100d33feb4d6771bf335c70548ab3bb4440d6d90286
-EBUILD libksysguard-5.10.5.ebuild 1298 BLAKE2B 6d76a6a57069f17ecd50e3ba8c79eea868a7691f39c0756086d6b495bf380c9bb7dd97f2f47b582ac5f440235be0a18f3964b43dea87df97baec34e589136ffb SHA512 5d732ea65941e7b397fbf90e216415be9a18cb8d4b1561790a96d36d5e5c86280fa43815833246f2756ce1e0d043dc1f513502fb8b4a56bf07782aa7b3940e9b
 EBUILD libksysguard-5.11.5.ebuild 1241 BLAKE2B b971b2aeda2a3ee5ebc8438502262823d3af09d264e7fa0f209e1461b9e10c484911db10766c63542603ef101e7083ae148d3b944f2e081bfd5c9926b8e1fa0e SHA512 70ad7a0f43651b8f0fce0f394464f43a6a238c2e2c7b360b1666b5ac7bb054c7aa511caeb92dfdfe5c6c7327f7516fe0b05ae8372f12a6de0defbd844e5bc499
 MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
deleted file mode 100644
index f76c8df1cbfa..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b6ed1afd8a8a4104a9fcf09c3322bf6d69231622 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Mon, 7 Aug 2017 00:25:11 +0200
-Subject: libksysguard does not appear to use QtScript, but just includes it.
-
-Removing it makes it build with a clean Qt5.9 where QtScript no longer exists.
-
-Reviewed by: davidedmundson
-
-Differential Revision: https://phabricator.kde.org/D7036
----
- CMakeLists.txt           | 2 +-
- processui/CMakeLists.txt | 1 -
- processui/scripting.cpp  | 2 --
- 3 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 84a4479..83987ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,7 +9,7 @@ include(WriteBasicConfigVersionFile)
- find_package(ECM 1.2.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
--find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets Script)
-+find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets)
- find_package(Qt5WebKitWidgets CONFIG)
- set_package_properties(Qt5WebKitWidgets PROPERTIES
-                        URL "git://gitorious.org/qt/qtwebkit.git"
-diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
-index 1927839..4dfcbd4 100644
---- a/processui/CMakeLists.txt
-+++ b/processui/CMakeLists.txt
-@@ -35,7 +35,6 @@ target_link_libraries(processui
-         KF5::ConfigCore
-     PRIVATE
-         Qt5::DBus
--        Qt5::Script
-         KF5::I18n
-         KF5::WindowSystem
-         KF5::Auth
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 2aa7088..afdf949 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -28,8 +28,6 @@
- #include <QDirIterator>
- #include <QFile>
- #include <QFileInfo>
--#include <QScriptValue>
--#include <QScriptContext>
- #include <QTextStream>
- #include <QDialog>
- #include <QUrl>
--- 
-cgit v0.11.2
diff --git a/kde-plasma/libksysguard/libksysguard-5.10.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.10.5.ebuild
deleted file mode 100644
index 6b23945c2112..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.10.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+detailedmemory minimal X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-proto/xproto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index e12d3eb7859e..89352028f250 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,3 @@
-DIST milou-5.10.5.tar.xz 56088 BLAKE2B 2414f9c5c9ed5a237f193a522c7584719b2b8963cce6e87f756b43c37b65761a68340ae7c0cf2ef983a8bd931c0fd3d8d6c2c740423f5579e72ab1bfcd6ebfbe SHA512 5c5bc1d1ec03bf0e74cb6c201ca7bd7ce587cfb2e34a6811e7905e16e1e75ca90601a93a2238068e0a780d6a7371596b70170fcec34b83781da53f8f9dbb35e9
 DIST milou-5.11.5.tar.xz 61832 BLAKE2B e241f388a6a17243123329a8075b5453603a3b1f174205a1be78306c3fcc84f56f78334be3bd58c54c90c722ea64927acadf2f1108354fcfa613960b9abaf82e SHA512 c0db62a1b8e6e72f4d738d9f26d7d16d3b1e77db1e6566451b23cf32f2b2060ab3ffa439caf1edea2c65c80d73b6e68aa054c73b54aba3fee93446a70d65557f
-EBUILD milou-5.10.5.ebuild 715 BLAKE2B 5b1912591181478044e45aaabb4f92bcf32f4538903a757bd311fd9daac7c558b544bfab9ec66be9bd195b172f1477e6464714219dada2da4db2bd900d96984f SHA512 1ff9fbf37fd1d3a4b8f59321f993b2060517aa48fd1b613895632488804379e36336a9116df6ba7604f0081fe4e6f388dd6c1b6dbece88bd5381c364ab363e66
 EBUILD milou-5.11.5.ebuild 692 BLAKE2B 6cf9633673d92a1fe2654f5f0cd4ea60e5db47bf4120ed090ce9cbb691255b5a854ca55d2aa608f4a0751766e0ff0c05018cfbe35bab4782c68fc7d221efe05b SHA512 78fb4c265c8b09fbca47b998191c7fbcaeabf7224d0a43caeebadf942071dd92e3ca088e4de5a5678c85ffd50a140c66914a23654c9e3541e1f67617a81efc73
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.10.5.ebuild b/kde-plasma/milou/milou-5.10.5.ebuild
deleted file mode 100644
index 9423858d2523..000000000000
--- a/kde-plasma/milou/milou-5.10.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 5b168ba5eb3a..1084b1a17bd9 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.10.5.tar.xz 4468276 BLAKE2B d14bc24fa7f9d7193f5c15fcbefeaf6b2c0eaa6bce33cbf42fa3f868dbc7326e52e4c08ea05dda8ac6fa00446bb7c969539e1ae428a4b9070a338947d982d616 SHA512 176db69036a3da47544075b9b83059f48d6037be21095ffc622811982bf32ece357a37f501f0528abf6ddd974c5c7d680474c325b752bd2f425c81a33fe94f71
 DIST oxygen-5.11.5.tar.xz 4489196 BLAKE2B 89d8e9742a68b59ad03c697875ca8e1e49e253668db0081a04922b057a7ba67bba1ab785e1507bf4e16ceb3ffa63f5adda54fead63a1704d7fe4298408db4b63 SHA512 101b9a3ace2e619510702feba868bb98cb873b18730d3705803e047ce2b0c0a761c884e1714fc654f85775e461c0784d199baa1b9026c6b8f8a4cfecce2e4209
-EBUILD oxygen-5.10.5.ebuild 1996 BLAKE2B 23a531eb80cc63c05003d03232de184acebd2dff1e0e56ea24213fa10c16a18aa917e62e22f390e6488147f30d77adb31b5c1cb6eabee352fcb7043de933bd10 SHA512 22ba19d1265b008ab95f15b19959d53de0bfb09f7fe5fc586606a611a192823274043ac4fc03f6ae324456aef7a4ab959701b45c669efb51119ab8ddaa23bbc3
 EBUILD oxygen-5.11.5.ebuild 1978 BLAKE2B 6948b48c969b6ab6bdf8eaa5a9c2ec0c4c20c770e1ee79f5fbfe47f5ad6f2d3f1a98870883393f836022902e2879ed17cc509f1081c15b3d8d94dddef23f804b SHA512 6d6a1708c3af1600865fc59db2e538e200a6f4c77953016da7493f68c00b237218192fd786e94fbb15e3d5b0fd68d768e60e5380a97e8f4d729706c9f94b5a04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.10.5.ebuild b/kde-plasma/oxygen/oxygen-5.10.5.ebuild
deleted file mode 100644
index 00899dcd423e..000000000000
--- a/kde-plasma/oxygen/oxygen-5.10.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5 multibuild
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="amd64 ~arm x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4
-		>=dev-qt/qtdbus-4.8.7:4
-		>=dev-qt/qtgui-4.8.7:4
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-	qt4? (
-		dev-util/automoc:0
-		virtual/pkgconfig
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	qt4? (
-		!kde-plasma/kstyles:4
-		!kde-plasma/liboxygenstyle:4
-	)
-	!kde-plasma/kdebase-cursors:4
-"
-
-pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 524ef9637b22..ccad393eff47 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-desktop-5.10.5.tar.xz 6076092 BLAKE2B f48d3cb715c4fdac802aa7405940fe517676e6dafbf3c4fbc08f5c32fca4a9bc8ff3bf98de07d28d83c374cdb80ccd66854f7fad1abf62a43746cdd5e3275103 SHA512 992564270216f7bd96dff59bbe35ecb78ceb25b99d5eb3c7c9e1241003aaafafdfb4fd728889b8b95f9252a9a397de95abb9dfa64dcf876c8d713cbd8e1951c4
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
-EBUILD plasma-desktop-5.10.5.ebuild 4276 BLAKE2B 85c3118f47e664434d1811209247637583f95cdf7e25191387df6b21be0c3869622ef4c2228a891e7e0f85d111a509709a6f5ff6bf2e3d47ccf17913518b4c07 SHA512 d1dcd30d8f8243d13058098d521e4a18640ababa3c78145f9fe9069ce40722b94003b9dead7699de87e9810630f8f67bdf3690867b9757a471ad2b439c18a672
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.10.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.10.5.ebuild
deleted file mode 100644
index b5492684f4c3..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.10.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	appstream? ( dev-libs/appstream[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
-	!kde-apps/kcontrol
-	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-pkg_setup() {
-	if has_version net-im/skype && use legacy-systray && use amd64; then
-		einfo
-		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
-		einfo
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package input_devices_evdev Evdev)
-		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 084ed2106b25..1884903c4e24 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-integration-5.10.5.tar.xz 51704 BLAKE2B 9dab067972e4feb9720297ed95cba2242f3f7362bd43715007aae583ce9ff4dff100d8b9ced914e40157fa9a982fb576dc4a1c814b1e2f4ebf6382a184009cd2 SHA512 18fbd5c6374ad65119a3df0bb93caa38cc0b4e599be4b20aaf625b7ad1c27a1bcab5efba8dfc7932f0fd64a0ae039251b02dfb0228382a49ed685dd1e8cff900
 DIST plasma-integration-5.11.5.tar.xz 55856 BLAKE2B 4c1d56f9de0007d369eeca5f7a992f95ac9a7853ad30f80b86a762b2ba88a5c87cd0861590e640466314edc4436052063be7e9718754a73388eb60baa253285f SHA512 2e14b0bae19e344dd0ddd27b48ddf9f9075b773c295b58a35b05d0c9d11c1573821ec1c25ae33da4e3a4091386301aef15c51f4d1163aa195a1de5f3ea1844c4
-EBUILD plasma-integration-5.10.5.ebuild 1030 BLAKE2B a7e384d72351b98214e79c5b2068efe6a69ea60e814873c0a13d20aa0735c45bfcdb56bb98005acf90899969285590203135b726a9c5c17cd03772d0c3901ec3 SHA512 bd75419ba6dcfaa93b7d386363a95f000da73296fa45085d5800a245bcd700116115205658f35fcc29ba1f769990f4891417c2363a57d2a8a91932da5ed021cb
 EBUILD plasma-integration-5.11.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.10.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.10.5.ebuild
deleted file mode 100644
index 7aaf53fa5333..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.10.5.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index e08e4705ad6b..8f083e7e50b5 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.10.5.ebuild 1924 BLAKE2B f5d36f1ef9e2d74e3b9fa2b3922f3cfdfbe8e00538959ce6147faa05cb1ad93b6f661bdd67cbde356b3cfa52e70e3e389344f0688ca2e80cc7c6b6926972f472 SHA512 547d3c9271a99e113babcad63691e90179a0fdb596a11fd78240e79aaa78f77858f58b87e138971d18ebba27bb1e57ed2e0e272ef1008de11068a4c7d2f707bc
 EBUILD plasma-meta-5.11.5.ebuild 2000 BLAKE2B bb5660a59599dd6d868010aa62a21baffeaee05667c921864a0cea0a6ae52bd6ecea67693d8a91498e6c3c73ccbaf13745a602425913766f004666828a799343 SHA512 ff0cce1055e377dfcd256a2bd26aa53d7ea6c2342bc4b1ad7bc6a07e5a0db809a003ba1bc37c31d2d6bc7cfd576e751dd41c7a38b8ed800a06c8e940186696b8
 MISC metadata.xml 1094 BLAKE2B 881a75bded925cb9136a3ed2322cef73951f6c3b4af1bd60e8fc5c9733b8345699ea3dc06d030d4bb49ae1fa366b3d3596c7bb9886d0dce352536ed706a963ed SHA512 dbc1efc45b907453ebb2c0e0865d5b6c3be9235686e86b37ca9e3f8b5b73644058590cc59db8545c4f7af68f12c0482e5b9872a813a657a03508abedc5932881
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.10.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.10.5.ebuild
deleted file mode 100644
index 035656a6d793..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.10.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 7055aca21b10..e230545935f1 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,4 @@
 AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7
-DIST plasma-nm-5.10.5.tar.xz 706724 BLAKE2B baf83a37ba88e8b695b9dd46805c8652e5d7aa8e6033515812971da399baedb29761c6fcf1cff69bcdc7f2505e44d33529d9c4f731e0f955369e4c16cdaed3fc SHA512 f2502368e883b4be3dd416be6e294e87cef259ac8c1b7853b63fba291e19ac43c5175c186ee287fb843409251fc1ef97eac87de7929ef48695fc409a0de8e05b
 DIST plasma-nm-5.11.5.tar.xz 718500 BLAKE2B bdd9520cfa3a305f7f2c271fdfc9678b43ed46e160ff7c7485a963889b32e60f56408bcc39b4fce81e570ce194410730a628bb2eb96afcfba8704b787d90c05a SHA512 6bc42e9b385fff03d994d66fb2088ce22b2766588c655466e4e26a0b57f1533c142ce7712c9182d9003368f30086333ea9670bac54b9b797e58a968f8bfc3512
-EBUILD plasma-nm-5.10.5.ebuild 1726 BLAKE2B 7f2569f9074ffef65e61772735af2b8bfa96c6785d3598940f17e95b3bd3b702d8017ed9d73b822501a17dece2754926b9c37b08d874283972db91ff28bc16c4 SHA512 097e049b04cbc7902a8eb7ec8eb4948e9f8d509fdbcf7463daefdf5d688404784ab0378a4c5cbb475bf1616f878d38ec2450d9df9991c10fdbd26c23392e0176
 EBUILD plasma-nm-5.11.5.ebuild 1789 BLAKE2B 7c5af92a13398f943f6277e1b87864a40fd5c2a5ebb1f7765a64309a38e006339c4c0e63192e18180ad1b98143df2ffb4b743c990438f99930406c61b1d362ed SHA512 d376eaf845a52b6e916f554a848dcc767774bb972fde518e10404eda1b269025e4d4108132a64b4dff9d2c7453b88dd47ad5280ac12baef52eb3cc63d89d7618
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.10.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.10.5.ebuild
deleted file mode 100644
index 461acd01a25b..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.10.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5]
-	>=net-misc/networkmanager-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 6b4c4202d56a..9cc431dd64bd 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pa-5.10.5.tar.xz 79440 BLAKE2B 20b87ba7a3dd35be19a820b86a66262732831b45333ff4c80c64af46d525ab6123014d6f7705361762cb6bb700361b8892a8ca6828e3aa90835585c27998fe3d SHA512 63247d099ba74b6beb2b38948115ae1737fae9ab45b36365cb95a5ecae8d58b44c8ecf8f0cc451558c0eebdd2f6e24b055df0ae33f5f627b7cf4965e24880088
 DIST plasma-pa-5.11.5.tar.xz 90384 BLAKE2B 06974711a2b64892414906d0330ce1a5ca31cacc7ece0d71e8514ece78e7e838818a936197a2ad46f641a44ebd7c55d8cf99346ac9220b85135bf5f5dc7bd97e SHA512 f7debe7b422b6c5ec0833d22d1bb46bfac06c4fdcdc54ed2f00fc9cf22d5cee8e7fb29f2ec0845cf3eb829bb938b1afb1ebd4a72185208f056c3c63afb1ef7b3
-EBUILD plasma-pa-5.10.5.ebuild 654 BLAKE2B 36f03bc36060597d74da7bb1358006cf3f09b3d1f221de6d4b6447da130ded3eda2ec374354d75023d6d8bf8cccd4e934d812da6af7db7cb3e07f0a68ba6b201 SHA512 c59dcea6342b3bbad6a304b5dca8ad711afab4a49a26180ebaec9197f04a3fb8bcbdeb2cb48f2de354f52440ff95d69ec8216b20f23018fd69c8e36a78a0f119
 EBUILD plasma-pa-5.11.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.10.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.10.5.ebuild
deleted file mode 100644
index 3468f505df71..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.10.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gconf:2
-	media-libs/libcanberra
-	media-sound/pulseaudio[gnome]
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 9904c1c3f66b..7325fc5e9edd 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.10.5.tar.xz 246560 BLAKE2B 1a8fa0efed94aecc637166393c29c7b251e662e5aeea87271284587e96f24edbec99bb5a5ce5b1dc43a0152c4abb707e814c843584b59af3bfb5131853154c98 SHA512 b29db30ece1778b353d7f6bb321d13e7903284497d9962c56273b0def879f97cea9a48ee2c44917907fb7b7db430d5fe878302a787937f7142c3dbd7ebd6bbfa
 DIST plasma-sdk-5.11.5.tar.xz 265048 BLAKE2B 3da4125bb0db4801462ce5907329dc95a4102dacb0d09e404dd0af85d7dfeae44d4be6b60de6828999769c631c1ad09a52359501d7e9454c18ea2d91757df367 SHA512 b7259e5d17f209edf3bf07a37fb7a2efd0be08a5d34ab78115c55f94c74862e076cf58446ce67327c8021800086d282587cbec0e7ab8634b12ed009de3c26090
-EBUILD plasma-sdk-5.10.5.ebuild 978 BLAKE2B bb91cd9eac5613b35225feed55f25a7d1d3d7d4d4cca1822ac8f284dc8d427611fb3cf0809c41db4f3fbe1514ffcfecbf26d55151a46c1ff932e7ec839f53c99 SHA512 6e978e0c4a581408c7ff28e4a83c5cf1f9ad9e6e867de8ec50276a31046fe507d7317ce4a83f6b902b4c5a787492153b4d0680392c6e60ca9ed414d586bffc40
 EBUILD plasma-sdk-5.11.5.ebuild 969 BLAKE2B a4fc74c2bd385e5d6bf936276de015c1616ead4b35df629d19aa7051b69ccb12dcdd968dd8b0250cffd07987a0762d210999a64f235c233bd714ad64be63eabe SHA512 b942f87567b41693f6568bf9975a907af75b4601a5f1b2bb8c024975c4a4223a7ed2e1e1d870103357632369e9da4fa58f4fee2bb8838a7bfe552857b9ac54c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.10.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.10.5.ebuild
deleted file mode 100644
index bc2f1d42a4ab..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.10.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-	$(add_frameworks_dep kirigami '' 2.2.0)
-"
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index d9c39046d907..1c33c3e1894d 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.10.5.tar.xz 45914732 BLAKE2B c07ff443a78ab434bb815d220d16692d66ce9da53b004c34168af433931e7d8216b0250def4c7d71cbfdeadd1c13e88f0380a89ca2e71ab3e3dd10fc3d5a6f94 SHA512 97c55e47fd8aea37d4e32324de76b5c735ec4f23b6860730409e2618220c9fab5aceabb8420dfd80bfbf305d25851ebf7c5a36b815d1a15cf29ed49c0e3bdd70
 DIST plasma-workspace-wallpapers-5.11.5.tar.xz 45920036 BLAKE2B 5e6898a9ec2444f7b9c8a5a637c898eaf8dd9c7e20428dea3de72d7405b585618f7f868ec9e3e6ab4c17ae60d7bea0696a8918b4f4a65b4a494ed0371809130f SHA512 a4cc1776099be2822073a3a4252a02ab1e063a9308be275002f8376ab0c621f2aba1024d085b93135aafde3c34191f40730567b2125e49cfd22162799ded8057
-EBUILD plasma-workspace-wallpapers-5.10.5.ebuild 388 BLAKE2B dafdcc6e3f8bb198e3aed2e3b56c7a16a775514a64f25fac1f2a0d94339e700836bbf75ecd0907eed7a45e1e35a611aa82da3f5959d1dac3963705c9b8ad93ee SHA512 2c645befbfae484832a758b141f0b018e1c67276e6e9a3c2e5cd348e9600e87429764a3b43143e2ce85dda2bddc9663101e3dd5d64f30e305c2808daa70123c6
 EBUILD plasma-workspace-wallpapers-5.11.5.ebuild 388 BLAKE2B b4bf3798c73f248bfc0c401da88c958a447e2ac61cb7be3eee9660f39e758388542254ad1863c3b98aa409512c6f5b130607ecdf167e81cde36dd32acde61aa5 SHA512 da0ad25926fbb78cae9f25c1d9c0e5601e613aad594d4bbb06be11e24700b599843842515d3204a05f5d688b9e2b863f4dcda4a564136c7f7957cb3e6f71c501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.10.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.10.5.ebuild
deleted file mode 100644
index 18c2e5a62a00..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.10.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 09ddd4fd5152..c813471b9fac 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,10 +2,7 @@ AUX 10-agent-shutdown.sh 395 BLAKE2B ee85e72fcdf07b483b0506ee4155f2623f03052ef40
 AUX 10-agent-startup.sh 2140 BLAKE2B 510b47dd9072893a8733d75e6154bf6a2400a7cc07a6a24866db79aea084d9a70237251a802fc697c7ed467944d0a557a25fa6dbe36b6ed84f0031d885943cef SHA512 487ae7c94ba40ab9818a8410f0da83d50c5125e10d76ecf15b316e624efd2f80398bbcdc957792153eea5c786ef0d24d7d0ce6c934a904ff3434215b73c0c133
 AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a43db9cc65706fe2c3382918e47552ad702e9ac6a5071ae3c620bc05097306046e0cd3f74de68985d787120013ce76697cbe107bc3b0c5ace5d5d03a05c1 SHA512 eb7126ec8a7991c59c1c056c81d9b8d6934cf9c702cc70534a97b585eaf1ea3e33499e5525e821ce4e8682573a09538ed1d59db561c58a7464a144e9a24c5275
 AUX plasma-workspace-5.10.4-unused-dep.patch 804 BLAKE2B 7c77a4f64185f718da3e8a64540cf651f860ed6312423fce6e42ce0e86f8c7d3c4759acf206bdeeb4df5d4221c937e6771d32bb2fca05fb6cfc311f2fe2b1b96 SHA512 9718f0577ca468a6ec1eed7a665d3c0de236408b7aac442775daef4795040104a422b3c8325e5f2b9bc9e38da3f6d0dedf13826f49d3921a84960a0833557528
-AUX plasma-workspace-5.10.5-devicenotifier.patch 1160 BLAKE2B c546dc7aa62f701cd427c94fdeaca119413073e59a0e22ddb091f8af0bd1c95c45ecfa7e2002e0baf0d2e9fb290d24a981349b38199de52534ac2f8b4c6e295b SHA512 eace115d5fb4780f785019047c3bcf63b0e9cb2134ec763385b521f7a743401ee7fae13f89207cc83e81ac4cd8639b59ebccdc8892aa46758b0397b408cbf08a
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
-DIST plasma-workspace-5.10.5.tar.xz 6945244 BLAKE2B a242a58dff6c7e954e49f903306a81191eac2a6e7e87c7d7f07ed444b1c6b10742f40df5f871c643fcc51b0778c4961d0c5076e1b1bfee86c65efecd10891731 SHA512 2b205c5bf1fbdfd3713594292565ea6922c0d82fd12ef43c82e8bbc18049293a5d357460889e5be7ed2a185dd89bb8b77df90bad5d572b2472486e84bdb8bfa2
 DIST plasma-workspace-5.11.5.tar.xz 6494360 BLAKE2B de4e3608382ab827f68d61b5095d05168a03fe8da65b219ec5b53e28506e21d5105fce0874d840eb23be1253f3bd3fb3e4ee7d0e3c5e15c895fb4b9f133c062d SHA512 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
-EBUILD plasma-workspace-5.10.5-r1.ebuild 4710 BLAKE2B caca48fa9610ffda00b02ee7cf16a33bd220bb462df44616b7804207ded907d0b1e97755c3a00b11c2fd6c53ad89378da1aed667a00e0194c65342842a9fe874 SHA512 d2e43915bb848200ec83a76feafe2d79e7581aba0eadbb15f3b3c6d160b2fd5149fc15808647dffece7d3051212c6235189e66d6011acb0a3b1073e859001a27
 EBUILD plasma-workspace-5.11.5.ebuild 4711 BLAKE2B 4a7988bcc0f5db27a0d15f3729ad3bc35f802ff9e12446b3451987348c3e8ffbcae8716e44327ef780d7a1e7f82e7b899a1ca14d3b34d6391916c1a9f7dadef4 SHA512 77e5c787120550e45e9d716885b6ca575551918b3b3b7769386e22a2f3e0567c0b2fa9e50a1cf8ca3bc4744b6a292eef3489ee1d8e03c1aa7c972154056b5833
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
deleted file mode 100644
index 978f326e620f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b8f263cd9939530a6634a1ddb9533bf473a67805 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 23 Aug 2017 11:10:34 +0200
-Subject: [Device Notifier] Set preferred size for ActionItem
-
-In QtQuick Layouts implicit size (set by IconItem to the SVG's natural size) takes
-precedence over width/height. This was fixed in DeviceItem but forgotten here.
-
-BUG: 382541
-FIXED-IN: 5.8.8
----
- applets/devicenotifier/package/contents/ui/ActionItem.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/ActionItem.qml b/applets/devicenotifier/package/contents/ui/ActionItem.qml
-index 5e54866..df28365 100644
---- a/applets/devicenotifier/package/contents/ui/ActionItem.qml
-+++ b/applets/devicenotifier/package/contents/ui/ActionItem.qml
-@@ -56,8 +56,8 @@ MouseArea {
- 
-         PlasmaCore.IconItem {
-             source: area.icon
--            width: units.iconSizes.smallMedium
--            height: width
-+            Layout.preferredWidth: units.iconSizes.smallMedium
-+            Layout.preferredHeight: width
-         }
- 
-         PlasmaComponents.Label {
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
deleted file mode 100644
index ba734578c419..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_kdeapps_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	!dev-libs/xembed-sni-proxy
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
-	"${FILESDIR}/${P}-devicenotifier.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 45d48190a5aa..c35fda8e7524 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.10.5.tar.xz 34432 BLAKE2B 7e012b05c4503d801f56d07c9f3e1ece2f7dddf3a145eae9ad3c21d6393f8f9c7ab6db4538acab602b76592ffd8d4ff1b1862457c4909b659fa3a3246ca54936 SHA512 07244bbd3d102ac9d37bfd056d5b1e2a4b2e56788ed41df4f0492bf8e1032a40beeff3f05b9feac3f8f58a90ca3693f15a7c728b78aaa6c2bc5bfb8665461640
 DIST plymouth-kcm-5.11.5.tar.xz 39368 BLAKE2B da61b6e32c1a73a4bd5e138c4e5720feb1648091ccf9e28583b40f30ccad20ff6dd8096996c93224accd151d5f9f4298756ff2bec37c73176f2e3159ed3f7627 SHA512 c30ca55c8647b3c32f1266519a7b005f9d2b2eb0b7064c12ea1780b85ff43662dc6be8ed46e2730be84eec96d809b7cf01385a2d38c52769f469bb355c983ed2
-EBUILD plymouth-kcm-5.10.5.ebuild 819 BLAKE2B e9cee1c684d04d19d801b609a1f10ac817cd6d2a47f5d08259a5f7ca855956d02011d006921a0ef643ce820cd4e6b0fbbc72bc05d03dd8e4fcdf33fe5787d07d SHA512 d5d69bbe2acb0f2a364e6ff1425a5e55829762c628ea12956a3fd528b52ffbb1c9843538560789bfc43e35afae80b383b0f3a5272068f4849c954e7ba24c800c
 EBUILD plymouth-kcm-5.11.5.ebuild 796 BLAKE2B 589a5ec6877dc910559b491081dda3c8a2fed924f60b775c248b1e4f6c354ee18790d5bcbd0e2ec30651d567574d8ddb21bbee870efba1d33a53df8f88e7dcc9 SHA512 106d4743791473dc7ef56d39a4a9028e693d83a51018da96d9a8f6846a2929ede3f5403254635e48d252d387fdaa8b62f264ebb4bf97b29bf374738c28567a1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.10.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.10.5.ebuild
deleted file mode 100644
index 711d85d9a5c3..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.10.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/plymouth-kcm"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 4767fe7f574d..ff236a5e7ea7 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.10.5.tar.xz 41388 BLAKE2B 71de2410e1c66dbfb85c58c3f08dea697343c6a52e49d6cd815c348007a33ead6cd1f61078ec174574f43816b97f4b2d5e049a57a458d6afc85e2ea7cefffed3 SHA512 5a309745e0266efb6bd730af40ff801ee41586dc68cfc3db16f2575a4baf04e471bc011ff3034daba41456dbacacd90a305a7089d24759b249be6fad91fde81f
 DIST polkit-kde-agent-1-5.11.5.tar.xz 44320 BLAKE2B c1e0add72af02cb34f61a07038580f9b1de5e2b45c0a47f01eaea1cb0a96ddfb071fd56f293cb59d66620ecd3dcb8868f0c4b63a40ed46de4326f78b8314d37b SHA512 63a6696fa5961c4757b9ee13db8d9de67d0ff8c15f72448c05f2728fc57f19717adfe09aba38d7990bbaf3bd67a3674300397fd2f988f0d27b5e13b22902966f
-EBUILD polkit-kde-agent-5.10.5.ebuild 758 BLAKE2B 43d9651298325324d84a827874164318ac6e57c87fb9d7d6c092a26083f46504b356c6c42eefe1bccfea74b726d27314e9c9126edb76e5e276ab409fb3e834f8 SHA512 73847f3692b50cbce8f39d02c274b5bee0c42ff5b15498135cc5653ca50d2e8894ec967d05408dfb0e7ce937f7638f73a38b59aaf5a73a20a1402f2819611012
 EBUILD polkit-kde-agent-5.11.5.ebuild 758 BLAKE2B f0bee542d1b9c877fb506e8cc353527c43f0e477d4c8c359adf1370f598486aceb605a133f365f87f695673ceb7b2b91a9441726ead71c1cc5a7f5144c41d776 SHA512 574c019025905f88e7120eab246bf9f0b28cdf7df2b272768872c0d657e3134896cde9ee6177a1c3061a6454a0068f490dcb39bf3bc263de3df38a16b1f4c215
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild
deleted file mode 100644
index b3dc601bc2e2..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	|| ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 2c52f530355c..8abc197d1e1e 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -3,8 +3,6 @@ AUX 20-org.freedesktop.consolekit.system.stop-multiple-users.pkla 329 BLAKE2B 98
 AUX 30-org.freedesktop.consolekit.system.restart-multiple-users.pkla 325 BLAKE2B 0383870c3fec3cfa030fd3d5adcafe50bcc271fb026986df13fa2d568efcc7d6be316a22e591ef4ff2c2992bc40663af1f1a6117b58ce983fb21a37d3a499f47 SHA512 a24b32270108c141ae8877ab3f81f9cbac64a7ea1cce82c6a42d8a120ee8056beff3981f33e45e214cc6e4a08b732d23a3a7a86f43afe518099c64c54ea706d4
 AUX 40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla 367 BLAKE2B a43d81771fe1fee025aa631a4f026d6ef9bf9d26fa8b377e5f658d85c85d1182e3e9f5ddeb6f1bf8aa0ddf22657b7a0afe0ffbd60cb447925eb411c9603da499 SHA512 c359ed4a577f02810b56fd6032cce1b59df720598f7ea61e68d74dae2929a2ac81b1db3ffa57e9aa29c594639f3ea6875f2f7cdef214e7f61fd37c153c7b1444
 AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 BLAKE2B 96be3dcfd39eb58a71c0755e81c33bb8a9fdc5011b8270918cb6dbee59e6cefee98677e63ad5cded12bf2389a3b49259eaa5b0d7f390190084ef6e11ad7408e0 SHA512 f3051bdb62ca0c0e63f35f95cfbf6c8afcc9910fb61be8d78c7769a4e01f8d4a8b5c96a7ffa2b5f8be200a5f23f08ec4201a2d8ffc6230e9468807d7b79d85fe
-DIST powerdevil-5.10.5.tar.xz 360264 BLAKE2B 2c90a786e35d90d1d4045cfbddefb040b7fcb861da1827ef30ee98abadf8f402b827a0209ce55d725d583e64bafb8f547df5e782fdfb6bb7e574f3e4b11af32d SHA512 17583309138481f6501a0d255c0a32f993fb5ce06f7d88be26ae4ae9dfdea60e4fa803817bd8a021ccb6c020e00a70da0db40d032588807bd36f5f601f536eba
 DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
-EBUILD powerdevil-5.10.5.ebuild 2255 BLAKE2B 100a2e999a59e7d4e30c32e8626e9b498aefbe43451a11dc80e5e0a86ec85c542b992cea468bd3bd686627526a2ffea572e335f2d5179bcfcb763f0b27e161a0 SHA512 336f61446ac7ab14b7067c81c0bf6275089d869f31015ecc9deab3802c9349f4b3a98d2ef1e1bbf71dd590143b34f04e5c08367d36d77ad59f5aed2f0a2c3259
 EBUILD powerdevil-5.11.5.ebuild 2252 BLAKE2B d4f9db9d39cbed2225803934c83bb9449187002ed76aff2770990a5f583c8ec7cb184a0db0c4f68e9b17637dfb9dfdfc4f83614705825e9e7341a38cb9a47c1a SHA512 d3405de703cf20d706014e9207157f029a10412cf8763db86840923b68966e3e8ff20ec5618dbbc4d022b5d8eb70eb4dedb9ae785811871d84054ac6014d1672
 MISC metadata.xml 534 BLAKE2B 97d15a7a27a14bea3c3301845fa9fced477357f50b4c507c469be325b427559e3740d2b2242de37c6e5139244ef2ca5ae7e89746cb0f1cbbf45725973e53ff57 SHA512 5bb040940f1c41b842305cdc4b25a3422fd0b4252009006f1c149081c56ebb4e234fe59bc5e1de593854c8846f9b1f890ba4ad54c160b9d381ad45b35a831c5e
diff --git a/kde-plasma/powerdevil/powerdevil-5.10.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.10.5.ebuild
deleted file mode 100644
index b3fc6cb8fc59..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.10.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS="amd64 ~arm x86"
-IUSE="consolekit +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=sys-power/upower-0.9.23
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		sys-auth/polkit-pkla-compat
-		sys-power/pm-utils
-	)
-	!kde-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	if use consolekit ; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d/
-		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
-		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
-		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
-		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
-		doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
-	fi
-}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 8213d43aba03..de8763e93b17 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.10.5.tar.xz 58984 BLAKE2B c684e6f6c6442e372e8baf9cfc4c96f150a3ebadce164d2f219770d9ee3afbf5e46015088eb2d8f001778e74e48184d00f1619d895bbecc3bfad43841bc780c5 SHA512 d170de912cd6f6172d56704972bc605db4b203a215369c7f9476cab360c992b64236da39f86bb596435b28c83f93cc4ab6bb1efc891855100e1c9fe158a724c3
 DIST sddm-kcm-5.11.5.tar.xz 62788 BLAKE2B 2329b2891a4d3334b06b1083b594bb04abaa38fb83dcc2ce0971d717c5f169043743e8ac5cbf8fcf57f42d300aef521669d30f2b4989d94540d43bd5388fc53f SHA512 7ea9ba1ee71e28f7afc7eedd40030b50fd22ecfc21447972c8f154ad1289a80f25dc5bdd00c01e8ac70b968d720734538f9172f92648b205614bc70ee556408c
-EBUILD sddm-kcm-5.10.5.ebuild 922 BLAKE2B 7ca6f8b4642c743f8901f404db875fecab184183d442a95175d52937ed1d6b2158d139e3338a8b8112f113b11e2803f0b8d47a0edd7f6ed2e18b9884f14a1857 SHA512 845adef014ed191d8a2230e9f68c4b525b0890a3c366fabab67905a08883dc261e85a778cb031243bc848fb05a562ae973a5670ed58e741235f2935e1c6d2d90
 EBUILD sddm-kcm-5.11.5.ebuild 903 BLAKE2B 4d6baf95830ff57b93ab0850cbf15c657ca4636f282dfbbda5b8c6865beccea8bde071100b483ffa7380b63c79be02c77fa859eed76b88298855fc7944db90a8 SHA512 154faf670b577a4af410a3c4dbc5efee5e6cc5ebb02d2dd77b140434fb0d01f4b0fb9440335ea107ca1f46f3ebccec6d9c0622c5f371e0a5bbf7bb97ad1d395b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.10.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.10.5.ebuild
deleted file mode 100644
index 69875a2d58d6..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.10.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index ad3ced6fe9a8..3278bd1643c9 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,3 @@
-DIST systemsettings-5.10.5.tar.xz 154808 BLAKE2B f3a6f2f4dbcccab1b6f663d635e38a5684633baa6147a17b3ba7d9a9c49504460758b3d1f976a16e8f724cd0ef3d8186ac1091555f196528d89976ef65723c62 SHA512 e756e82c3bb797bad86bd63d4a5c265711d6e169e8e7cde22fcc0c91bb1a4b42d552f0816d58116c5ea495df95345bd247b7949ac13ba090f74ef694632332de
 DIST systemsettings-5.11.5.tar.xz 180592 BLAKE2B 49c79d63f1da81e5699a929de9ea66a7955d57b53516eb289bc70e1b907f6d5f4629d01f3507e722b484d7363108a143e3a64073b043e9c82a74383f07b135aa SHA512 d9cfe14d5dc023e203b43bad20d9fcf8449f4f945600c9b9ed4a3367cb5384b88e77e8f206448a4915cf88734ab6f03dbab55f5586a17d1984e46947e684150d
-EBUILD systemsettings-5.10.5.ebuild 1073 BLAKE2B 5504f63aedbcaf03a40b676071ce6153c6c6ca17655dbc43834ccc56a3b2658bc44a22e17cdaac773e3d36a52c13b3784fcfaa4f0127ee797025d17b967c8363 SHA512 ef606976a8d31f5d3129231e68097fe6ee04d570391248e6c73d06c2d3c8207e7c01d3779ec99911c89bcd32f79521e8bc8208439957c94646e67df905d05f33
 EBUILD systemsettings-5.11.5.ebuild 1288 BLAKE2B e56737a2453b4e2c843548f0947c6ad08725370a46d998ddd693d2dd3f3685da8e67d7a2adee338838a830619ed3a1072eddb2bacfc0a2f1a224d53f8c8bd64c SHA512 615bfc896f684fd6977bc495b6a92d386d6191e0a21dfc8df4745a311c4b7e24b776b7ea43e14ad0799836a76b529d9462b113cec36cbedf63560852e91c23e1
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.10.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.10.5.ebuild
deleted file mode 100644
index 4983d2a4e4f8..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.10.5.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="amd64 ~arm x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-	!kde-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index ba9582201c8e..f568b7a1dd59 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,3 @@
-DIST user-manager-5.10.5.tar.xz 544500 BLAKE2B ec27c9c7f9be69fe505119a38ba7a8488eb0a34e118fa36f0e68cd33b9869d3ce675086106972ba93d0d50dcbc0db00394cfc145640ec81bc56e9e2336b05196 SHA512 9d2d216415b4c9c67b6cda8c1c177c76e6aa4dc7034faddd48675bc30a4d785e95a0d60cfdd7c654b1cb39a2be9afb1cbdc12a3969c511a4ab8f960f69af1fcf
 DIST user-manager-5.11.5.tar.xz 548208 BLAKE2B 92bd23929537bf3a5d6bfc73d04c0aec40029188acfce0859ecf0feb476695c3bcc8ff3b1dd71eed4b7592482e18e8661f54d6f8591da5cd63d9d472d37486c3 SHA512 9c4ae28282bc1ccfc1cc0c817fc89c80185e0e9d756186d920d91d177492de1bf3420cab93e823658614c9e637c8cfeadfde8c093f50097331371efea763cdc6
-EBUILD user-manager-5.10.5.ebuild 668 BLAKE2B 75ea03cc4b7cd49abcb7339abb307859671cb3f996798f3e428e5de5d513cb5a2d22f1b2edf43ad5a44e9664994fdc142f0fd44189d2038a8bfeafa8289193a4 SHA512 a8e77720a9ece02dc8b210211861727afdaabbb04749a836bb1a00a386098a7fd72ba9ce57dd4a93b88320f0379090dce15798b897dfe965d2277023d36d7c90
 EBUILD user-manager-5.11.5.ebuild 668 BLAKE2B 65c027257ba173b05b2ca0161f372c1a478fd84a7301bcef018be3ed2a2d12051920469e94132a6927c6d2217e007c4419e04de61902d66a402cddbcaa884eed SHA512 964458719bf604ca0c37e411a913addfca197bff4a9ef3163ad680cdd308750a349ecfe3c2df4ff1088e2cdbaf9546be31942d1590f8bdc4f3deda991439baa4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.10.5.ebuild b/kde-plasma/user-manager/user-manager-5.10.5.ebuild
deleted file mode 100644
index 9497922a97fd..000000000000
--- a/kde-plasma/user-manager/user-manager-5.10.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"
diff --git a/licenses/Canon-IJ b/licenses/Canon-IJ
new file mode 100755
index 000000000000..c31bb8b1a040
--- /dev/null
+++ b/licenses/Canon-IJ
@@ -0,0 +1,336 @@
+AGREEMENT FOR THE SOFTWARE MODULES
+PROPRIETARY TO CANON OR ITS LICENSOR
+
+
+IMPORTANT
+
+
+SOFTWARE LICENSE AGREEMENT 
+
+This is a legal agreement (the "Agreement") between you and Canon Inc. ("Canon") governing your use of Canon's or its licensors' software modules listed in Appendix 1 attached hereto which are incorporated in Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)" (the "Software").
+
+READ CAREFULLY AND UNDERSTAND ALL OF THE RIGHTS AND RESTRICTIONS DESCRIBED IN THIS AGREEMENT BEFORE USING THE SOFTWARE.
+
+BY USING THE SOFTWARE AS DESCRIBED IN SECTION 1 BELOW, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE AND PROMPTLY RETURN THE SAME TO THE PLACE WHERE YOU OBTAINED IT.
+
+1.	GRANT OF LICENSE
+Canon grants you a personal, limited and non-exclusive license to use ("use" as used herein shall mean storing, loading, installing, accessing, executing or displaying), have used, copy, have copied, distribute and permit third parties to use and copy the Software solely for use with Canon's Inkjet printer products and Inkjet MFP products.  You may modify the Software only for your own use and reverse engineer the same for debugging such modifications.  You shall distribute the Software to any third party under the same terms and conditions as contained herein.
+
+2.	RESTRICTIONS
+Except as expressly granted or permitted herein, you shall not use, assign, sublicense, sell, rent, lease, loan, convey or transfer to any third party the Software.
+
+3.	COPYRIGHT NOTICE
+You shall not modify, remove or delete any copyright notice of Canon or its licensors contained in the Software, including any copy thereof.
+
+4.	OWNERSHIP
+Canon and its licensors retain in all respects the title, ownership and intellectual property rights in and to the Software.  Except as expressly provided herein, no license or right, express or implied, is hereby conveyed or granted by Canon to you for any intellectual property of Canon and its licensors.
+
+5.	EXPORT RESTRICTION
+You agree to comply with all export laws and restrictions and regulations of the country involved, and not to export or re-export, directly or indirectly, the Software in violation of any such laws, restrictions and regulations, or without all necessary approvals.
+
+6.	NO WARRANTY AND DISCLAIMER OF INDEMNITY
+THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY, FUNCTION AND PERFORMANCE OF THE SOFTWARE IS WITH YOU.  SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS, DEALERS OR CANON'S LICENSORS BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING WITHOUT LIMITATION, LOSS OF BUSINESS PROFITS, LOSS OF BUSINESS INFORMATION, BUSINESS INTERRUPTION OR OTHER COMPENSATORY, INCIDENTAL OR CONSEQUENTIAL DAMAGES) ARISING OUT OF THE SOFTWARE, USE THEREOF OR INABILITY TO USE THE SOFTWARE EVEN IF EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS, DEALERS OR CANON'S LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, YOU HEREBY RELEASE CANON, CANON'S SUBSIDIARIES AND AFFILIATES, THEIR DISTRIBUTORS, DEALERS AND CANON'S LICENSORS FROM ANY AND ALL LIABILITY ARISING FROM OR RELATED TO ALL CLAIMS CONCERNING THE SOFTWARE OR ITS USE.
+
+7.	TERM
+This Agreement is effective upon your acceptance hereof by using the Software and remains in effect until terminated.  You may terminate this Agreement by destroying the Software.  
+
+Canon may terminate this Agreement if you fail to comply with any terms hereof.  Upon such termination of this Agreement, in addition to Canon enforcing its respective legal rights, you must then promptly destroy the Software.  
+
+Notwithstanding the foregoing, Sections 4, and 6 through 10 shall survive any termination of this Agreement.
+
+8.	U.S. GOVERNMENT RESTRICTED RIGHTS NOTICE
+The Software is "commercial items," as that term is defined at 48 C.F.R. 2.101 (October 1995), consisting of "commercial computer software" as such terms are used in 48 C.F.R. 12.212 (September 1995).  Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users shall acquire the Software with only those rights set forth herein.  Manufacturer is Canon Inc./30-2, Shimomaruko 3-chome, Ohta-ku, Tokyo 146-8501, Japan.
+
+9.	SEVERABILITY
+In the event that any section hereof is declared or found to be illegal by any court or tribunal of competent jurisdiction, such section shall be null and void with respect to the jurisdiction of that court or tribunal and all the remaining provisions hereof shall remain in full force and effect.
+
+10.	ACKNOWLEDGEMENT
+YOU AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT OF AGREEMENT BETWEEN YOU AND CANON CONCERNING THE SUBJECT MATTER HEREOF AND SUPERSEDES ALL PROPOSALS OR PRIOR AGREEMENTS, VERBAL OR WRITTEN, AND ANY OTHER COMMUNICATIONS BETWEEN YOU AND CANON RELATING TO THE SUBJECT MATTER HEREOF.
+
+
+
+NOTICE FOR THE SOFTWARE MODULES TO BE PROVIDED TO YOU
+UNDER THE GNU GENERAL PUBLIC LICENSE AND A SPECIAL EXEMPTION
+
+
+IMPORTANT
+
+
+Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver. 2.70 for Linux (or later)" contain the software modules listed in Appendix 2 and Appendix 3 attached hereto.
+
+Such software modules are free software and you can redistribute them and/or modify them under the terms of GNU General Public License Version 2 published by the Free Software Foundation ("GPL").
+
+Such modules are distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  You can find full text of the GPL later within this notice and see it for more details.  
+
+In addition, as a special exception, Canon gives permission that if you link the modules listed in Appendix 3 attached hereto with other files to produce an executable, this does not by itself cause the resulting executable to be covered by the GPL.  Your use of that executable is in no way restricted on account of linking the modules listed in Appendix 3 attached hereto into it.
+
+This exception does not however invalidate any other reasons why the executable file might be covered by the GPL.  This exception applies only to the modules listed in Appendix 3 attached hereto.
+
+If you copy the modules listed in Appendix 2 attached hereto or code provided under the GPL into a copy of the modules listed in Appendix 3 attached hereto, as the GPL permits, this exception does not apply to the code that you add in this way.  To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from them, and then you must not link such modified files with the modules listed in Appendix 1 attached hereto to produce an executable.
+
+If you write modifications of you own for the modules listed in Appendix 3 attached hereto, it is your choice whether to permit this exception to apply to your modifications.  If you do not wish that, delete this exception notice, and then you must not link such modifications with the modules listed in Appendix 1 attached hereto to produce an executable.
+
+
+
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. 
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. 
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. 
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. 
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. 
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+ 
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. 
+
+The precise terms and conditions for copying, distribution and modification follow. 
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". 
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. 
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. 
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: 
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. 
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. 
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. 
+
+one line to give the program's name and an idea of what it does.
+Copyright (C) yyyy  name of author
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+
+Also add information on how to contact you by electronic and paper mail. 
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode: 
+
+Gnomovision version 69, Copyright (C) year name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.  This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. 
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: 
+
+Yoyodyne, Inc., hereby disclaims all copyright
+interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. 
+
+
+
+
+Appendix
+
+
+Appendix 1
+
+
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+
+libcnbpcmcm*.so.?.?.?
+libcnbpcnclapi*.so. ?.?.?
+libcnbpcnclbjcmd*.so.?.?.?
+libcnbpcnclui*.so.?.?.?
+libcnbpess*.so.?.?.?
+libcnbpo*.so.?.?.?
+bjfilter*.conf
+cnb_*0.tbl
+cnbpname*.tbl
+nozl_*.utl
+regi_*.utl
+*.xpm
+printui.res
+*_ps
+*_raw
+
+
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+
+libcnbpcmcm*.so.?.?.?
+libcnbpcnclapi*.so. ?.?.?
+libcnbpcnclbjcmd*.so.?.?.?
+libcnbpcnclui*.so.?.?.?
+libcnbpess*.so.?.?.?
+libcnbpo*.so.?.?.?
+libcnnet*.so.?.?.?
+cnnet.ini
+cif*.conf
+cnb_*0.tbl
+cnbpname*.tbl
+nozl_*.utl
+regi_*.utl
+cif_*.bscc
+*.xpm
+printui.res
+*_ps
+*_raw
+cnij_entry_*series
+cnij_entry
+cnb_*.res
+81-canonij_prn.rules
+maintenance.res
+autoalign.utl
+cleaning.utl
+nozzlecheck.utl
+cnijlgmon2.res
+
+
+Appendix 2
+
+
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+
+bjcups
+pstocanonbj
+canon_usb
+canon_parallel
+bjcupsmon
+lgmon*
+printui*.mo
+bjcupsmon.mo
+printui.glade
+*.ppd
+locale-table
+stsmon*
+bjcmd*
+stsmon*.mo
+
+
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+
+cngpij
+pstocanonij
+cnij_usb
+cnijusb
+cnijnet
+cnij_parallel
+cngpijmon*
+lgmon*(Ver.2.60-Ver.3.1*)
+printui*.mo
+cngpijmon*.mo
+printui.glade
+*.ppd
+locale-table
+stsmon*
+ijcmd*
+stsmon*.mo
+cnijfilter-*-pkgconfig.sh
+cnijfilter2-*-pkgconfig.sh
+printer_*.lc
+cngpijmnt
+maintenance*.mo
+maintenance.glade
+cnijbe*
+cmdtocanonij
+cnijlgmon2.mo
+cnijlgmon3.mo
+rastertocanonij
+tocnpwg
+
+
+Appendix 3
+
+
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+
+printui*
+bjfilter*
+
+
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+
+printui*
+cif*
+cnijnetprn
+cnijnpr
+lgmon*(Ver.3.20-)
+maintenance*
+cnijlgmon2
+cnijlgmon3
+cmdtocanonij2
+tocanonij
\ No newline at end of file
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index c4518ae7d01c..56f65b280ccd 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index fb771e0d1d8f..344b46249ed4 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 414520414878..9c0a22548ad6 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,11 +1,7 @@
-AUX lxpanel-0.5.9-sandbox.patch 1104 BLAKE2B 31ca14d6669943c9e16d63e682fbe2434e5d8205613fb68a18050d91362c081e8a92ffe8478e61f5cb577ccb69f20bdb8949ab2d51ef2274278c378b38fdc866 SHA512 6e1287cccf3372ac207a934e45743d5b79292956112ab1a20c6700953c642e7cd4d8f1a62b25bb47c803647eca168122469db07c2aa988acbb906a9ebfaaa9ba
-AUX lxpanel-0.7.0-right-click-fix.patch 779 BLAKE2B b78cc7e393f78c9c671e87aa9aa182f267c0cf601dd1832cbf41519d2131710bf227be0037d2c7428517b2143945d47a36fb83877cedd5a4b6ef645a777261f0 SHA512 8f9ab121e79b50baa284fa82f8eea7615ea84e38c3bc371d7233056fd57fb81627c16791e86a0a38ee08f68eb21b4ff7c7ee41bd807a9afeb566c25cedc54617
-DIST lxpanel-0.7.0.tar.xz 1479456 BLAKE2B 258fb80c5539ff408f0e54a817675f8202fb09f5a4096138a9a5ec58206022e4cc653a6463ca7b1be471dad7e38d8601bbd23aaafad35d993a8929e514a40edb SHA512 396147a24e852dd7288f99281116c797df4dbb1912925a6b4403ffe74bb8e3d821f7cd96965bedb2db9aff2d1ca3ae89be6e5712df04353a69a9cca5b03589aa
 DIST lxpanel-0.8.1.tar.xz 1485612 BLAKE2B 0c53be0610300f1edf4e9a2e014e0d299889100dc97f097c909e20484a7d2ed2b9e74dc118443ce110d58cef1f0ea0db44a25dc15de717d09774bddd9556b04d SHA512 cebad5e9399618adcc47ad0f2542bd57ce6cd707d65e9f1f67e2a435607e91e948c14102eb5534bb8d60a964277ef98658ec8d7a0109121a4b4f6067b385e39d
 DIST lxpanel-0.8.2.tar.xz 1488548 BLAKE2B 9ded67a0aba220c2f5683e66371a2d3a5362c400dfb2827546682f86be1e4817545b0139e8b9ffdb5d17615e2e5209ba2258dc199b39249135cbd31598d9ba55 SHA512 abab9175c4a4e591a33c39fbc41754e458eea60c79f5a40d56848338b910a867bafed09b4d1f2596a588beb79bfb5efe54c798ff5f7b0ee74f6245a1b0417918
 DIST lxpanel-0.9.2.tar.xz 1514748 BLAKE2B 31b0f949b7023364df3eb00b2386c505e14146c2b818407326347baf1dfa09b3e2e0c30c38416430c7dccad04f1fd5731a6ff80b21ea87a930492399027a056f SHA512 d7b5733345233a44466b6786133b8c3f3c9217a5195654b8dde3447a0dfc198082d991b2bc0cc60ddf200ebb95d636885b36d5642c11f4cd913f66228c12bd3a
 DIST lxpanel-0.9.3.tar.xz 1515144 BLAKE2B f069a519d0e4bd611d57a956ba585b8dde953174198d01dc264e2b111df17e2925c79bd85dc8549d7b2098147122c04ace6ed775d0a3ea7594b0b39c1f9045c0 SHA512 c6aea97f66ee1d576822fda0bf1aed3849b3c74bab856816b7d23331e48b26005f1ba12eddcc0abbf5a6f08add3cb4a0674ccd13f118cec0b6294edd6f1b2343
-EBUILD lxpanel-0.7.0-r1.ebuild 1907 BLAKE2B 4b315366906a4cbb3ae2b99dcc816f40214fecd1753dc28c8c9e8d64c8b467c17f47b598e564acd6f81065cfdfa9d6b4fc7fd047f35915a9acf36ee977076baa SHA512 7c2c2df1e5678959dfe7210300f552aff92c6267d686863b9f49edfefc422318667beda1c21856e46ea2257c49c0bf6ff30888a0f4fb7a18e9fb615fb83db050
 EBUILD lxpanel-0.8.1.ebuild 1812 BLAKE2B b994a73e70914308a867d8011ee02c57e399679ae385dcc47a3c3ca60457e9b21454fb887e87581978f91de766db5d2fd995bc67fac2cf5ef8efc23741f56a9a SHA512 afb30fd29d355d6a1d1d2465aed77e176e78df56d1c4f402f6da64b7b222110116cb5a3218aeef802f79f1e1dced38ae105fd0ff6a9b86bbabf5509f87c6a4e3
 EBUILD lxpanel-0.8.2.ebuild 1563 BLAKE2B 20343419575b4d9c9415d5d420f34d929872d74d05613fc244a480f2366062aaeb339e37ca923fe4d82ca82af21cd6ae8a42c0c6dcdc3928eb61384b16f58cdf SHA512 3aa42265e14bf0015b252dbf2270a4b9f2668f0519394ab397e546b2f5756afe5853375442b45c8c91b1198442e6ae343abfeab8056454d67b422486a3e5a6f6
 EBUILD lxpanel-0.9.2.ebuild 1514 BLAKE2B 0d1cc43c81821f121cf7c0f911d2295c0206a89811171c7485c77498d8daad76613baf9c5fb61d31a309e0fd0aa45759df7675465260b1eabe175e7539f8b4f6 SHA512 d9ce407508ba0b68d1906e737571a386eb7509c66903356dfba170dd7344c505a09982803b03a0efb79a9507180f5b20c9f2f846aaa4989f27a4291b2658c1bd
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch b/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
deleted file mode 100644
index 0f40c185bc6d..000000000000
--- a/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: lxpanel-0.5.9/src/plugins/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/Makefile.am
-@@ -49,6 +49,3 @@ EXTRA_DIST = \
- 	icon.xpm
- 
- install-exec-hook:
--	rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.la
--	rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.a
--	rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.
-Index: lxpanel-0.5.9/src/plugins/netstat/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/netstat/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/netstat/Makefile.am
-@@ -33,4 +33,3 @@ netstat_la_LDFLAGS = \
-     @LXPANEL_MODULE@
- 
- install-exec-hook:
--	rm -f "$(moduledir)\*.la" *.a
-Index: lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/netstatus/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
-@@ -34,4 +34,3 @@ netstatus_la_LDFLAGS = \
- 	$(LXPANEL_MODULE)
- 
- install-exec-hook:
--	rm -f "$(moduledir)\*.la" *.a
diff --git a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
deleted file mode 100644
index f6325b6f8c3f..000000000000
--- a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4943c80cded6325284be8b58003fe63dd6e8255 Mon Sep 17 00:00:00 2001
-From: Raimar <no@email.de>
-Date: Thu, 21 Aug 2014 23:21:28 +0200
-Subject: [PATCH 1/1] fix crash after click on empty part of panel
-
----
- src/panel.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/panel.c b/src/panel.c
-index 6b2ede6..87903d8 100644
---- a/src/panel.c
-+++ b/src/panel.c
-@@ -233,7 +233,7 @@ static gboolean lxpanel_button_press(GtkWidget *widget, GdkEventButton *event)
-         gtk_menu_popup(popup, NULL, NULL, NULL, NULL, event->button, event->time);
-         return TRUE;
-     }
--    return GTK_WIDGET_CLASS(lxpanel_parent_class)->button_press_event(widget, event);
-+    return FALSE;
- }
- 
- static void lxpanel_class_init(PanelToplevelClass *klass)
--- 
-1.7.10.4
-
diff --git a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
deleted file mode 100644
index d6f1bf102626..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils readme.gentoo versionator
-
-MAJOR_VER="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${MAJOR_VER}.x/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa wifi"
-RESTRICT="test"  # bug 249598
-
-RDEPEND="x11-libs/gtk+:2
-	>=x11-libs/libfm-1.2.0[gtk]
-	x11-libs/libwnck:1
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-src_prepare() {
-	#bug #522404
-	epatch "${FILESDIR}"/${PN}-0.7.0-right-click-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.5.9-sandbox.patch
-	#bug #415595
-	sed -i "s:-Werror::" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local plugins="netstatus,volume,cpu,deskno,batt, \
-		kbled,xkb,thermal,cpufreq,monitors"
-
-	use wifi && plugins+=",netstat"
-	use alsa && plugins+=",volumealsa"
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index a5818f0ee692..dd28ceb8e76f 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 6407144c823f..07e95b316e0a 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxqt-meta-0.11.0.ebuild 1580 BLAKE2B ef9dfb518c523f403bad1a1a4e2db114bb4bebbd2c1f34235102535e1d8805ec4d8f9218e49af645819dee860f6a1c14bea725cb358a4bd0db59dad227aecda4 SHA512 d57c293b0ad8e747d3b03aa34ec5f9e8afadf0ad71f66006d0d3707e0f21a2eb18d2ef2447a8befcd5b3be9d50226fa807f9909aa725972a23ec8a0df89603e9
+EBUILD lxqt-meta-0.11.0.ebuild 1585 BLAKE2B 7a4f5b078747434b2cff8ea349b9702ad4b70f3bae22c6a1858d5d542b89e60d908a52e9fe09567543fb9441097edeefd4d36bf6888affe2376bc147d89deb35 SHA512 2ec354738e3e7a9956dbacf36f624c472a38707eeac832e953db5b2b1efa01036dffb8084acfa73d741f3e3da4cbf5ba93dbe5400e820d647c02acb183cd46c5
 MISC metadata.xml 1267 BLAKE2B de60806c6cfec4985047f386a001893160e3f8f47dfba8738a113de8b113f06eb45f7876ab48983fb9d956f766e6dc975dc4f47f4893ae7410327b0e83074182 SHA512 f3046976faaed6b5e79f37a8cb97316e4451ccb66fe0dc3c8abe5d8627354a87932ed1749e445e03a2f3a86b3af36d7b9fb647ae165bb326c8690a79f32bd4d1
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
index a57aaa0c7874..2544b117b8ef 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.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=5
@@ -8,7 +8,7 @@ HOMEPAGE="http://lxqt.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
 	powermanagement sddm ssh-askpass sudo"
 REQUIRED_USE="oxygen? ( icons )"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 87a98b9b06fe..74edd6d6194a 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/drac/Manifest b/mail-client/drac/Manifest
deleted file mode 100644
index 166de64f2ea9..000000000000
--- a/mail-client/drac/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX drac_rotate 2540 BLAKE2B f2a9a9616e5a345b634696b12d9853102711be33c57004d69fcd01056716c0edffce32cd453cda41b51eb9f3a1156ca9a5916fc04e551545fa49dfcf0ff04de3 SHA512 ea7b36ba661d1e85254cd7125ad33006a4e0c378254a05f2de6e7a2121483d16b499f8ca8025e9b01e836a04ad9fa6a2ce3c8752e256c2d0fa4952e50387dcfc
-AUX dracd.rc6 403 BLAKE2B 791c850d947ed53fc1200e12d1f4024cf1518f5647d7dc9d4fae3f2eb7d9dfd84805c610c943601f680fb73193a716cb643c9c472de17795cb8945e77a7e2e8c SHA512 04011ae461fdfaa751507fd5b59721fcbc5d624c52b6c7007431ae2e331d2ebe9111e75bd2273809ca3e26f1aff438751f994a3b1243ea85045625e45f4a6ed5
-DIST drac.tar.Z 20705 BLAKE2B 2622fb6dddd5c2b8258c64585b49a6af304fbb8236af42c546e7b8a403d7c6050cd83b90f903266d9d54499508fb4965461e09c676f30f1935b5d39b5352f796 SHA512 09f14c5e72f9ca68b12039c16215d29f7d8e8940046b79dc9bb8f2363188b6fdd253af7ca41e42369ed67d5e4f5d6c20b3d3bf9f27cd194c53a7fc6e619b29fc
-EBUILD drac-1.12-r1.ebuild 1844 BLAKE2B 7eab99ff5900631916399323fb93499ab4b0ff13e67edf024f4d0b4dd8cabf7f0a732cd7a944a6f6091f37f90c31cf9d93b1a2c5537ccfd1f916054cdb8d94c3 SHA512 d87f9e5dc6e0b1c09ee5635eedba83b20be6498c3ade6d8468081568ea7362d19df4a210efe48ee38a1fb259b95685eac3e72d0081eeba1f6f0faee629ee56ac
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/drac/drac-1.12-r1.ebuild b/mail-client/drac/drac-1.12-r1.ebuild
deleted file mode 100644
index faabd717caab..000000000000
--- a/mail-client/drac/drac-1.12-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A robust implementation of POP-before-SMTP"
-HOMEPAGE="http://mail.cc.umanitoba.ca/drac/"
-SRC_URI="ftp://ftp.cc.umanitoba.ca/src/${PN}.tar.Z"
-
-LICENSE="rc"
-SLOT="0"
-KEYWORDS="x86 sparc ppc hppa ~amd64 ppc64"
-IUSE="debug"
-
-DEPEND="virtual/mta
-	>=sys-libs/db-3.2.9
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	>=net-nds/portmap-5b-r6"
-
-S="${WORKDIR}"
-
-src_compile() {
-	local mysed
-	if use debug ; then
-		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) -g ${CFLAGS}:"
-	else
-		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) ${CFLAGS}:"
-	fi
-
-	sed -e "s:^INSTALL = .*:INSTALL = /usr/bin/install:" \
-		-e "s:^EBIN = .*:EBIN = /usr/sbin:" \
-		-e "s:^MAN = .*:MAN = /usr/share/man/man:" \
-		-e "s:^DEFS = .*:DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C:" \
-		-e "s:^CC = .*:CC = $(tc-getCC):" \
-		-e "s:^LDLIBS = .*:LDLIBS = -ldb:" \
-		-e "s:^TSTLIBS = .*:TSTLIBS = -L. -ldrac:" \
-		-e "s:^RPCGENFLAGS = .*:RPCGENFLAGS = -C -I:" \
-		-e "s:^MANADM = .*:MANADM = 8:" \
-		-e "${mysed}" \
-		-i Makefile || die "sed failed"
-
-	# Parallel build does not work.
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	newsbin rpc.dracd dracd
-	dosbin "${FILESDIR}/drac_rotate"
-
-	dolib.a libdrac.a
-
-	newinitd "${FILESDIR}/dracd.rc6" dracd
-
-	dodoc Changes COPYRIGHT INSTALL PORTING README
-	newman rpc.dracd.1m dracd.8
-	doman dracauth.3
-
-	keepdir /var/lib/drac
-	fowners mail:mail /var/lib/drac
-	fperms 750 /var/lib/drac
-}
-
-pkg_postinst() {
-	elog "After configuring your IMAP/POP server for DRAC, and starting the"
-	elog "dracd server (e.g. by running /etc/init.d/dracd start) you can"
-	elog "set up your MTA to check for authenticated hosts in:"
-	elog "   /var/lib/drac/drac"
-	elog "Please see the MTA documentation for more details."
-	echo
-}
diff --git a/mail-client/drac/files/drac_rotate b/mail-client/drac/files/drac_rotate
deleted file mode 100644
index 45cce3a4dc4d..000000000000
--- a/mail-client/drac/files/drac_rotate
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-usage="[/path/to/real_file.db [/path/to/link_file.db]] [--debug] [--verbose]"
-help="
-A DRAC-enabled MTA performs better by using a seldomly, instead of
-constantly changing, access database.  This script creates a link
-to a snapshotted database which the MTA can use.  It is designed
-to run every minute from cron.  Here is an example cron configuration:
-
-  *  *  *  *  *   $(basename "$0")
-"
-
-for i in $* ; do
-	case "${i}" in
-	  --verbose | -verbose | -v | --debug | -debug | -d)
-		debug=1
-		;;
-	  --usage | -usage | -u )
-		echo "usage: $(basename "$0") ${usage}"
-		exit 1
-		;;
-	  --help | -help | -h)
-		echo "${help}"
-		echo "usage: $(basename "$0") ${usage}"
-		echo
-		exit 1
-		;;
-	  *)
-		args[${#args}]="${i}"
-		;;
-	esac
-done
-			
-debug_print() {
-	if [ -n "${debug}" ] ; then
-		if [ -n "$2" ] ; then
-			echo -n "$1 ... "
-		else
-			echo "$1"
-		fi
-	fi
-}
-
-check_result() {
-	if [ "$?" -ne 0 ] ; then
-		debug_print
-		if [ -n "$1" ] ; then
-			echo "$(basename "$0"): $1, exiting ..."
-		else
-			echo "$(basename "$0"): exiting ..."
-		fi
-		exit 1
-	fi
-}
-
-debug_print "finding current minute" "1"
-min="$(date '+%-M')" && \
-[ -n "${min}" ]
-check_result "can't determine current minute"
-debug_print "success! (${min})"
-
-debug_print "finding drac database file" "1"
-real="${args[0]:-/var/lib/drac/drac.db}" && \
-[ -n "${real}" -a -f "${real}" ]
-check_result "can't find drac database file"
-debug_print "success! (${real})"
-
-debug_print "setting drac link file" "1"
-link="${args[1]:-/var/lib/drac/drac_link.db}" && \
-[ -n "${link}" -a -d "$(dirname "${link}")" ]
-check_result "can't set drac link file"
-debug_print "success! (${link})"
-
-debug_print "finding new drac database" "1"
-new="${real}$(( ${min} % 3 ))" && \
-[ "${new}" != "${real}" ]
-check_result "can't set new drac database"
-debug_print "success! (${new})"
-
-debug_print "finding old drac database" "1"
-old="${real}$(( (${min} + 1) % 3 ))" && \
-[ "${old}" != "${real}" -a "${old}" != "${new}" ]
-check_result "can't set old drac database"
-debug_print "success! (${old})"
-
-debug_print "creating new drac database" "1"
-cp "${real}" "${new}"
-check_result "can't create new drac database"
-debug_print "success! ($(basename "${real}") -> $(basename "${new}"))"
-
-debug_print "linking new drac database" "1"
-ln -sf "${new}" "${link}"
-check_result "can't link new drac database"
-debug_print "success! ($(basename "${new}") -> $(basename "${link}"))"
-
-debug_print "removing old drac database" "1"
-rm -f "${old}"
-check_result "can't remove old drac database"
-debug_print "success! (${old})"
diff --git a/mail-client/drac/files/dracd.rc6 b/mail-client/drac/files/dracd.rc6
deleted file mode 100644
index fb8e2f109d53..000000000000
--- a/mail-client/drac/files/dracd.rc6
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net portmap
-}
-
-start() {
-	ebegin "Starting dracd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dracd \
-		-- -i -e 5 /var/lib/drac/drac.db
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dracd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dracd
-	eend $?
-}
diff --git a/mail-client/drac/metadata.xml b/mail-client/drac/metadata.xml
deleted file mode 100644
index 9a6d80e5da48..000000000000
--- a/mail-client/drac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
-</pkgmetadata>
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d5e228a2876a..afb005289ab1 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -8,6 +8,8 @@ EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd2
 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
+EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
+EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
-EBUILD neomutt-9999.ebuild 3912 BLAKE2B d2b7ed25c443f1192663e9e98bbfb62c269a2f3897b82bbbd80bf2c0749760b695942b8b05f6f9ec0c139d80ea2d02061b52c4b37a870969eb2d4dc0cd1b5b31 SHA512 a50ce190784904f012624a707371046b04771a77dbb7b7cd633b8a16e7ed2d6fd54d9977585da94f1bb10e51cf1d1a2430ec4e8478f071b05e29325d39b61635
+EBUILD neomutt-9999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
new file mode 100644
index 000000000000..e5725c955639
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
new file mode 100644
index 000000000000..f90289f77c00
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 7b36a57de365..f90289f77c00 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-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
@@ -25,7 +25,14 @@ IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
 
 CDEPEND="
 	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
 	gdbm? ( sys-libs/gdbm )
 	kyotocabinet? ( dev-db/kyotocabinet )
 	lmdb? ( dev-db/lmdb )
@@ -99,17 +106,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
 	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 
 	dodoc COPYRIGHT LICENSE* ChangeLog* README*
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index d6d9118c8eff..10871484c63b 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,15 +1,8 @@
 AUX POST-UPGRADE.txt 1101 BLAKE2B b162d5e445195412a126b0977b1f21b6619757ba0a8cef4aeb7da84850707b4476e15819ebc903b49b904ca9118db796ede72f8f4917283d46a933ed24a77226 SHA512 715c6c377b9816f0f836acace019c39cf22d536d1a0ae5538cbf3dcf3fec12ae584450881264dab792c941627f1af649f776bca6d5015b13c08648fde726b948
-DIST roundcubemail-1.2.5.tar.gz 3602701 BLAKE2B 26e8a2bb13cdb3432dee14d2bea5f0fb5d52d2478df69009ef4d6c725c2d9ff1ce37784f97a217e84177aaff049c597a477e307e90f7f96baabfc73762217fcf SHA512 8f17c8222a59123e438a3683e5f2fbfef28c966899a271a2a11c25535e7188ff57846847108190a4d20ff53eccd10a2a7e88e8a5f958e9bc38c69e53824e7928
-DIST roundcubemail-1.2.6-complete.tar.gz 3893031 BLAKE2B ea13f007a2405d351aebe721cdff3405c6e25f6fea517c8214e206a7cc98d75a55236f6fbec73a1094dbcb7b082969bf97b1faf8e202852aea9f5c625f7d6682 SHA512 4b33ddc322446cf4d7915d9f57fa11946fb6056f91034ff9643363a87ad293d444bacf2a6e6502bbb8b57623f39548b7a6fff02f4bb70622843ecbc489949024
 DIST roundcubemail-1.2.7-complete.tar.gz 3904612 BLAKE2B b001a9c57f2358b00e0290493f0bfb82001c769987ef98e2d34d6e6d9432a5c612fab6ba10306279a8bb73d1015332f29f1233a10ee32fd7f713cbf44d9cf7b5 SHA512 545b3fe05ecfaede3d887ae71e41fc91aaaae280c71b67db9a5dcb516b5b238371327c2b1fabe87cf073cce38bc5a57b3db2592eb96d436bae280896c1f7017c
-DIST roundcubemail-1.3.0.tar.gz 3104348 BLAKE2B 049bfb0461073d7384d41c69d0a41ac428cce8f57276b004e8517d971d6b44090f567f847ef743b107b94956776d09f502f1a3fcf3c398cc473732cc294d35ad SHA512 f3ab39cc3eec9bbcaf3d8f5d9004b0da92fe5d35b71687acc234fab5772abb92d970855716288cba10c8609532d42ddc6e791a1f7bca13de555174a37deca9c4
-DIST roundcubemail-1.3.1-complete.tar.gz 5296647 BLAKE2B 24803ae2978dec1c65282b05a53d404ecf2022a0a97d929a9d09bfda26527d60faf514d8ca6d313b27a505a7f7db473997201b74595eb35b51cad868c9c59062 SHA512 79722d1213b6855af37dea4c2522eba12ded4ed430b5d96f5ba9eb851bbfbe68c406b0c5410e21e2721dfe2cf42fdc2fa825161a229f785921ebdc89221ab232
 DIST roundcubemail-1.3.3-complete.tar.gz 5339032 BLAKE2B bb0b595ba13947db3b0644ad5bc76fa8280ac74733e3bf02a758ffaa49fb0c2ef80005081fb1f24500fa767b57d0df59751abb098a807bc6e04b5a63de3fc1ed SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931
-EBUILD roundcube-1.2.5.ebuild 2287 BLAKE2B 544ec8419520b61f5fbcf90b8baaf091addbbc1aaef9552b6839578650065b6dbe42909fba5ad8a9fa824cc08202298be763759d1ce29d82f66d9a6b8feba145 SHA512 466f244cb0ca5331d2efbb2405a62ccec2d72500863abaf84885f5aa9d0b1f3ee827158cb029d2e9c34f9ffac0e4d962064401a07f1337f7d056c488eeaead19
-EBUILD roundcube-1.2.6.ebuild 2291 BLAKE2B 9ad13708e037c46abfe6e80a94537341b3ed34b1ba5eace570e6e457922639b4c39ff298f3dea7393f471dc6e7206179c0862db907681cbdc7c8e6bd23786164 SHA512 075bceea29886deebaf479a5d483d2848d9defbefab82a27d7241db644b19fda5576676fb91fc6cfec01e5f8a2c802accf9cebe5884f69643bc48695e2401fa7
+DIST roundcubemail-1.3.4-complete.tar.gz 5506887 BLAKE2B de353400706d893b8e95b23e20ebcab7478273bd6dbd009c766537826e260cd98f065f9d7d38740c60254ccbecd376ec6aafe82791be177bbee6ffc8d61a733b SHA512 e3442651bf762ceda3cb9ff78cb512703a7f82466d7de860848d1c9471f10b2561c2dd7a570218048fbc0df0fa573c6e2381ba8c0063e718c531c8ce1138a5e4
 EBUILD roundcube-1.2.7.ebuild 2288 BLAKE2B ef3b09f4a0d1c163d9c14602b6a727c30832424bc7e877750c1af38648aa92b752a43c40a7e3d437261ca63dc5507703e5803b5d018f515657e167de171a1f5f SHA512 4bdc130b46067ff1b2cbc5d19a8c4498e096b2b3a0958c204d5823007e36d8e63d0c68f595e175b8c705c789daf507d6219ea7e08e1c3561e4150a63181cd0d9
-EBUILD roundcube-1.3.0.ebuild 2600 BLAKE2B c24e85bbb04b08214a5e9caaa2981af20d706938a52e255aabb1cba10880ae692ebbd8c1628c15e6fb89a0995131cd37cabd2ce028ab9d1c5bdf7fd32e7478db SHA512 093d8b9632f499a9ab6cb6492abd8934f96c2f5ca7c5f141d143463b89c0cec441e5b36f808bce2e4cbef8f847463768cc75cfee3837b61d590ac3dda9ed16ca
-EBUILD roundcube-1.3.1.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
 EBUILD roundcube-1.3.3-r1.ebuild 2380 BLAKE2B c58468a39a852201afc0b4233fb18d49967535187c3cd4d20b7ac5d67932388238d08a79b891e912d674afd5d8e5a230deb630aba4ce9a83d91096813811ae57 SHA512 89d66b6fe22a4797935d809d9a6518fc6c36c3b166906d6d9702fa4f1964fdda4197215ef84459e2b8c20eee18d75e6b421c0361811900d9f160b141708c1831
-EBUILD roundcube-1.3.3.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
+EBUILD roundcube-1.3.4.ebuild 2571 BLAKE2B 44d6b55afcf14dbac2591fdf15621bdffa537f1476e57981233a006be1700d82c8e17a54ae11d3914b526a9ff6bd35462fdaeac58e00bf5aec32272f593c2666 SHA512 a613308c061b42b610fa837565217fc9140272be77376c8e54637fea8e41ae4aeca20f9118de8b9975d7ae555dd55d07d7fd0292487e18f137868ed5251fd6a1
 MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
diff --git a/mail-client/roundcube/roundcube-1.2.5.ebuild b/mail-client/roundcube/roundcube-1.2.5.ebuild
deleted file mode 100644
index 4ce1abb11e78..000000000000
--- a/mail-client/roundcube/roundcube-1.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV/_/-}/${MY_P}.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-
-IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.0.6
-	>=dev-php/PEAR-Mail_Mime-1.8.9
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.1.1
-	>=dev-php/PEAR-Net_SMTP-1.6.2
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.2.6.ebuild b/mail-client/roundcube/roundcube-1.2.6.ebuild
deleted file mode 100644
index 1df11749a007..000000000000
--- a/mail-client/roundcube/roundcube-1.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.0.6
-	>=dev-php/PEAR-Mail_Mime-1.8.9
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.1.1
-	>=dev-php/PEAR-Net_SMTP-1.6.2
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.0.ebuild b/mail-client/roundcube/roundcube-1.3.0.ebuild
deleted file mode 100644
index 63c9997645d9..000000000000
--- a/mail-client/roundcube/roundcube-1.3.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV/_/-}/${MY_P}.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-	ewarn
-	ewarn "When installing for the first time or upgrading from <= 1.2.5,"
-	ewarn "run the ./bin/install-jsdeps.sh script to download required"
-	ewarn "javascript files into the ./temp/js_cache/ folder."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.1.ebuild b/mail-client/roundcube/roundcube-1.3.1.ebuild
deleted file mode 100644
index 37e237f45153..000000000000
--- a/mail-client/roundcube/roundcube-1.3.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.3.ebuild b/mail-client/roundcube/roundcube-1.3.3.ebuild
deleted file mode 100644
index 37e237f45153..000000000000
--- a/mail-client/roundcube/roundcube-1.3.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README.md UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.4.ebuild b/mail-client/roundcube/roundcube-1.3.4.ebuild
new file mode 100644
index 000000000000..fdb72d1c079b
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.3.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.1.0
+	>=dev-php/PEAR-Mail_Mime-1.10.0
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.2.0
+	>=dev-php/PEAR-Net_SMTP-1.7.1
+	>=dev-php/PEAR-Net_Socket-1.2.1
+	dev-php/PEAR-Console_CommandLine
+	dev-php/PEAR-Console_Getopt
+	dev-php/PEAR-Exception
+	virtual/httpd-php
+	enigma? (
+		>=dev-php/PEAR-Crypt_GPG-1.6.0
+		app-crypt/gnupg
+	)
+	ldap? (
+		>=dev-php/PEAR-Net_LDAP2-2.2.0
+		dev-php/PEAR-Net_LDAP3
+	)
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Redundant. (Bug #644896)
+	rm -r vendor/pear || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	ewarn
+	ewarn "When upgrading from <= 0.9, note that the old configuration files"
+	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
+	ewarn "replaced with one single config.inc.php file."
+	ewarn
+	ewarn "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+	ewarn
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 67a416ba4e6e..5e7d2852f7b9 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/policyd-weight/Manifest b/mail-filter/policyd-weight/Manifest
index 6de312a91794..fa53acd0b193 100644
--- a/mail-filter/policyd-weight/Manifest
+++ b/mail-filter/policyd-weight/Manifest
@@ -1,4 +1,8 @@
 AUX policyd-weight.init.d-r1 357 BLAKE2B 2db3418b0d16a99d523a0460960206f10ed06b8d09ba0079da07097c0941f6a0b557503f3e5fe4c2a16d3e0b7b6bea4964668359bd5b0ed70e453b93b7be645d SHA512 e419b516c914282a4ec34bedb786e88e3cc26caef028f79bd994f31786ca55a6dbf71876ac1b33d3cf4e5411dda8d02ffb61c65c3270a63ab3a0022dbfc8a977
+AUX policyd-weight.init.d-r2 390 BLAKE2B a6d42795a70f9aa75e33e777ab235762932207b51ecc08bee929a3b1aeb5703fb509dd8198becdc00f86834838c099765543f7a14277f3817b086dea05303342 SHA512 1cb3c16c791f50e360ce50af5f5529b72e7b42c4d53df160829e1053ee732ee71563634eb1c6e770d8aadac844d4ce19dc91a48fdf5e37eb0fb5fd2b5cf876e3
+AUX policyd-weight.tmpfile 37 BLAKE2B 3401fc7d784c9d61f216fa46856a6d6e462866eaf80cedb8d51c9f4db89026049833d087c106acbec4c2cd49b878e085567cc93b808fed77423f9f96efe54802 SHA512 8970d2e83191a381fc8dc1efdddcdcc1e1429d39edecc567a9c98693610db7556853f59b944774d876d4acee80acc3254a218583b792880c8985fa0f2879268a
+DIST policyd-weight-0.1.15.2-patches-1.0.tar.xz 6920 BLAKE2B 92bcf7b11dc5e07d5c8f10b9c103ac52b1d8e3449beb6e049311c2360ecb59d8751e35e20453c8dc402b286cf028f44cbdcc8bc45cf202a2af883d8954ae5e51 SHA512 a2d4ecd2ee76180cb6ebb0790a04e4fb101e9e6a73a253b83473ebb8952bc88cc903a8ea51b84743419dd8bc974a8ffc9378a187f8b8b65620268c382aaaa94e
 DIST policyd-weight-0.1.15.2.tar.gz 75347 BLAKE2B 3eba7a8909557b6f8ddc1ec0930e8b0c5d4a2ec213116977c8b340f52643491fc4ae81b7c9d319484e7584fe7c3c6c6aea92d7eecba7637d0f6378e00c64c28f SHA512 37702762c171b208d37651b2051b521e4f44708b7bb7e0d3001fd2ba123b227c847bad8dd479d7a56f9aeab02fdfd957d34b2c4d7f3a9fd727614cd4031f8b78
 EBUILD policyd-weight-0.1.15.2-r1.ebuild 959 BLAKE2B d54caebec49e82ea11afbf6c0d4251767585cfd7972d24d96932dc7e8970cb1115a13b489af191a2257aa36247cbb232b5880b4d77a271be9c6290f4334ba5f9 SHA512 e1be911e7576b014574ea66399dfe056ca037751e70de1b37575ea74f7cfca1e27ab7c61faa227d9158ef7d9f9b9926c1ab3824528b3f30dbf5e3a85f52abe47
+EBUILD policyd-weight-0.1.15.2-r2.ebuild 1181 BLAKE2B 5d824c967dbed4358c6bdc8891082e630b51ea743ccd0ae0f27eed146e404ff5589c7bf06405b4adc5a3bee3f9177c51faa3c2dc434a4984572c4471ea19a549 SHA512 d0e0a02b5ac1c2c73f40d39df6dd3f51e3569184866f1419594e8555b296d737fc46f160e826b942bb1a956e3b7190c7d41b96bb897f46689d2d0f7114b0433f
 MISC metadata.xml 826 BLAKE2B 13a97351b95d9a5cff9e470e8d34e25499de444b2f13df706b4a80536a102abe5f3f1baa76f76fab68200328037cbe7a94374f7aabfbced2a12423e1e8d57fa3 SHA512 f7227950b202c28fe81a77e83ad679265526557775e30696594a434e4bfde1ffba3d59f7f0b5ee49a0dc373c92ed8b3c7591d679cec123fecc9e533329d7a735
diff --git a/mail-filter/policyd-weight/files/policyd-weight.init.d-r2 b/mail-filter/policyd-weight/files/policyd-weight.init.d-r2
new file mode 100644
index 000000000000..390bc3d28927
--- /dev/null
+++ b/mail-filter/policyd-weight/files/policyd-weight.init.d-r2
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+
+extra_started_commands="reload"
+
+daemon="policyd-weight"
+exec="/usr/libexec/postfix/policyd-weight"
+
+pidfile=/run/policyd-weight.pid
+
+depend(){
+	before postfix
+	use net
+}
+
+start(){
+	ebegin "Starting ${daemon}"
+	${exec} start
+	eend $?
+}
+
+stop(){
+	ebegin "Stopping ${daemon}"
+	${exec} -k stop
+	eend $?
+}
+
+reload(){
+	ebegin "Reloading ${daemon}"
+	${exec} reload
+	eend $?
+}
diff --git a/mail-filter/policyd-weight/files/policyd-weight.tmpfile b/mail-filter/policyd-weight/files/policyd-weight.tmpfile
new file mode 100644
index 000000000000..1eeddb772788
--- /dev/null
+++ b/mail-filter/policyd-weight/files/policyd-weight.tmpfile
@@ -0,0 +1 @@
+d /run/policyd-weight 0755 polw polw
diff --git a/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild b/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild
new file mode 100644
index 000000000000..d4850b609eed
--- /dev/null
+++ b/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user tmpfiles
+
+PATCH_VER="1.0"
+
+DESCRIPTION="Weighted Policy daemon for Postfix"
+HOMEPAGE="http://www.policyd-weight.org/"
+SRC_URI="http://www.policyd-weight.org/releases/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/perl-File-Spec
+	virtual/perl-Sys-Syslog
+	dev-perl/Net-DNS
+	dev-perl/Net-IP
+	>=mail-mta/postfix-2.1"
+
+pkg_setup() {
+	enewgroup 'polw'
+	enewuser 'polw' -1 -1 -1 'polw'
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /usr/libexec/postfix
+	doexe policyd-weight
+	fowners root:wheel /usr/libexec/postfix/policyd-weight
+
+	doman man/man5/*.5 man/man8/*.8
+	dodoc *.txt
+
+	insinto /etc
+	newins policyd-weight.conf.sample policyd-weight.conf
+
+	newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 964a15542667..16b631b6ba2a 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 24c699a0a773..7e22507e07cd 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,12 +10,12 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.2.tar.gz 4390318 BLAKE2B 4d0648ad89c90b13573bf9a2721919f90fa706a37d745889bc1e3a38e5f5277af848e2ba6eed8f61dec68f53ac65fd67c133bc37ed73ecb350baa76834a5a33c SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418
 DIST postfix-3.2.3.tar.gz 4390567 BLAKE2B 911b183c318bc60cfd1ba2ae5e9467cfe3cc62f9787c7566f2edea7b867974bc90f0cc4b236f71b50c08a1696e6d60beeccdc634d7bf7f3a600c260b89743a36 SHA512 99ea74a5a0620e739668e55d620a0370b72c4802983a8a4cf4d6c51c6f8f5573128f2d6869386cedadba66b3f741df2f18867a059facd94092ac95f6da3a600c
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-DIST postfix-3.3-20180107.tar.gz 4427783 BLAKE2B ea036647edb3ddd3bd48675a94c9ae2759db82b21736309fca1e9dd491c6243a11b0de39b412994c5d1a162d3fdf5da9173221bd93f5393cac8295b66f65e546 SHA512 0fdf7a152b4efc0583bdff78cf8ba198bb28344374387510f370beae6f207af3ff42d4a94c2e0d1aea9d5f5ad819840289e2bd4ce073b5234d834cf53f1bde31
+DIST postfix-3.3-20180121.tar.gz 4416991 BLAKE2B 74cd6872de829497b23b44da7784589e0f951ec1ab30c8e89423751313fb628cb6d0040ae86aa91f4b643a61bec5f6efbc3a2ec71260c3d13aa2300de1fa59c4 SHA512 22ce460cf90bac235dc0db3790a21c73de9c81949bb245db0256e807ce6e81e32eb0a9260ec1ff64ddc85da107648ea66a5b42ec7198a5ac66a5bdbf520cd000
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8736 BLAKE2B 2e95575a37c0f4587c9ecde36a9a1d622e2fb5b988f4374c1d1f9951351f138d578ad1540d2ca8e6192baacf868ce3ab8836eca0d4e07d7b11a11b8df57d512a SHA512 09a64554311b5b5c7395770329eb44cf80d3f3e9197adefbb304214feb9ff3d4df9e3d3376b3b4e87f329281e1fb4e03bfb7b3bbfbae463384031b3810e011d0
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.2.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.3.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.4.ebuild 8663 BLAKE2B 538646ed00e394ce33ddc2dcfc19a195e0f3347eef582f8bbc9a7603789b76957dde32f55a16b0366ebbb0eb2ebd8eb6c2323e0c8d6f10f7a2823b062edd9c37 SHA512 03d0c8cd60ac204443e97c5d4d2739c4ff34b6d2a0352c01df71e0fc19c813333576c5550c7392e5a08c351a414c9dfea31f6febf9f12a9964e4345b2eeb121b
-EBUILD postfix-3.3_pre20180107.ebuild 8418 BLAKE2B 2f9b2058e43510577a7dbf131288bcc25d426efe55f2c864acde609a6d4f4de2dfdf412c60b2fa2a5e162d782d88a57bf3e91c8ff6dbf3a61a6b067249e9700b SHA512 78875d12be46e34f345da7144346b0c03d620b55e1ae2249b8bd0109c2413d1b9797a03ecd2f91abaab80699a8652aff8839d7595c692693047f3b04aef0950e
+EBUILD postfix-3.3_pre20180121.ebuild 8418 BLAKE2B 2f9b2058e43510577a7dbf131288bcc25d426efe55f2c864acde609a6d4f4de2dfdf412c60b2fa2a5e162d782d88a57bf3e91c8ff6dbf3a61a6b067249e9700b SHA512 78875d12be46e34f345da7144346b0c03d620b55e1ae2249b8bd0109c2413d1b9797a03ecd2f91abaab80699a8652aff8839d7595c692693047f3b04aef0950e
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.3_pre20180107.ebuild b/mail-mta/postfix/postfix-3.3_pre20180121.ebuild
index a778e668f172..a778e668f172 100644
--- a/mail-mta/postfix/postfix-3.3_pre20180107.ebuild
+++ b/mail-mta/postfix/postfix-3.3_pre20180121.ebuild
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 8960b7dfded4..4656d994cbf0 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,6 +1,6 @@
 DIST ssmtp-2.64-patches-3.tar.bz2 5128 BLAKE2B c41c6366a0cfc59a2bbb935d9edd209b439ec4512bc43e0eeadad944af03dad5e25cf03270f352edf3fed45f1f8ca082ccde775970cae8e48655de01d3a758c8 SHA512 140ca571705ee45ca2d6718b456ab028e3aaeb910a64230d8143a29de837eb3be8f16641f21f56f2c5112867512fabdc952886701d596f0bb303fc1524a1ad46
 DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r2.ebuild 2971 BLAKE2B 3642c65acb7fc420d87f486ace9cb2d139d0a8672a6110650612d03509c53cb1e3eee0e89b84a7f3b6bbb2d0f1961995aa685e9f266ad7a75084338203ffb807 SHA512 31048f9164bfa27577bcc48571084c7d044f6c4eff82f8bf3d96223e1872f5e604850634ce873f8034b11fb0075f1354113faccad81e220381d258e500a02205
-EBUILD ssmtp-2.64-r3.ebuild 3057 BLAKE2B de4dd18fe275a0b0b59b5ae34dfaa0d5aa83ed3dfb32b08d8b06856408d7fb92a7bc99e82f681283c1fd713ee277515ce42bddda64030914a549560161c9035d SHA512 e632a0b34152e89a4a257507fc6eea4f93c94d4564218c1c2986dc30c96c2fd704c66bf46b2eb74268dcbfb325f740ad820949fb9613475635cd3856e3d76631
+EBUILD ssmtp-2.64-r2.ebuild 2959 BLAKE2B 562ffd4f68911f4cced133576f28def5e538f4987e1f5985d4c0557832da8d846c135d8a69dfa0a865255c7313f5a9866c4447e35438b37b8f644ff677a6e9ea SHA512 c9092d1f510608d22ae2853b119d4d88dfec514e6dad62eb76c9f5320b511392b676e2599419550f2a2341eac61b5537a75cb8d02cc49c17e6adbba990d0f96b
+EBUILD ssmtp-2.64-r3.ebuild 3045 BLAKE2B 4fe587f50b73cbda57ea4d59488fccb8a6e83bc1a08b436c771d326f31d3e916962fe0a1f4df0165cf621f63e8a2b69d5c5999717b1b18f905969b331d929eba SHA512 74e1b72cb990b2a3665de262b99deb755f5965c7962ce835c7b8abf3130587568b102d1689b28870c867d169b3066342a8b3b1c95d57f494175bb632f9fa7dc3
 MISC metadata.xml 341 BLAKE2B d8030e5f1afc6521cbd32bfa5d1a02b06f5d161bf2130dfc38855733cd519ca31b630c2d8dc57784a35a05ce95bb7fda1765ea6fc3666160d8a0c26d89884500 SHA512 68ab75d2293915559f73ad87f7a6b6b0533795a0e79cea2aa835cba84cbcbfbeb3ea9e3bc02e71028431e2e2022936041b75ca2e0beb749ba49afd8f134f6a92
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
index e7ac7adcfc1a..37d8b85b8947 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-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="4"
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6 +ssl gnutls +mta"
 
 DEPEND="ssl? (
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
index d62ab4c9777f..2cf3c592d48f 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-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
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6 libressl +ssl gnutls +mta"
 
 DEPEND="ssl? (
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index a7265376e7dd..9bf37bf7fb0f 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/hack/Manifest b/media-fonts/hack/Manifest
index 6740cd0e30fa..bb5b6f0c36a6 100644
--- a/media-fonts/hack/Manifest
+++ b/media-fonts/hack/Manifest
@@ -1,7 +1,7 @@
 DIST Hack-v2_020-otf.tar.xz 322564 BLAKE2B c4c3abaa829d671b3d063b73837eeb70ebee90de162dbfb5a0c2bf0c238af383a260adfe4bb164eafa7c29bd6e67d5deb91a8b17708f15100aac6ee29d627415 SHA512 d58ef2a7b96557a1feb587efc68e64a16238ca9fd336bafa41c488e48e088a547612890fcaff8899494f2eb0b8acf300815ada8f72df64ae7d19af032fade058
 DIST Hack-v2_020-ttf.tar.xz 404776 BLAKE2B c4f205702620bb68965f3131abad518d418a631b6f08886f4a5bcd3bc8cba783d87bfbf99246c7743b10951caa6d505580effd03d390a7cde0b75a5b723371de SHA512 6901828b8a4bfccf113674bcad3725a0b35aded7da04e765a889fae8fe45d5de791f02167346f276b69c766eefbfcbbb7afec3eca3f3105f067509064f075e65
-DIST Hack-v3.000-ttf.tar.xz 359120 BLAKE2B d59f43e04a8dd4919977756607fcd9b902283976ce4ab81c00558db55c461f914c2b2a015d9dfe09a7de82c8f0fd463a32436b9242b3ca3d7b3ad736e326d838 SHA512 1116bc0d30c32664957a964ec173193fca53188fb9e1297808d736ea7a2958506ad94541837c1f3cd1deb715503fdfc62887b293132d75f706a20957f6246d7a
+DIST Hack-v3.001-ttf.tar.xz 367044 BLAKE2B 49d755d25e600803b0d9a3a93e89caf76d100caf892f05aefe6c3dcb46a34a97840a0b54fd5c8f840b43dd9809c5d6afd30d971658edbbcf7e8ebdfb9ec86a4f SHA512 08200562e8f0cfbb66fa1b867dcba345498646bc96a98d5108062826e4e74add62710a0eb599e577071b07f8652354edad80564c0ae222f30936f2c2faa671e5
 EBUILD hack-2.020-r1.ebuild 568 BLAKE2B 3999a13c191687b459fa7bfd1987f1e237ace502f3b8437a08a354827aa6232e398f83e763222d909425e112dfcdd1702f0bfcf4b2b4926a8b6e1873ff3a388d SHA512 23a0a55fc7153600f51c86eafa8e3ea2058ac06bde17e18f7f3bbdc192e2b58080d89f1dfff71be181861de7b5e73a18f8433ab70a5601e21d7f6db464ddac55
 EBUILD hack-2.020.ebuild 559 BLAKE2B dfa5eb11087918f661c2f0b56244b486c0406b07dcd51a572602018c7788a22a0d8177e8f3fcffb53ca91f6d00b17ee3979243ba6adb41b86780a62b7421d99e SHA512 d6ff056b6efeef7d7b99cd7cd62a1e180b566d4b6b0d2a42ab54a727a702711e1c3a2e507bce0497133080004d8a8ca26ef4237f9014460813d66de6fa07af62
-EBUILD hack-3.000.ebuild 534 BLAKE2B 7ba8b8894f8a37774da71c577def10597a34c122ff42bd9d14621d2d0fb3c53c232480dcc39b8e935d927b0b0685571ea741efb5b53815369bebc4bb78798169 SHA512 ed9163bcc6aa20aa7920f028e42db963756f80da0251029ee8653369859d57e7e26af47848532367ab0802103b52640a9f1666e862e7d69d6c357eed6e07bef0
+EBUILD hack-3.001.ebuild 534 BLAKE2B 7ba8b8894f8a37774da71c577def10597a34c122ff42bd9d14621d2d0fb3c53c232480dcc39b8e935d927b0b0685571ea741efb5b53815369bebc4bb78798169 SHA512 ed9163bcc6aa20aa7920f028e42db963756f80da0251029ee8653369859d57e7e26af47848532367ab0802103b52640a9f1666e862e7d69d6c357eed6e07bef0
 MISC metadata.xml 322 BLAKE2B c8e02209b20e037d40de9fdb967e13fa786facdb9a9a74b3f1cafc60bc039c13a3a0bfbd4e14032386df942db8326f6cf02511f6ca15d2262a02b7e88bea00ed SHA512 f50dfd6348f6c4425efe7a889e1dda8c6ceeeca5617f7f846ba00e5eb5a9e08f65098141432fceebfc212a831c9191c952bc373a6ca633863b6f385d970987c8
diff --git a/media-fonts/hack/hack-3.000.ebuild b/media-fonts/hack/hack-3.001.ebuild
index 7fd0f42adcb8..7fd0f42adcb8 100644
--- a/media-fonts/hack/hack-3.000.ebuild
+++ b/media-fonts/hack/hack-3.001.ebuild
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index 4ab6d2c8fd98..6e17f954e5e8 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 BLAKE2B 9f4c026af2ee6b472454be43b4e1d11616770cb63841fe022762f18a7c71abc37e442102a3d54b880a6a34117442cf45b2d65133ef9cca564e55a26ac1179824 SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b
-EBUILD urw-fonts-2.4.9.ebuild 1994 BLAKE2B 2e2a3a1548aa2f29e254bfa52076cf692d397d9319c248e49b1b9af9ca7fc73200192125ca65e007e91199ace922717e7001dcf0b51c90f041c4f17837171e3d SHA512 802790af94d086fe85ed35613341449444b3f0f51250e12b00176592c147f8c027754a3fd50ae61e056c56a6c6823a6c72d3d7a41ab5c6bff3d9d83dd55bffda
+EBUILD urw-fonts-2.4.9.ebuild 1982 BLAKE2B bf847f101ed628b8bf498e043b40776308600a58412e2387f01ada81b60673f52f0cbe17697d525fafc665147f4aa9200bc65643a001f5a755524ccfc1278406 SHA512 21c31a3983362912092b982a36d0e5c000803378f4847ce51f06ba05f65708c83ff1ce70d540d70416c44e29cfcb42718f8313d7f923e01cc75adcbe03c51562
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 559a096bfcaa..3a4002880753 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.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
 
 # At some point URW++ released fonts under GPL license. After that they were took
@@ -29,7 +29,7 @@ DESCRIPTION="free good quality fonts gpl'd by URW++"
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 00f631b1944a..34d066c3011a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 2b274f918caf..eb1f15e96dfa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,8 +1,10 @@
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
+DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
-EBUILD darktable-2.2.5.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556
-EBUILD darktable-2.4.0.ebuild 3995 BLAKE2B 3746489a294b22909bd231d219bfd1cb60c494beca6a9f8ef1b3b22bb660ab98724b14990b4b0a21b9788aafe15476496a7e6a654fbe7df34c3d1407b70467ac SHA512 00c1a43c39695a653a31beded947baffdd33f24b4873642b021a414ba49946a24990870f44644bbb3e6ca3e12451020cc3f4425e499d019aa6616bc0d94dc42c
-EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62
+EBUILD darktable-2.2.5.ebuild 3829 BLAKE2B 67c3aa78c0173080e13a1d501a3fb01a07fd76f40ba1b1e956b5a51541c04d8bc98a806dce9d0efcf94aafb616fd43fe72bb8c031ead93452e80c026e33845c2 SHA512 f97928203c082af404054f9f0c36379f6103401ed8a7ffe6463c26656364ce373522175513ad6890b0884c8cd6bfb5447236c9b98c7771ba4ec868bcf77f091b
+EBUILD darktable-2.4.0.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
+EBUILD darktable-2.4.1.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
+EBUILD darktable-9999.ebuild 3264 BLAKE2B 06aef5e59ed8218739fbf1ed9588aa0d0d22199352155445f6956eb8cefb3e1877741e9dddc373c241a48cd3ebac8793be07bc1a71ac5d83194ba6b5905b92cc SHA512 ed17c0d301da505e15616729189a6a1381850fcd4d77df157337b211b422b5ef680b2edf94eeaf0575ed7af8ea25813c4b9a4877b553b7f31649e853baa49ae8
 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88
diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
index 6c47755767e9..7c7b70ce4474 100644
--- a/media-gfx/darktable/darktable-2.2.5.ebuild
+++ b/media-gfx/darktable/darktable-2.2.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
@@ -57,10 +57,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index c32deff305a7..db708727b58a 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.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
@@ -56,10 +56,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
new file mode 100644
index 000000000000..db708727b58a
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.4.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
+
+DOC_PV="2.2.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-libs/pugixml:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	libsecret? ( >=app-crypt/libsecret-0.18 )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PRINT=$(usex cups)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_CFLAGS=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geo)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	elog "when updating from the currently stable 1.6 series,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
+	echo
+	ewarn "It will not be possible to downgrade!"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 295cc2e5bade..0a707bfeba93 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-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
@@ -53,10 +53,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 311af5d1d891..4d1a7f0e9ee3 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331
+DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c
+EBUILD gphoto2-2.5.15.ebuild 1399 BLAKE2B b49450a5c5695f093ef6cc2f8396e861320a12c7dac9edc1f0a2399c9b3347b5fc02e197e220d1f7ebc97cde4b81d382c0b5c601ba88ca47d4137f1c3f46562a SHA512 a1352287960faed91dcba03af16b7127b574442bdf9182646327081668c35e7c6dfe26cad16dc09af18c35660207b6963dddaa7660edae6e89bf183d0ae5d98c
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
new file mode 100644
index 000000000000..8353fefc1836
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.5.10:=[exif?]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	exif? (	media-libs/libexif )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+src_prepare() {
+	default
+	if ! use exif ; then
+		# Remove tests that require EXIF to pass, bug 610024
+		rm "${S}"/tests/data/test0{35,36,37,40}* || die
+	fi
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	CPPFLAGS="-I/usr/include/cdk" \
+		econf \
+			$(use_with aalib) \
+			$(use_with aalib jpeg) \
+			$(use_with exif libexif auto) \
+			$(use_with ncurses cdk) \
+			$(use_enable nls) \
+			$(use_with readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
+		install
+
+	einstalldocs
+	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index fe6a341a7d29..e713f3c630e3 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -4,7 +4,7 @@ AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c
 AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
-EBUILD graphviz-2.38.0-r1.ebuild 7875 BLAKE2B c6db8f9f8fe5ad4f824e5d4a7f2fe97bed36a955ef63988969ba04e1ffa062845610a8a38c1d841ca5218750f3cd2c4f553e809fa18a6d27b6491b9d0180f19f SHA512 2f149be71d6b6713b554ed345c4b792e5af143413efe5d66893545cbbc62b83e427ae458a81ee2567f1001e8c3a4ad2efff644d4174a873411daf4cf7cce34fc
-EBUILD graphviz-2.40.1-r1.ebuild 7939 BLAKE2B ee07f5de29111ab5a00634da81c63a409de991219887f5769adf8c5e18ecfb7bf58ce3765a9005491b70495f873f2c869c07638a576a31ffbd64f06949e1039e SHA512 9f8eeabf2c62e81b41735e2793f4b32d3344b0c49c5819b7593de6ab71f3e886941682cdb245413eb093340fb74cfd8417736b833776f6c7a1b35f69f4fc9f6d
-EBUILD graphviz-2.40.1.ebuild 7792 BLAKE2B aa1a463791808a989f06a044d88c0f68f4bab6a6072d50114d59c35e39b083445898b6b8b086661ff32c84acf549014a06796ef279aa9090b23a132ca2a28c8d SHA512 25c9d1358f48f8ef0fea4040ca36d450b4ff7e29083407aa7b117a6792a330d7d0b2f2da1271eafcbeb16b2b1cd1d651a6d96898b2ae7c2e9abf3f712aa7ecfc
+EBUILD graphviz-2.38.0-r1.ebuild 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983
+EBUILD graphviz-2.40.1-r1.ebuild 7927 BLAKE2B 3dec5ef445546063ed1bf45dd8a3d75793bca09095f458cbbcfaf864e39404dfb72987c7da014d9492540c2524101443b4ef7d3e2880495addf62373b7ec33ec SHA512 aee2a8455ea962e819d0bbf1dc9d89ed3ad2c4bc3d39a6dc2fe2248211f1a8b043276e7e468769b80b435f818409277ed9beef71b809f90f1f842f93df5082bb
+EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index 722663a0e684..4c02f369ce20 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.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
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
 
 # Requires ksh
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 1f4bd01a6b18..d26dec591e7b 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/graphviz/graphviz-2.40.1.ebuild b/media-gfx/graphviz/graphviz-2.40.1.ebuild
index 16193a1e4ee3..955db7b461fb 100644
--- a/media-gfx/graphviz/graphviz-2.40.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.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
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
 
 # Requires ksh
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 9585c0524d14..874b43efc289 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,13 +1,7 @@
 AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
-DIST icoutils-0.31.0.tar.bz2 559836 BLAKE2B 3f2c0607cb2be5aa7772ca741e7bffbbec4dba23d9e18e5a3d1015482b8587602627694dd69fe091cce24ae17fa63a40f5a4c18fed36700a75fbe22d649b6680 SHA512 f6ee954784abd9f6cf1f6a2424b89e917de2e3950a5411c6790f1a7a34522e067308677ab00bd34781d179fde1192ec91dcd400207edb09bdb20d503507b5cca
-DIST icoutils-0.31.1.tar.bz2 573484 BLAKE2B c49e486f57e1b3acfadf2f764a5520d085caa07149a705a82cecac532076839db836e10d202543d82c1f55733cf40ea41f4c4282009180bc081e494cd218c826 SHA512 47fe41429cee73b6aff90e2b385b621314700dedfe09989318e439b19a484d806a9428652008be2db70598ba1337e860fba30b6d8104525f9e0bcbb4dc61dc56
-DIST icoutils-0.31.3.tar.bz2 593403 BLAKE2B d444290f97cf754a5d69cd1ff4b905b141b6482bf4c12fc547a10063070a35e7e580f9642ba270a8df88cceb1469b488e44340fba78b85b8014e78794985239a SHA512 3c25dfff0d947ad4688e57871888b7d03ecc1d5aaf2dd957bbfd5d034cbde03238a03446a719b637d2f0c309af424359435d98bddfbdf1ea9d4c08bb23f154d8
 DIST icoutils-0.32.0.tar.bz2 593699 BLAKE2B 5a2dbe67468c1bc0380b94f4ecf707c5e1019539e959c0692d195599ff402c4e5496f46883cdd898abb319d8545b76afe32b172d3f74f674c008c69de5a93463 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
 DIST icoutils-0.32.1.tar.bz2 594036 BLAKE2B cc3e9071ed6b4e4d783831a180eeae60cadac53e7cfc4cc3c2b5db842680500f04a42f9610e71fd52bbaf3b9d8dc0aacfe16ea0605b809df566fa65328abb32c SHA512 e235cbf0e30f7833babd3aba182cf32b8b76ee757d0d44597c21567a6f960943ec187423727cc33016f6b4d4b0367b9bee7da9dc12807551b38bb4fbe14c37f6
-EBUILD icoutils-0.31.0.ebuild 985 BLAKE2B 2d2ad1ec40ee132c49367994a1cd97a0ca4324244266d447b075f6ee0f131251560d3522d132d7fabbb9eb383943e77cf3225e2efe3afa81c54714f2f045c3cc SHA512 917a7ad7167a16b4c661d0849d7dc443c409d1e0909e2c48cbcbb11d9a3aa8ed150da4ff47969f2f51268d83efc73518e17856ea8a39cf11000f8d6ca3b9923f
-EBUILD icoutils-0.31.1.ebuild 988 BLAKE2B fc0be3aa6de5c5e677a71e301ee33ebfe6b7bf3a1f6f311d618e04f760232557318e92e79115d2f8117ccaed6a1d7d9d12103ea71da8ed43fd32462a95824cc2 SHA512 45be7bd50364f423c1cedefebf6e80afd854899f7f85084c0819ed9d3d7103c48c93243d9e80ae60992c80d6d428cc3da28120107f249b0b7152dd09120de326
-EBUILD icoutils-0.31.3.ebuild 1019 BLAKE2B dad0396fcff50fbc67869b1cecf3acf90f15145dae4bd8d6072fda006879289dddf9c3165472da8f6f460a1fdcb4dd9e21111fdd402cf176cdb2d250e5d8c842 SHA512 0cd637de98d94afca95ed61ccf7bdb1ef331cc19eef08c7c13a568013a5cb3aa90b3c15c8c399b4ced503cf6d82b2a6b4bc41f55bf46caf3c69b501ae32b4bc7
 EBUILD icoutils-0.32.0.ebuild 1023 BLAKE2B bd59b621178f0a056a360ef55359ffe0e1cb7c85164382333b5527661ea33646536a9a53bc572aa3f5bf7ab58fb197e090286631a08ef2d8fb50be54212b31a6 SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2
 EBUILD icoutils-0.32.1.ebuild 1026 BLAKE2B 98d0e225dd1e91554a16004fcc184fd558ea56e9920dcce878c924f375e1a89679560f460e1631dee16445c3c93abb8744464e2ec97b538124ba47ec1041af87 SHA512 57f6adc89ece356040261ca24dea89b79e5c11489f901547e12a0f7c9e4939e6a082d903e86da3aa3ec6f6a0a464fec9c3f9276eef48003d186a3c3f7e274b96
 MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.31.0.ebuild b/media-gfx/icoutils/icoutils-0.31.0.ebuild
deleted file mode 100644
index 5e675e469406..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/icoutils/icoutils-0.31.1.ebuild b/media-gfx/icoutils/icoutils-0.31.1.ebuild
deleted file mode 100644
index 07c8686f4234..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/icoutils/icoutils-0.31.3.ebuild b/media-gfx/icoutils/icoutils-0.31.3.ebuild
deleted file mode 100644
index 853d0d254623..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
-	default
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	einstalldocs
-}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index b40bdf2c839f..d07f406b4bb4 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -14,5 +14,5 @@ DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb
 EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0
 EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188
 EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e
-EBUILD inkscape-0.92.2.ebuild 3879 BLAKE2B 086718507185ac24023279ece38978a33bb7a4bf3c153cec7b5f51f87deb579c892d8b21c3bb32403b925e40cd7652cec39e9ac4a7e578dc17f53a01e9d64158 SHA512 e711d9c2c7f43973ba4be09c4368610986c3dfb6efbd200053b99431edf32c5adadfa507a7ed35aa954cf4745f1e3ff17efe6662001766d3b9bb34d632ebc130
+EBUILD inkscape-0.92.2.ebuild 3878 BLAKE2B 3791bcd7a9407ee698be33e1877467de1d073c59bfe3c5b7248849a71e15973769dfb7c165513bf8481d8fa3e636303801d537e3df6e7f1b287f5537ab96d471 SHA512 41016b56b3392cc765fcde4e43baf0739fbd504eeb08d0e9718593dbab9759697104199cb9b17d09f7c123c489de86b1e0759ee326b57bda4b895f6441307d16
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index b64b94f2b343..5aee47f5f692 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 520ed904515e..372ce08e3065 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1,5 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 EBUILD librecad-2.1.3-r2.ebuild 1238 BLAKE2B 4d8663d5bd9897969121283c5d272dfea333dd23e58dac53ee284721a50fc19ebf3ddb915bafa08bf07fb9e649e562256d476cd799c9ab9b2a6f33b30e25daf6 SHA512 ac694a6f1d02179250898479ee0cd0d819793ec4c9747d3f062ee72e2b13438174008cf507aa55f741371de42d1f18c06cb11f0f5edf5e237f88612071cac0a8
-EBUILD librecad-9999.ebuild 1183 BLAKE2B 0cb201b0865a6698ad8cc905c23487caabc22255a4bf2167080f4a7e06ca356f6a350e279c9b115a2a48c329402d4cc81e222a162ad8d86815b7e0f28afc85d3 SHA512 0eacdcb74fbef5864e20db36d7006d1e080a1dd9fc9197ba874e4724add193b8a6b95c31ad9a0ffaf4c71738a6ad5f406bd4ad08ae001e8623d2fdce2a1d8083
+EBUILD librecad-2.1.3-r3.ebuild 1240 BLAKE2B 58aabdf88496e831a36dccf809ff69c334bacb15245dfbd3b94fe44ff3968a4eb8330f2fb64828ed507378053a10b2642bb5896336f9ed557bc406db001f9bef SHA512 eea97966207d444a19c95f83e94420af6e9287d82528a70bdd5fe45bedf83c301e3784d5504d0dbfdcabd5307d76de3b45fce9c8ead0a4dbcac86cbe7095338d
+EBUILD librecad-9999.ebuild 1183 BLAKE2B 9b1ac89fa4d9bf2b29408b3588779fcfc99951bc884f1f68f7964bf78a8d10a907a84c78d8b12b5925f0a89a49ed4e5ec8307a8d2b0f4a272ad86ae790274421 SHA512 b6297b5e9686f35e0fd3efaf52a0e551cec321936cd0009370f17fdabcab61fdf501f505a427748d9af88130653997d7100b6c58d94db16562183205926f4676
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..20902c58015f
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d debug doc tools"
+
+DEPEND="
+	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/freetype:2"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	if ! use 3d; then
+		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	fi
+}
+
+src_configure() {
+	eqmake5 -r
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index de157dedc9ef..efb61a9472a1 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -47,7 +47,7 @@ src_install() {
 	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index cf3f644ccdf3..714da2a96f8d 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,5 +1,5 @@
 DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0
 DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7
 EBUILD scour-0.35-r1.ebuild 655 BLAKE2B 0c6c37502c38260170e04f226c7a25bf78f98e14f5ddfb76b2eeb0ce89221cdf3588cc11f236664c4f8698a867409d531f1b5a7235b0e7f56c00e614beb8731e SHA512 ff88db744f396df8d9c0e964c7a48db367b2dea7bb2093bf06674c4cf1907b36617f27f68828c9a141fe19b23294ac3401fb314277228b3cde8269d8a582f954
-EBUILD scour-0.36.ebuild 666 BLAKE2B 5693fec05ab3e5768b069973e9b09e319aabd021c8bf62d4e715eaf37ff467e4028bc69bbeb3f149e6c9730d7271385d47b5a37b08981b03fc1f08ea1d1e8627 SHA512 3b64773458af27271f42db0a3b115b696eeb43bd04962b251cd53beab1382aceb88f58141af937ad0cc79439029fe39b1b39b898e15433cbd7b0c2fb95736e1c
+EBUILD scour-0.36.ebuild 665 BLAKE2B 3b30b4c52d75da28aa1f533eb4355f2553c3aceaf1d36ec03f1653f50dcfd47f626eebd941afa01f122a7801fdeba77c1f59f320d2ecb1dec9d1966b55192e73 SHA512 4801cabbfa090fdad0f751fe8bca031e7bd028aaa85bf2c608ae91d89d2419d163eea7ff63116ce839bcf03a79e8d4d30f53bb1400c4d9628aafd7da24a90198
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
index a70ee93ef476..2bf29d55e2ca 100644
--- a/media-gfx/scour/scour-0.36.ebuild
+++ b/media-gfx/scour/scour-0.36.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/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index b26fa5b67768..c2404551c37a 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,7 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-EBUILD valentina-0.5.0-r2.ebuild 2416 BLAKE2B 6ee92fb4cd2519d6ec2ced5f21377a89142c83f6e4e9f064c0e0bfc88119cf3d191e5d9f4558228fd6ab30ab3ea9c8ca793b42e2cef2cc249a651fb61ac6b810 SHA512 af345b22a261444419c41dda8815be026952861fdbac348a2cdb17ef9dd558b654b376f3d11afb1d9649b478f42f12f0c5b1b26911b07217c037fd79d8323346
+DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
+EBUILD valentina-0.5.0-r2.ebuild 2564 BLAKE2B 2d91c1cf47ec82cb0040cff641689c91d8e2daf868cd344ba03c4d8cec3ccdebb704d652f5f1dae954bebfab5f38d22304a590620e37fc02e25b0486947c668d SHA512 b41f00a7f2368a4e4ca806d76259ce062fc4310c48eb4c131968b4f6a01b8e2b2c3bec6963f7d7767e7e495be4bda27be64f3aa8d9bf706bb7475060df279856
 EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 9b5a7f5ea11e..d7a61d28cedf 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
 SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
 	https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
-	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch"
+	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
+	https://bitbucket.org/dismine/${PN}/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -40,7 +41,8 @@ S=${WORKDIR}/dismine-${PN}-31c95eadca8b
 
 src_prepare() {
 	epatch "${DISTDIR}/${PN}-4798.patch" \
-		"${DISTDIR}/${PN}-4802.patch"
+		"${DISTDIR}/${PN}-4802.patch" \
+		"${DISTDIR}/${PN}-5406.patch"
 
 	default
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5b3b5910878f..7e5f40db7d04 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ec747bacb1ac..5bd81aee1693 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -14,7 +14,7 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c
 EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
-EBUILD babl-0.1.38.ebuild 1467 BLAKE2B 647da34623564f7f80f61f3ac3244f5e1a860582d7744a89a833c27e2797b9869de278a25e5361e8d91bddbe043b6286db7a62c5c72a30c3791db741eb64ebf5 SHA512 0a4db61b341670504cdf81a4436f84aa9a13064ac64456f48f46c7bd1bb9576e6b704e3d0d7af0cf2378bb22a147fa02a94e616f964c0f5bd3f1c2e3a5bee3c3
+EBUILD babl-0.1.38.ebuild 1466 BLAKE2B a01e99ec7894b18875a76ef70759d4852a2f7abe1f3300802d1d82ea414d0834691844fc81fd53edd62aefaf37e4ab27568a16bcf0e42ccb2936f03b4afa8c5c SHA512 2943ba0d28a786db5cf2819d3060d802b678f686acab74f7e114559d06d334428635765ad2d32781737db3fcb4e3d5d7897478b6def3b452b3711e896b8ef4e5
 EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 56e3e620a12b..4640717f4fa7 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7b10e69413c6..290ab1e83663 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -7,8 +7,8 @@ DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433
 DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
-EBUILD fontconfig-2.11.1-r2.ebuild 4782 BLAKE2B 4bcd94fed5731033e8723f723b60bb459d126352e3c08dfcfde9b115e3f97dc6264dbd3b8d388903b3a7b7c6b37ddb397c33db3e54fdfecf2c1c9bcb7d10f663 SHA512 9062067b0c39210ce14f4ad02ca6c603db6d5ec766e2d250fcf617ad3f6f360e684ae148eaf12c0dbbb334d62f021081c9b1b59220a4f3afd77f0b84a3a13f33
-EBUILD fontconfig-2.12.4.ebuild 4942 BLAKE2B 4a9a8de85fccc6334116363078fd2638af1a9d989afe77930b51d1c8345541c1fd1d40411dd46a1d1b2db962cc1e4c5212f9c39b12d19ee8091c57ebdfaaf6e4 SHA512 ad239f720f3e2d7b41dd2bfd4a59e4a9fac956729caf96877d00e4a451b489c3b553cdab09b7e6555da3fa72760249962bc983c583a6f36620e10fff39ec18b9
-EBUILD fontconfig-2.12.6.ebuild 5020 BLAKE2B 8cf7acfca96c7ed94e598fe4fd41ce574907444de05b1b51dbce5d217acd22b2ccfe2974890aea6b2431f63911638e2a3a1454942437ad50baf17d26542072f3 SHA512 20223c6d58392074ef8658564005fd958b0bb67a6845b63e229290d6b5f9df5a907633c146ad5dd992ef4d0753d3e377209c42e47a9e638d281c3f1e98c58443
-EBUILD fontconfig-2.12.91.ebuild 5021 BLAKE2B 3fe1149281104d8ad95cf2cad63946810aeb10f09cfd38c8b4a7b5a2505f8b8c26c058f4a21c936d759f0e33aaedbaa63b0fe60d4e804ea368676bccc496d0c7 SHA512 b18ed264bf25a44d06ac0d37ec7fc5c78788d90856133018fe8cdad88e2f1a387d552ddfcbc837420826f6baafaf197b9e8b8c97b584aeb0436bed5193daaeca
+EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81
+EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
+EBUILD fontconfig-2.12.6.ebuild 5008 BLAKE2B 681b60673d02536732261e444b8f00b8178f43a6408dc2990644152b2d3d9971f2d7cca9c88ce7b5fe1aa356cca6c1f47b6a2425af0668aba1d0bdfbda0b3c08 SHA512 2aef38239990fa98e967696681f68fed5644ff3acb43d14810ee61505907de091491ea53a7b311ca2c28452eac60a1227b3196f15d0d58aa14c86b618980ee1b
+EBUILD fontconfig-2.12.91.ebuild 5009 BLAKE2B 316c388b65625ae9be41c8a79f48dfcd94cfeabf3fa962edd5aa2ed32d3e9489fc420b2dfdb17b061b64536a90651b6698e23957758a31d55ff82e01315f4682 SHA512 c2b552485c90827698bc12a2b32fff0703262d65360e8cabee78dce071b6fca9cbdf8360d2814ceee760d0195fa0ba252442dd7176f8856cd5e77bc0adb274f9
 MISC metadata.xml 729 BLAKE2B 31b153dd3c6706c13959ad9f2c90a627ea4adc18531c4cf60f9459f040ee915286a303936e53b49cc07e1bfaf800c80f38cbd62105aec88c0329e251a4dd3f47 SHA512 1564dd34d88ce11248bfd5ea6b508eafbc30a4e6ff47f3b9076fbc9f900cf8fe4722a2095512bf7bb659e83fc690d4dbc6b82746a8a38e862577dd09ce7b4a7b
diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
index 4c25251a5b50..4c6d46f88446 100644
--- a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.11.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=5
@@ -12,7 +12,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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
index 545c0af59142..145a584a1438 100644
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.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
@@ -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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 6cfcc3f9fb4a..65dbef6a92cd 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.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="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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
index 7bbb78c79d99..59f25375fa73 100644
--- a/media-libs/fontconfig/fontconfig-2.12.91.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.91.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="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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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/freetype/Manifest b/media-libs/freetype/Manifest
index 257d08f0fed1..59a80552c28c 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,8 +9,8 @@ DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42
 DIST ft2demos-2.8.1.tar.bz2 228934 BLAKE2B a8ff102ec9e526791a83bed42eb5fc289b96f030ebcdbe5bdb4508676d81074ff16120664adeaf95e9d04004e2aba5c86a2b3f5410133344d1ebaf5d4c33cb46 SHA512 f3a3216448df7b9bebb875a69587f31d0548f4b7e1b1bd70b0f06b3c4a43b3f5ca99ac2fcfecb32909b16b32a466fff24d1a6407e5fd6c2145fd64d2a156429a
 DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
-EBUILD freetype-2.8.1.ebuild 5398 BLAKE2B 91adb027e0b1b5903f9ad9d7b456c26df97cded09b5453a9e5f5eb8f71c8ab544424c609d6f969fea99b69019314544d0844074ae4ebcb66ab72e397419dc199 SHA512 b16b15ab519acd02fe9b462ce29987cecb0d3fca081870070c122487c8eeaacb407d13eb345f023718489a04f86c88e7b9b419e6ee2ebcf019bbf21ab77427d7
-EBUILD freetype-2.8.ebuild 5388 BLAKE2B fa9239b515b22566cc2e9f528b7d26e0bad35ae2eda09f68d8104c8f428676053585807caf630afc0e4ebae5f0e548a66967cecb98b1a486f2dfd3c8d28aab89 SHA512 0196c0c055f3a2fd70355569fe2933bbcbcdc4d14656ae5b3a13a487e8048d5ef9ab1365068b2ebc3082c7af92fb3e2f1300f934a320a4c8b03b6156917f777c
-EBUILD freetype-2.9.ebuild 5400 BLAKE2B ca537087b61cef11d2ba6b2e6d377f89029be4517ed0ef6de87e677a669400cd16560559b113f86b25f93b6c0a53c9ed258abfa2840a38a3245207a6acc2f2ac SHA512 43df5ac9eb3b13fc43052bfc7c88ad713a2cdb3fefa97e05ad2934cedcfe16d16d8e15fb8d03287949add0230649fddcf1866d06f1689e381e9abd1849c3638a
-EBUILD freetype-9999.ebuild 6525 BLAKE2B 3416510d17f7e0fb315d597e1b8dec20ada49197ebce1e924c96c5ef8e9a6c34e4b7c95ab0c8a7079a5297d0e688c080f27432518f431a2a92dea95bf05c8b8a SHA512 cd7d5c6780544a3b060eef38f93724001ac4a3aa56ceac5bacd3f2f92f8ebcf0374a33e0f3d0759b63ea061110ac2d2cbdf714f83e9f1948b2413ceb3370a238
+EBUILD freetype-2.8.1.ebuild 5386 BLAKE2B 5b2323e0c1c80e5cb5a1db7cad597b5da397fd454445da8dc5d19fb773106fa2e323a9d9d60ae2e292b4b268f04b36d50c9d05adabb4d01108217ea2c25b13cd SHA512 102ffb4d667cdd320c8e5ef36859e1eb63c50d29bf99167f206bc1b55b6187fb553a58a948743f371137350139da87791edd051e33258cf8da07da905c56c91b
+EBUILD freetype-2.8.ebuild 5376 BLAKE2B e01d966b219ff6ac04d88bdc501d609c3faf6972f9a47bd51c1fa63eb3f77901c86c0f81740d5fb71654add836a7537bd6f033d6a9ca795ad1e42c0282095de6 SHA512 a0d5065fe134b306d64baa120cac70a180aa26704c44b659f877f4cbdd759fcc6888b59d6467c4078254108eac0748f4ce23f4c3e9f8cddcadd2d3fa5fd59fe9
+EBUILD freetype-2.9.ebuild 5388 BLAKE2B ca791fa59917de24b0a6aefac933eb0d2467a3d531d816b4103962067cf008aea46fa2cca3ec15382cc8f890c1d8ab92ed35e6f01b4b7d0ee4bb1690d56992e8 SHA512 e2c1dcced3db7105de2d903ed9cf7bbbe83b1b11d1c4ed65d1ae26b1be0a7b03fd955ed6f3c690c2e0846429cef3bd45043bacf29c8d8aa615a11b7880ae45c2
+EBUILD freetype-9999.ebuild 6513 BLAKE2B d9a64b08ca6b6734ce0416abbe4b9ed940c8d541c296e35b6f8d12e3a890a37000925f6620f90a54691d4afa8b381009dd68d71ff35a4f2313ed11ec589c5b68 SHA512 8da249b6bc7308fed83976afcf52e00a4b62804049fdd0672ac8502d23a1d201a9ac06a84370e6b1b4d3b5d8433fc034d5b49b47c331029f61ba8bbd24546b66
 MISC metadata.xml 1595 BLAKE2B 3c0ee074405a5f567d22df9d68682504bf0e3479bb5165fc5b1c1f186b021315ecd3afcd619b30ed52db2766f7c1163f35dca5af1c94c3f0ccef49390fa0df92 SHA512 245c4d591054ce711d74be3d2d7390f08ccc4275a05c034350b2aef5fc8718bbe96967b67c8abe71b34d794fe9e1ceac36a0313d4b270c81ebafd4baf2c6e3d0
diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index 7592ac935258..1f53aa7d0e65 100644
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.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
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index f5f6757ec8f4..a317f65197ad 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.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
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index 7c6cfcd26bf4..c2f155c27ad8 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index ab1fec804cfc..e2c6dbcb9232 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-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
@@ -22,7 +22,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~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"
 fi
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index f88f0ef3fed5..7a677b593d4a 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.4.ebuild 2084 BLAKE2B 5900122dc6e6213e502f5fd34993d04e27c78ca3d2a5e7660f9ac3b17c48d8de0920aa253135363e1a4a8efbadf5b26c1d34695d735f0ee1f7d78f214a794bc6 SHA512 aac99cf6d28eda87185f48387607635dd9a4edebcd7b17cdeb403ed5360356d51fbcea1836d93eda72c1edbc1509161139481246034835a6e82e737f33eb0f12
-EBUILD gd-2.2.5.ebuild 2059 BLAKE2B 8e354b11becdda2afeff752d2e1c6510ab4fabd4768a806bf6ee85f066cdae08b31c46fac645b6993e64dd595cdae69d4376c48f935b53288a7cf892402db646 SHA512 5b144d82cdb20dd6c3c9c7adc3c386b10637feddfd38c203a4e0206967a1086707ae6b643d824d0900ea9248e5a7811781ab9490138d58cebd0099e28cf1db20
+EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54
+EBUILD gd-2.2.5.ebuild 2047 BLAKE2B 0fdb102aa3cb92ef7a7691c462d155e29601e6b85123898c255187306ea61026cd7c416bdf97ac38816ed61d295c3b4efc230d7ba7d750d9bc0d28007c8c5c97 SHA512 0826e1e8908bda3c31d432f3470a7984b58861f7448fcf7690d87ec2ec2fa4887e8f74f685531d587b3358cb796fd0763891182ba7492d88845b84ce8f2f8c74
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.4.ebuild b/media-libs/gd/gd-2.2.4.ebuild
index 7cdcb905a456..64fb1ae3054d 100644
--- a/media-libs/gd/gd-2.2.4.ebuild
+++ b/media-libs/gd/gd-2.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 3db0e012734d..dd27316e7a25 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a6e6df3c46f7..bfddaa45f55b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f
 EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
 EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e
 EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d
-EBUILD gegl-0.3.26.ebuild 5224 BLAKE2B f82174df3e6b9ebccf7b15ca4cfbc1af02dbfc71665ebf8b558b57a5b3b34a56a95b13ca2beaf62d35a0c3f0ad0d7b0cad2d493de9fbabd7cac983ea32dcb138 SHA512 f7853ceb410245b35a0625e2e8b83400fc1af7cee486d08249da5619345d18145287b62fa903afad2b0cb92b58982451e1f43cdc03e025f0645546efd97b3759
+EBUILD gegl-0.3.26.ebuild 5223 BLAKE2B 6e2f01a4f1f44325043539de3b16860a9b460d7aba6cc65c8bb0cba93c2e8c14510c4f5869a4d25d3f0bd2ce1f74efff0b8dec7d2fb521b52ca5967c08c37b8a SHA512 552259cc6d96f0d2c1d2a7c283cec207c2a9597fb144e35c1bc0ce0100baa3d183f03614b8891e2df2ea2a4423b03ff69f8c70c04af098f5087a098976319e33
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index ae53b1e4361a..53a4e638e092 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 6836c6191e1d..70921f8a4f9f 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,4 +1,4 @@
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
-EBUILD jasper-2.0.12.ebuild 1819 BLAKE2B 5fa4637f2b91eab7ca0d0dde196fccb00bedc25b7c2f418c1c1f04ec603a6ad25ebad76e980df0e5cbedbd91818c468c919ff492bcec577917b298136ffc6159 SHA512 ab4f51bf7574f4fefffce4113c9f7ff293b9349579c3be135b6b50c043705ed0c3b5ee57ed9243e8cee7ac354ba9a6c69d2e0795484d9d74a17a6b45cd7158a6
-EBUILD jasper-9999.ebuild 1834 BLAKE2B 6df082a7c816f527e9c8e9cffb797615acb64bbddcf39c29a2e26bb014be27e1376be9e672efdcc037e4ce2b7877b430451e4ef348bff95f9228d1c62a6d0dae SHA512 448b80064da111aa3b344493d5741053ad7d5f710e917fc106556fa7246b223cc860a6cb7c40c938a073517cbd8134f8354d941581dbd23c13288e820caf93a5
+EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
+EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.12.ebuild b/media-libs/jasper/jasper-2.0.12.ebuild
index 6e89a5e716af..e6fab3f30a0f 100644
--- a/media-libs/jasper/jasper-2.0.12.ebuild
+++ b/media-libs/jasper/jasper-2.0.12.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 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index d0e060bfd024..2c5f27694b7e 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.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
@@ -14,9 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 \
-		~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux \
-		~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 494f639f4f5b..5d9365cdb157 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
 AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1431 BLAKE2B cc2f9479888e210835eb43078a0550766755355b0f67be962d0889a2a3a906f083b7a6fee45cb57f4a81497e4cc124f261ddf08fc4dca6ad4aec9534f40b93c3 SHA512 7c6d2042283a6227774a2a3388d886d2769be7d09a6b27d174643a19b0030c48a55f5ffa3efea1cbc6e81f39afa2bba446205ab8e01f8b8773a41b6ec6ce3cf0
+EBUILD jbigkit-2.1.ebuild 1419 BLAKE2B 723f0e516c64a480f56d51a4117eab84fd1f993d9c965eace0b7ac02811719147f995242982c518d3b9a1e4e59a8e64bdef341f04c24ac6eb0020d63b18656ce SHA512 fb6d7402e2c0ac6f62329be0fca425b14769cb3aff2daafd3617797f2ce014552bc348d85b617310ccf664a146d270e82cb2f7315ebce443ef1c666d8015262e
 MISC metadata.xml 465 BLAKE2B fdf534bd45566d595255f6196cf5d8290a9aa2d7a716f61b90f2f3384610789dd3af84965b80f49b8eb7dc129f2c50052927ad5cc62a12092b6d7db32da2a977 SHA512 a328f6b53c517072f28a88360a31de1ecd5188516ac2a46338c9b6bb1fb92c3727a9823f22e075577bf02a9e937038e87b70932de511174c965b4e991ccc6769
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 8354528a4c42..a27b04bd8d9a 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 3257e6aca627..bfac9fad1766 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -7,8 +7,8 @@ DIST jpegsrc.v9a.tar.gz 1000034 BLAKE2B 24fffc050d30af27c52ace25f716858e882f88e6
 DIST jpegsrc.v9b.tar.gz 1022609 BLAKE2B 334b7d3df800ed2c3e1b5ee2fea40a350c0b4024f5a368efb488b9f782b3d006a691fc53574fa6ad4ff944b69c93478d2d7759635196277774f360511ecff3f9 SHA512 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
 EBUILD jpeg-6b-r12.ebuild 1253 BLAKE2B a9bfd0f21ae1f3f1b96b9effce1f731620f1b0da53138ac897c8cc67c2c5ac1d868a093cbc5624c58d7226813269457987a0dc01a9d6eb13d5c464ab87d37965 SHA512 cb3ec5945863b4bab44d32dbb14aaced20e3960ab64cfaf220cec225685d57ca617e01502364887d9f6925b60950bfd8f7e8dbe89e29d931aeb44ac918fa055b
-EBUILD jpeg-8d-r1.ebuild 2081 BLAKE2B 49d6c956996c0361e5f6cf5c98dd475899b2863bc4cb10a927637f6b31bde65a4f686daaebc07dac196d0443da9f9a6fc88646fd8100f7a4590e99c5628e09ef SHA512 95fbd07ae0c48084b9fb4f91aae37c504324f6f464865fca1d11897729a512b2e7006bd4a072824cedd14651419229b6511b86ce7935de23456584f8b1dfc142
-EBUILD jpeg-8d-r2.ebuild 1544 BLAKE2B c08d954cb61dfc3dbb0a43fa0654917cda3a3b18a531d67aa667bbdad746a2f7ff0d96ebc7357d1a012e5fa9ae7e7ff494705d4b712678efd4aeb1f86ba39ebe SHA512 a4a4188f60f5eb6bf51a7cd729cf17c8dfafd27bd4beab13163ffdb8d60c09ba6bc25128c3e72bd75d2acb3d21f1e0364491d4a0af83468df15b91d1005b4430
-EBUILD jpeg-9a.ebuild 2047 BLAKE2B 5782d178f547738015be5fa25168b7ba7878452ba95edb3b287a5ed4ad02aae3d93b06af19d9a5921937eaff460ab5a86c54b78b5ed47761471ddd0e4f3dcc66 SHA512 61a35aaba06ebe974823fe5cb5a6510b97831856f8fa53db731602a71b77fd513024541d4124f0ad8d0a0725e9ea2b71f775f2d98bd7e647a55411de92eea268
-EBUILD jpeg-9b.ebuild 2047 BLAKE2B 5782d178f547738015be5fa25168b7ba7878452ba95edb3b287a5ed4ad02aae3d93b06af19d9a5921937eaff460ab5a86c54b78b5ed47761471ddd0e4f3dcc66 SHA512 61a35aaba06ebe974823fe5cb5a6510b97831856f8fa53db731602a71b77fd513024541d4124f0ad8d0a0725e9ea2b71f775f2d98bd7e647a55411de92eea268
+EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c17fcbc89cdccadaf40318cd3f6e0f2da72fb21faa206640d76538a185f6a3a29d1bd662b877de083c049f31 SHA512 dea7fd89d094be0cb90e9b99d3f0e9353bca3045a2ca8a110b6eafdbdc27fd2fe5a01c3911697f065e474c1d7b58cdcd39a82552281200b8ed3870a914f549fe
+EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7
+EBUILD jpeg-9a.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
+EBUILD jpeg-9b.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 07c725027733..6c3a792a6132 100644
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 3db4d866048a..445113902da4 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-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=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
 
 LICENSE="IJG"
 SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0
diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild
index b03c0a95b9fb..098a4530dd5e 100644
--- a/media-libs/jpeg/jpeg-9a.ebuild
+++ b/media-libs/jpeg/jpeg-9a.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/jpeg/jpeg-9b.ebuild b/media-libs/jpeg/jpeg-9b.ebuild
index b03c0a95b9fb..098a4530dd5e 100644
--- a/media-libs/jpeg/jpeg-9b.ebuild
+++ b/media-libs/jpeg/jpeg-9b.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 7a6fa76f91ef..3a1a214cdd4d 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -2,7 +2,7 @@ AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be7
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.8-r1.ebuild 1421 BLAKE2B 71c0a348942e30f91bdafc433c889ebec7f429e8103cca8d11f9b7f3a0ced1130a4490ef1c4c9e8db8b70ef0898512b53809a49c00b07cc26ff92ab5ecec662d SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd
-EBUILD lcms-2.8-r2.ebuild 1278 BLAKE2B c80246b9fd43f4a9bcded6bf934bd359dde5cc4a4abcf3f5fdca6c80fd8b9d030e2120dac65d12454a6317fee49e99b8b082684b5ed66dca4bac4166f8068bd8 SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c
-EBUILD lcms-2.9.ebuild 1260 BLAKE2B cd19d63519995caff4973cf3d89e11eab65866897368078dfc0e0222e08e9f5f228bfef08d9398f5ec69ebb25c1ee948f97f0f6880f3e2e20357ad1fe5693c2e SHA512 4c90a4ef2684f95f14c49499d434e6ddae37ccf5672478a2184e96fe55c504fa55a116daecea87e80da3326f511b7762d68b87b9ea950026cabceaf19a2e9860
+EBUILD lcms-2.8-r1.ebuild 1409 BLAKE2B c899180d962e69b7b42cd1cb1e18d543e2f85c2ce4c808663ddcd812ae3565a8a75cff800ea4739bc68a9b66b23a8a55ae96e6b7033d620abe40de4dfafca0a9 SHA512 bbda4f4ba381a4c689bc6b7eff42772807c48c5e310a2ab26ccb85cdfa409a262be8d6e724a3032c03099a152c2ba1caeb83927c2109df03c953f58a6cad3364
+EBUILD lcms-2.8-r2.ebuild 1266 BLAKE2B 952439d7206db82cb2116a8bf8eb58e1bc690613131c714d8ebbe6f5293d8edf06f1fa6cb5dfb67c2e0cde947d6d0b10a69c0ab3a9b327c3938d2791f76bea4d SHA512 594167911967ab6a7a388f930cf043a0eda9f544847ed1521a6c8d5be44d4ff6e3af5c42d3109d448b4f94233bfdd71368858eafa7ecd637daa4a45936284273
+EBUILD lcms-2.9.ebuild 1248 BLAKE2B c1ad40c0281d75cddb536e4002716116ba147d28a49289656718e7e013ba289421166c3f7366f3ed41d08b97dbfa35373dc8d14301888c121765d0cf04670ddd SHA512 2bc97baa5e99dafa5d30f09853abc66522ac73b3acaa796759a523e08a08d426dc0a0a002aa51954bc2c505f3ebddbbfccca4f66c228b4b1d78a545a2af44ac3
 MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
index 9fe8c7f668db..02f88a95ee16 100644
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ b/media-libs/lcms/lcms-2.8-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs +threads test tiff zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/lcms/lcms-2.8-r2.ebuild b/media-libs/lcms/lcms-2.8-r2.ebuild
index 32ce3dfa7b81..34c5ec63739e 100644
--- a/media-libs/lcms/lcms-2.8-r2.ebuild
+++ b/media-libs/lcms/lcms-2.8-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 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 4cb53d0da271..e10e8aaceef9 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.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="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index bf853fb272e6..cf779ad5a061 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,13 +1,8 @@
-AUX libffado-2.3.0-gcc6.patch 1311 BLAKE2B 76148cf44af3130199e8709aae5f7a276a4ed93acfb06735219bc3e4b1bc0d1d37cff57cd20f216e50ec8c1109e33439ecec666a3272809e940b54d61342d027 SHA512 a700c46af0313511bba311fe95634dc0090507256a9ff60a30d10b221fe267d1190af4710b1c4747f8bfa057b0af96e6bab78f6ec4ecef08fb48425092751cd7
-AUX libffado-2.3.0-include-signal.patch 1246 BLAKE2B ac37bf4da0600c0ee518ace257b0de2aaad5a815e3cbedf51490c06ad90acdd893ee2fc40b4b318411c59515654db5276f40e5b0fbe877b5d2985a9e56b0c42e SHA512 c256a59a77160141e082fa6cf358ae0454779e15c01a9ceaf1df8ecd101afc74246654f9c088a67c5453434430bdd390ab2712c617737b2a93fa54edcf685177
-AUX libffado-2.3.0-modelname-strip.patch 2128 BLAKE2B 29c52d8d30136e0a040fe1801a15f4149affbb7de721f8614416a407952714426036f77c2b6451d7bf1f69adbe003258098d2dceda52a7f8d9da0604cdf78a26 SHA512 1ebbe47bdd4d15d6527c4a8c2dfa02861c8a8ce287e1cd44e80356b52007c6e55bc9f267436467f1600c0efbd261da227b947b3648c6a8efcedf8997356153ac
 AUX libffado-2.4.0-additional-py3-fixes.patch 3657 BLAKE2B 8bb214f90fac168c682119d8758efd67812da784770684e7ff47c1d64146da79346d61dfe5b17c0d5e23700f04605d073147a1dd335f0a1da72faf68418a5cd7 SHA512 feb6cd85ee487182b56f003ddee1fc7a1aa3aa07d6d1f3ccbd2ab3735e5d756e836062789a71248d6a16f7377d9d76645c0a17ab76a8d9178b1154cd67783be8
 AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4430600843e57eccc6b96d833b7dfc17ca8f63fb22ff50d959ad06c4c8d06036a96412064ce5630f4a26b53fa0b5eb2e392d8ada66 SHA512 5f31f7db57cf54c05dc00bb00f5f0a5e1771dfd2cd716d9bc56788c24313d14d26fb0ffc7865acb5b55504592929a6b271f657e25971eee37c4aa0a7cc03c382
 AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
 AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
 AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
-DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
 DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
-EBUILD libffado-2.3.0.ebuild 2684 BLAKE2B 223f4ecd0acedf93aa83a1f0a47fa3f23a731313cca1ea5663b1c4fee515a594df0d04dad429e16c2240e60249b5a0aa151890e57d550462f050bd0ee0c028c6 SHA512 68469a77cf5bba5cc880c35b1d07d0bcb36f41901eebe92e8e127b4cbcd08671d393e29723743d568b5122e878b7f097e512eca6b3a05971fbd0b7b06b9617d4
 EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
-MISC metadata.xml 625 BLAKE2B ba2bee4e1ba0c8bc9e8a4bda63c8a184fa4992683ec24bec54424049fbc1b66a8332f25eb6c7841df0198a3a973408fbfe82f0ee306d49f1809d82c12ec3b0c0 SHA512 ac725c6eabcc3cd7fa5ac9f20d936e5a1c494d2a2ed6e504bf27cc750cd328600a8dbcd0adeb27d2bd760ce2b577f9860b1041a899fbfde6b67c4b6a681658eb
+MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
deleted file mode 100644
index 2a73ee1cf8cc..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-------------------------------------------------------------------------
-r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line
-
-TimestampedBuffer.cpp: move the include of math.h to the top of the file which is where most people would expect it to be.  The patch comes from a Fedora RPM source package via Simon Lewis, who suggested that without it gcc6 had trouble with the file (the nature of the problem is not known by the FFADO project at this time).  Earlier versions of gcc (for example, 4.8.2) had no trouble compiling this file without any math.h include, so the issue that some have seen with gcc6 must be due to math.h being removed from some other system-level include file at some point.
-------------------------------------------------------------------------
-Index: src/libutil/TimestampedBuffer.cpp
-===================================================================
---- a/src/libutil/TimestampedBuffer.cpp	(revision 2628)
-+++ b/src/libutil/TimestampedBuffer.cpp	(revision 2629)
-@@ -32,6 +32,7 @@
- 
- #include <cstdlib>
- #include <cstring>
-+#include <math.h>
- 
- #define DLL_PI        (3.141592653589793238)
- #define DLL_SQRT2     (1.414213562373095049)
-@@ -179,8 +180,6 @@
-     m_wrap_at=w;
-     return true;
- }
--#include <math.h>
--
- /**
-  * \brief return the effective rate
-  *
diff --git a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch b/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
deleted file mode 100644
index 4eabf12eef05..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r2706 | jwoithe | 2017-08-08 08:39:56 +0900 (Tue, 08 Aug 2017) | 11 lines
-
-PosixMessageQueue: ensure visibility of SIGEV_THREAD declaration.
-
-Orcan Ogetbil reported on the ffado-devel list that during the recent Fedora
-rebuild effort FFADO 2.3.0 failed to compile because SIGEV_THREAD was
-undeclared.  Jano Svitok made the plausible suggestion that signal.h needs
-to be included explicitly under newer glibc versions.  This trivial patch 
-implements this.  As of this commit it has not been verified that the
-problem is fixed with this addition.  However, there's no harm done by the
-change in general and conceptionally the change is consistent with the
-source file's content given the use of signal-related functionality.
-
-
-Index: src/libutil/PosixMessageQueue.cpp
-===================================================================
---- a/src/libutil/PosixMessageQueue.cpp	(revision 2705)
-+++ b/src/libutil/PosixMessageQueue.cpp	(revision 2706)
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <poll.h>
-+#include <signal.h>
- 
- #define MQ_INVALID_ID ((mqd_t) -1)
- // one second
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
deleted file mode 100644
index 8f28b6ac0f75..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-------------------------------------------------------------------------
-r2677 | jwoithe | 2017-03-22 07:43:24 +0900 (Wed, 22 Mar 2017) | 1 line
-
-configrom: there is no obvious reason why a space should be added to the end of the vendor and model strings returned from the interface.  Retain the explicit null termination of these strings to cover for the case where an interface may not return any null bytes.  Also fix indentation associated with the null termination code.  The issue with the trailing space was noticed and reported by Nils Philippsen: its presence broke a test in the saffire_dice mixer python code.
-------------------------------------------------------------------------
-Index: src/libieee1394/configrom.cpp
-===================================================================
---- a/src/libieee1394/configrom.cpp	(revision 2676)
-+++ b/src/libieee1394/configrom.cpp	(revision 2677)
-@@ -176,13 +176,11 @@
-                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ),
-                 len );
- 
--    while ((buf + len - 1) == '\0') {
--            len--;
-+        while (*(buf + len - 1) == '\0') {
-+                len--;
-         }
--        // \todo XXX seems a bit strage to do this but the nodemgr.c code does
--        // it. try to figure out why this is needed (or not)
--    buf[len++] = ' ';
--    buf[len] = '\0';
-+        // Ensure vendor string is null terminated
-+        buf[len] = '\0';
- 
- 
-         debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf );
-@@ -195,13 +193,11 @@
-         memcpy( buf,
-                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
-                 len );
--    while ((buf + len - 1) == '\0') {
--            len--;
-+        while (*(buf + len - 1) == '\0') {
-+                len--;
-         }
--        // \todo XXX for edirol fa-66 it seems somehow broken. see above
--        // todo as well.
--    buf[len++] = ' ';
--    buf[len] = '\0';
-+        // Ensure model name string is null terminated
-+        buf[len] = '\0';
- 
-         debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf);
-         m_modelName = buf;
diff --git a/media-libs/libffado/libffado-2.3.0.ebuild b/media-libs/libffado/libffado-2.3.0.ebuild
deleted file mode 100644
index b5d17e932632..000000000000
--- a/media-libs/libffado/libffado-2.3.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [ "${PV}" = "9999" ]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-	KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt4 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2
-	sys-apps/dbus
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-	qt4? (
-		dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		x11-misc/xdg-utils
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/libffado-2.3.0-modelname-strip.patch"
-	"${FILESDIR}/libffado-2.3.0-gcc6.patch"
-	"${FILESDIR}/libffado-2.3.0-include-signal.patch"
-)
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt4 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt4; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libffado/metadata.xml b/media-libs/libffado/metadata.xml
index 52a13df73d66..eda35ae2cc67 100644
--- a/media-libs/libffado/metadata.xml
+++ b/media-libs/libffado/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<use>
-		<flag name="qt4">Install qt4-based mixer frontend</flag>
 		<flag name="test-programs">Install standalone test programs</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index ee637eb89abd..fa6254bf95f2 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
+DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
+EBUILD libgphoto2-2.5.16.ebuild 6282 BLAKE2B c92b40817a860ed763d4b6c5fca2fd7dd20194810e190c900b5ac87ea1d08d140b9c146deb4fbe3b12a3cb8727dc1ee3e5d72364b9fc858b44fa42c821cb6be2 SHA512 77d221d999edaeb59a291be1085c60eafce8de9fa3586d287be9664778c66d5341134ab774eec8a7857dac3071d1deba5f20a8c8c06c9271f15bd4afb6889dd8
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
new file mode 100644
index 000000000000..c4110354846e
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#	https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
+
+EAPI=6
+inherit eutils multilib multilib-minimal udev user
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} +cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
+	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+	!<sys-fs/udev-201
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gphoto2-port-config
+	/usr/bin/gphoto2-config
+)
+
+pkg_pretend() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	default
+
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	sed -e 's/sleep 2//' -i configure || die
+}
+
+multilib_src_configure() {
+	local myconf
+	use doc || myconf=( ac_cv_path_DOXYGEN=false )
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${cameras} \
+		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir="$(get_udevdir)" \
+		"${myconf[@]}"
+}
+
+src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		einfo "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	einstalldocs
+	dodoc TESTERS MAINTAINERS HACKING
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug #????
+	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	local udev_rules cam_list
+	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${ED}"${cam_list} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${ED}"/${udev_rules%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
+	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+}
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 868f8b1d7c4a..a00dcb1b513a 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,4 +1,9 @@
+AUX libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch 8278 BLAKE2B fe7ededc5a3d82abf89c6e4923f7c4e7d2020753098921710822f315436dc17577c0a530de9d06587f69cfa7a832fa5e6b43cec0e57f9c0c3f0ca676030fb773 SHA512 8a739951cba5264b11f575fa3e366d0968a6c6f412d0f467be914a5c666f16e6f60f9535a06c96ce50c11f8c99979e19c09d0b2522b1aef1a54be109b7a8f61a
+AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2B aa68693458cf1f8c6677a7014e66feba95145f41099d555d07b05d914a117d8fce9dfc9a07ae0418bfe68f4ec4b6e66f3286009ec33dc80aea8866d9d175a7cd SHA512 05e7abd46ab817edd68fd1f5baac6a95155c1410651e92aea1067b8d80fc1e3cfa1c142527ab5bc578b4703361a992d6c5865beede5297f95260c59215e3d900
+AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
+AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 AUX libharu-2.3.0-dont-force-strip.patch 504 BLAKE2B 5450783ed2ae778d2d522a4e7157f681c12765e6493955a363187bc4032387580f121e427ad26c596a1b6da53d83bf857525a710ad3499188b8a6b7985de9067 SHA512 df72ea19a1c8da3f06c9fff5b5a9d7307baf0144b59b5f4342769027c947ef5ded4e1f5ed3e3310dae27d7f5ec0ab37d585b9dc16ef83e38b7edda4ff13fc950
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 EBUILD libharu-2.3.0-r1.ebuild 845 BLAKE2B fea8329a56331571253f0679e725a5ae0590ad3d7f403d3a1b5cb2831ae59f4d118d1780bef81f6ec02633d696d15029d77dc382a45840eb7d3024ee29c15f8a SHA512 a0a3efba5722bb80fc98de2726c12306382f555f19422b9c34ccdd23b9777bbf08893df15fe2aed6603a092d289c5c0bd887f6b960f4f9c82e4bba533a342820
+EBUILD libharu-2.3.0-r2.ebuild 951 BLAKE2B 2ba22cb4df1badf78d6fb25bcd6ddda4739826f0960d4ab0cefd782a498009cc3125e9f3cc4515265f82033de62e16537c42c20183d36addfaa7d5c5cc592e8f SHA512 f667d92469b308e8f790c48cab5708f521d261fdbd9c4e9cfb6611c406654ea329f5a5c600f58995be12a9afbfb7a229d82dceef4851ae3b75be81050699df0a
 MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
diff --git a/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
new file mode 100644
index 000000000000..83ce9ca93e9f
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
@@ -0,0 +1,248 @@
+From 16c09856508abbf059ed94b9234b28143025318b Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Wed, 24 Jan 2018 10:09:02 +0000
+Subject: [PATCH 1/4] Included necessary char widths in generated PDF
+
+* /W and /CIDToGIDMap can be created in the before_write_fn
+
+* Only add width for actually used glyphs to the /W array
+
+* Try reducing the size of the /CIDToGIDMap.
+
+Only care about actually used glyphs, so that
+a) the length of the array can be reduced,
+b) unused entries can be easily compressed as they are
+   zeroed out.
+---
+ src/hpdf_font_cid.c | 139 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 75 insertions(+), 64 deletions(-)
+
+diff --git a/src/hpdf_font_cid.c b/src/hpdf_font_cid.c
+index d1c1a82..5ab3b28 100644
+--- a/src/hpdf_font_cid.c
++++ b/src/hpdf_font_cid.c
+@@ -346,19 +346,14 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+     HPDF_STATUS ret = HPDF_OK;
+     HPDF_FontAttr attr = (HPDF_FontAttr)parent->attr;
+     HPDF_FontDef fontdef = attr->fontdef;
+-    HPDF_TTFontDefAttr fontdef_attr = (HPDF_TTFontDefAttr)fontdef->attr;
+     HPDF_Encoder encoder = attr->encoder;
+     HPDF_CMapEncoderAttr encoder_attr =
+                 (HPDF_CMapEncoderAttr)encoder->attr;
+ 
+     HPDF_Font font;
+     HPDF_Array array;
+-    HPDF_UINT i;
+-    HPDF_UNICODE tmp_map[65536];
+     HPDF_Dict cid_system_info;
+ 
+-    HPDF_UINT16 max = 0;
+-
+     HPDF_PTRACE ((" HPDF_CIDFontType2_New\n"));
+ 
+     font = HPDF_Dict_New (parent->mmgr);
+@@ -388,11 +383,55 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+     ret += HPDF_Array_AddNumber (array, (HPDF_INT32)(fontdef->font_bbox.bottom -
+                 fontdef->font_bbox.top));
+ 
+-    HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++    /* create CIDSystemInfo dictionary */
++    cid_system_info = HPDF_Dict_New (parent->mmgr);
++    if (!cid_system_info)
++        return NULL;
++
++    if (HPDF_Dict_Add (font, "CIDSystemInfo", cid_system_info) != HPDF_OK)
++        return NULL;
++
++    ret += HPDF_Dict_Add (cid_system_info, "Registry",
++            HPDF_String_New (parent->mmgr, encoder_attr->registry, NULL));
++    ret += HPDF_Dict_Add (cid_system_info, "Ordering",
++            HPDF_String_New (parent->mmgr, encoder_attr->ordering, NULL));
++    ret += HPDF_Dict_AddNumber (cid_system_info, "Supplement",
++            encoder_attr->suppliment);
+ 
+     if (ret != HPDF_OK)
+         return NULL;
+ 
++    return font;
++}
++
++
++static HPDF_STATUS
++CIDFontType2_BeforeWrite_Func  (HPDF_Dict obj)
++{
++    HPDF_FontAttr font_attr = (HPDF_FontAttr)obj->attr;
++    HPDF_FontDef def = font_attr->fontdef;
++    HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr;
++    HPDF_STATUS ret = 0;
++
++    HPDF_Font font;
++    HPDF_Encoder encoder = font_attr->encoder;
++    HPDF_CMapEncoderAttr encoder_attr =
++                (HPDF_CMapEncoderAttr)encoder->attr;
++
++    HPDF_Array array;
++    HPDF_UINT i;
++    HPDF_UNICODE tmp_map[65536];
++    HPDF_UINT16 max = 0;
++
++
++    HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n"));
++
++    font = font_attr->descendant_font;
++    HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++
++    if (ret != HPDF_OK)
++        return ret;
++
+     for (i = 0; i < 256; i++) {
+         HPDF_UINT j;
+ 
+@@ -401,66 +440,70 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ 		HPDF_UINT16 cid = encoder_attr->cid_map[i][j];
+ 		if (cid != 0) {
+ 		    HPDF_UNICODE unicode = encoder_attr->unicode_map[i][j];
+-		    HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (fontdef,
++		    HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (def,
+ 								 unicode);
+-		    tmp_map[cid] = gid;
+-		    if (max < cid)
+-			max = cid;
++		    if (def_attr->glyph_tbl.flgs[gid]) {
++			tmp_map[cid] = gid;
++			if (max < cid)
++			    max = cid;
++		    }
+ 		}
+ 	    } else {
+ 		HPDF_UNICODE unicode = (i << 8) | j;
+-		HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (fontdef,
++		HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (def,
+ 							     unicode);
+-		tmp_map[unicode] = gid;
+-		if (max < unicode)
+-		    max = unicode;
++		if (def_attr->glyph_tbl.flgs[gid]) {
++		    tmp_map[unicode] = gid;
++		    if (max < unicode)
++			max = unicode;
++		}
+ 	    }
+ 	}
+     }
+ 
+     if (max > 0) {
+-        HPDF_INT16 dw = fontdef->missing_width;
++        HPDF_INT16 dw = def->missing_width;
+         HPDF_UNICODE *ptmp_map = tmp_map;
+         HPDF_Array tmp_array = NULL;
+ 
+         /* add 'W' element */
+         array = HPDF_Array_New (font->mmgr);
+         if (!array)
+-            return NULL;
++            return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+         if (HPDF_Dict_Add (font, "W", array) != HPDF_OK)
+-            return NULL;
++            return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+         for (i = 0; i < max; i++, ptmp_map++) {
+-            HPDF_INT w = HPDF_TTFontDef_GetGidWidth (fontdef, *ptmp_map);
++            HPDF_INT w = HPDF_TTFontDef_GetGidWidth (def, *ptmp_map);
+ 
+-            if (w != dw) {
++            if (def_attr->glyph_tbl.flgs[*ptmp_map] && w != dw) {
+                 if (!tmp_array) {
+                     if (HPDF_Array_AddNumber (array, i) != HPDF_OK)
+-                        return NULL;
++                        return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+                     tmp_array = HPDF_Array_New (font->mmgr);
+                     if (!tmp_array)
+-                        return NULL;
++                        return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+                     if (HPDF_Array_Add (array, tmp_array) != HPDF_OK)
+-                        return NULL;
++                        return HPDF_FAILD_TO_ALLOC_MEM;
+                 }
+ 
+                 if ((ret = HPDF_Array_AddNumber (tmp_array, w)) != HPDF_OK)
+-                    return NULL;
++                    return HPDF_FAILD_TO_ALLOC_MEM;
+             } else
+                   tmp_array = NULL;
+         }
+ 
+         /* create "CIDToGIDMap" data */
+-        if (fontdef_attr->embedding) {
+-            attr->map_stream = HPDF_DictStream_New (font->mmgr, xref);
+-            if (!attr->map_stream)
+-                return NULL;
++        if (def_attr->embedding) {
++            font_attr->map_stream = HPDF_DictStream_New (font->mmgr, font_attr->xref);
++            if (!font_attr->map_stream)
++                return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+-            if (HPDF_Dict_Add (font, "CIDToGIDMap", attr->map_stream) != HPDF_OK)
+-                return NULL;
++            if (HPDF_Dict_Add (font, "CIDToGIDMap", font_attr->map_stream) != HPDF_OK)
++                return HPDF_FAILD_TO_ALLOC_MEM;
+ 
+             for (i = 0; i < max; i++) {
+                 HPDF_BYTE u[2];
+@@ -472,47 +515,15 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+                 HPDF_MemCpy ((HPDF_BYTE *)(tmp_map + i), u, 2);
+             }
+ 
+-            if ((ret = HPDF_Stream_Write (attr->map_stream->stream,
++            if ((ret = HPDF_Stream_Write (font_attr->map_stream->stream,
+                             (HPDF_BYTE *)tmp_map, max * 2)) != HPDF_OK)
+-                return NULL;
++                return HPDF_FAILD_TO_ALLOC_MEM;
+         }
+     } else {
+         HPDF_SetError (font->error, HPDF_INVALID_FONTDEF_DATA, 0);
+-        return 0;
++        return HPDF_INVALID_FONTDEF_DATA;
+     }
+ 
+-    /* create CIDSystemInfo dictionary */
+-    cid_system_info = HPDF_Dict_New (parent->mmgr);
+-    if (!cid_system_info)
+-        return NULL;
+-
+-    if (HPDF_Dict_Add (font, "CIDSystemInfo", cid_system_info) != HPDF_OK)
+-        return NULL;
+-
+-    ret += HPDF_Dict_Add (cid_system_info, "Registry",
+-            HPDF_String_New (parent->mmgr, encoder_attr->registry, NULL));
+-    ret += HPDF_Dict_Add (cid_system_info, "Ordering",
+-            HPDF_String_New (parent->mmgr, encoder_attr->ordering, NULL));
+-    ret += HPDF_Dict_AddNumber (cid_system_info, "Supplement",
+-            encoder_attr->suppliment);
+-
+-    if (ret != HPDF_OK)
+-        return NULL;
+-
+-    return font;
+-}
+-
+-
+-static HPDF_STATUS
+-CIDFontType2_BeforeWrite_Func  (HPDF_Dict obj)
+-{
+-    HPDF_FontAttr font_attr = (HPDF_FontAttr)obj->attr;
+-    HPDF_FontDef def = font_attr->fontdef;
+-    HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr;
+-    HPDF_STATUS ret = 0;
+-
+-    HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n"));
+-
+     if (font_attr->map_stream)
+         font_attr->map_stream->filter = obj->filter;
+ 
+-- 
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
new file mode 100644
index 000000000000..78a56f6eb33c
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
@@ -0,0 +1,89 @@
+From c1ecbf1bd286e26572fc0fd7a49d06774d6436f7 Mon Sep 17 00:00:00 2001
+From: Bruno Virlet <bruno.virlet@gmail.com>
+Date: Thu, 30 Nov 2017 12:19:37 +0100
+Subject: [PATCH 2/4] Avoid issue with libtiff duplicate symbols
+
+To achieve this, I move the G3CODES #define to pdf_conf.h so that anyone
+who builds the project has more control.
+---
+ include/hpdf_conf.h    | 3 ++-
+ src/hpdf_image_ccitt.c | 9 ++++-----
+ src/t4.h               | 6 ++++--
+ 3 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/include/hpdf_conf.h b/include/hpdf_conf.h
+index d25b464..27d1dff 100644
+--- a/include/hpdf_conf.h
++++ b/include/hpdf_conf.h
+@@ -78,8 +78,9 @@
+ 
+ /* alignment size of memory-pool-object
+  */
+-#define HPDF_ALIGN_SIZ              sizeof int;
++#define HPDF_ALINMENT_SIZ              sizeof(int)
+ 
++#define G3CODES
+ 
+ #endif /* _HPDF_CONF_H */
+ 
+diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c
+index 8672763..939b0b5 100644
+--- a/src/hpdf_image_ccitt.c
++++ b/src/hpdf_image_ccitt.c
+@@ -21,7 +21,6 @@
+ #include <memory.h>
+ #include <assert.h>
+ 
+-#define	G3CODES
+ #include "t4.h"
+ 
+ typedef unsigned int uint32;
+@@ -578,11 +577,11 @@ HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, unsigned char* bp, unsigned
+ 				a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
+ 				putcode(pData, &horizcode);
+ 				if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
+-					putspan(pData, a1-a0, TIFFFaxWhiteCodes);
+-					putspan(pData, a2-a1, TIFFFaxBlackCodes);
++					putspan(pData, a1-a0, HPDF_TIFFFaxWhiteCodes);
++					putspan(pData, a2-a1, HPDF_TIFFFaxBlackCodes);
+ 				} else {
+-					putspan(pData, a1-a0, TIFFFaxBlackCodes);
+-					putspan(pData, a2-a1, TIFFFaxWhiteCodes);
++					putspan(pData, a1-a0, HPDF_TIFFFaxBlackCodes);
++					putspan(pData, a2-a1, HPDF_TIFFFaxWhiteCodes);
+ 				}
+ 				a0 = a2;
+ 			} else {			/* vertical mode */
+diff --git a/src/t4.h b/src/t4.h
+index f306e15..c4c8c0d 100644
+--- a/src/t4.h
++++ b/src/t4.h
+@@ -55,7 +55,7 @@ typedef struct tableentry {
+  *     during state generation (see mkg3states.c).
+  */
+ #ifdef G3CODES
+-const tableentry TIFFFaxWhiteCodes[] = {
++const tableentry HPDF_TIFFFaxWhiteCodes[] = {
+     { 8, 0x35, 0 },	/* 0011 0101 */
+     { 6, 0x7, 1 },	/* 0001 11 */
+     { 4, 0x7, 2 },	/* 0111 */
+@@ -167,7 +167,7 @@ const tableentry TIFFFaxWhiteCodes[] = {
+     { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
+ };
+ 
+-const tableentry TIFFFaxBlackCodes[] = {
++const tableentry HPDF_TIFFFaxBlackCodes[] = {
+     { 10, 0x37, 0 },	/* 0000 1101 11 */
+     { 3, 0x2, 1 },	/* 010 */
+     { 2, 0x3, 2 },	/* 11 */
+@@ -281,5 +281,7 @@ const tableentry TIFFFaxBlackCodes[] = {
+ #else
+ extern	const tableentry TIFFFaxWhiteCodes[];
+ extern	const tableentry TIFFFaxBlackCodes[];
++const tableentry *HPDF_TIFFFaxWhiteCodes = TIFFFaxWhiteCodes;
++const tableentry *HPDF_TIFFFaxBlackCodes = TIFFFaxBlackCodes;
+ #endif
+ #endif /* _T4_ */
+-- 
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch b/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
new file mode 100644
index 000000000000..385dfc228257
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
@@ -0,0 +1,177 @@
+From 751d8a334d0f3fbce9c74352004e9d3899ec8b38 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Wed, 24 Jan 2018 11:08:16 +0000
+Subject: [PATCH 3/4] cmake fixes
+
+---
+ CMakeLists.txt           | 31 +++++++++++++++++--------------
+ cmake/modules/haru.cmake |  2 +-
+ src/CMakeLists.txt       | 19 ++++++++++++-------
+ src/hpdf_image_png.c     |  2 +-
+ 4 files changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 354ca75..4227f03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ endif(MSVC)
+ 
+ # information about libharu
+ set(LIBHPDF_MAJOR 2)
+-set(LIBHPDF_MINOR 2)
++set(LIBHPDF_MINOR 3)
+ set(LIBHPDF_PATCH 0)
+ set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH})
+ set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.")
+@@ -53,12 +53,17 @@ option(LIBHPDF_STATIC "Build static lib" YES)
+ option(LIBHPDF_EXAMPLES "Build libharu examples" NO)
+ option(DEVPAK "Create DevPackage" NO)
+ 
++if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++  set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
++endif()
++
+ # Enable exceptions on linux if required
+ # (eg if you are using libharu in a C++ environment,
+ # and you want your error-callback to throw an exception,
+ # you will need to enable this for the exception to be
+ # able to throw through the libharu callstack).
+ if (CMAKE_COMPILER_IS_GNUCC OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
++   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+    option (LIBHPDF_ENABLE_EXCEPTIONS "Enable exceptions" NO)
+    if (LIBHPDF_ENABLE_EXCEPTIONS)
+       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
+@@ -81,6 +86,7 @@ endif(BUILD_SHARED_LIBS)
+ # =======================================================================
+ # look for headers and libraries
+ # =======================================================================
++include(GNUInstallDirs)
+ include(haru)
+ include(summary)
+ 
+@@ -110,7 +116,7 @@ endif(PNG_FOUND)
+ if(MSVC_VERSION GREATER 1399)
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
+ endif(MSVC_VERSION GREATER 1399)
+-include_directories(${CMAKE_SOURCE_DIR}/include)
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+ 
+ 
+ # these are options
+@@ -149,16 +155,16 @@ endif (NOT ZLIB_FOUND)
+ 
+ # create hpdf_config.h
+ configure_file(
+-  ${CMAKE_SOURCE_DIR}/include/hpdf_config.h.cmake
+-  ${CMAKE_BINARY_DIR}/include/hpdf_config.h
++  ${CMAKE_CURRENT_SOURCE_DIR}/include/hpdf_config.h.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
+ )
+-include_directories(${CMAKE_BINARY_DIR}/include)
++include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+ 
+ # create DevPackage file
+ if(DEVPAK)
+   configure_file(
+-    ${CMAKE_SOURCE_DIR}/libharu.DevPackage.cmake
+-    ${CMAKE_BINARY_DIR}/libharu.DevPackage
++    ${CMAKE_CURRENT_SOURCE_DIR}/libharu.DevPackage.cmake
++    ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage
+   )
+ endif(DEVPAK)
+ # =======================================================================
+@@ -203,19 +209,16 @@ set(
+     include/hpdf_pdfa.h
+     include/hpdf_3dmeasure.h
+     include/hpdf_exdata.h
+-    ${CMAKE_BINARY_DIR}/include/hpdf_config.h
++    ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
+ )
+ 
+ # install header files
+-install(FILES ${haru_HDRS} DESTINATION include)
++install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ # install various files
+-install(FILES README CHANGES INSTALL DESTINATION .)
+-if(NOT DEVPAK)
+-  install(DIRECTORY if DESTINATION .)
+-endif(NOT DEVPAK)
++install(FILES README CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ if(DEVPAK)
+-  install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif(DEVPAK)
+ 
+ # =======================================================================
+diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
+index 95647b9..f0b08b5 100644
+--- a/cmake/modules/haru.cmake
++++ b/cmake/modules/haru.cmake
+@@ -28,7 +28,7 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
+ # On windows systems the math library is not separated so do not specify
+ # it unless you are on a non-windows system.
+ if(NOT WIN32)
+-  find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
++  find_library(MATH_LIB NAMES m PATHS ${CMAKE_INSTALL_FULL_LIBDIR})
+   if(NOT MATH_LIB)
+     message(FATAL_ERROR "Cannot find required math library")
+   endif(NOT MATH_LIB)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9d2a604..6f93d18 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -72,16 +72,21 @@ set(
+ # =======================================================================
+ if(LIBHPDF_STATIC)
+   add_library(${LIBHPDF_NAME_STATIC} STATIC ${LIBHPDF_SRCS})
++
++  if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
++      set_target_properties(${LIBHPDF_NAME_STATIC} PROPERTIES COMPILE_FLAGS "-fPIC")
++  endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
++
+   target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES})
+   install(
+     TARGETS ${LIBHPDF_NAME_STATIC}
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   )
+   if(WIN32 AND NOT CYGWIN)
+ 		foreach(addlib ${ADDITIONAL_LIBRARIES})
+-			install(FILES ${addlib} DESTINATION lib)
++			install(FILES ${addlib} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 		endforeach(addlib)
+   endif(WIN32 AND NOT CYGWIN)
+ endif(LIBHPDF_STATIC)
+@@ -93,8 +98,8 @@ if(LIBHPDF_SHARED)
+   endif(WIN32 AND NOT CYGWIN)
+   install(
+     TARGETS ${LIBHPDF_NAME}
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   )
+ endif(LIBHPDF_SHARED)
+diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c
+index 3a35f5c..4304ced 100644
+--- a/src/hpdf_image_png.c
++++ b/src/hpdf_image_png.c
+@@ -20,7 +20,7 @@
+ #include "hpdf_image.h"
+ 
+ #ifndef LIBHPDF_HAVE_NOPNGLIB
+-#include <png.h>
++#include "png.h"
+ #include <string.h>
+ 
+ static void
+-- 
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch b/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
new file mode 100644
index 000000000000..5248c4fcac16
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
@@ -0,0 +1,530 @@
+From 54c145867ad04c20cc71878fab662f6eb720621e Mon Sep 17 00:00:00 2001
+From: "David C. Lonie" <david.lonie@kitware.com>
+Date: Wed, 10 May 2017 11:07:28 -0400
+Subject: [PATCH 4/4] Add support for free-form triangle Shading objects.
+
+---
+ include/hpdf.h           |  24 ++++-
+ include/hpdf_error.h     |   3 +
+ include/hpdf_objects.h   |   2 +
+ include/hpdf_pages.h     |   5 +
+ include/hpdf_types.h     |  14 +++
+ src/CMakeLists.txt       |   1 +
+ src/hpdf_page_operator.c |  31 +++++++
+ src/hpdf_pages.c         |  55 ++++++++++-
+ src/hpdf_shading.c       | 231 +++++++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 362 insertions(+), 4 deletions(-)
+ create mode 100644 src/hpdf_shading.c
+
+diff --git a/include/hpdf.h b/include/hpdf.h
+index e369f67..40e3c41 100644
+--- a/include/hpdf.h
++++ b/include/hpdf.h
+@@ -77,6 +77,7 @@ typedef HPDF_HANDLE   HPDF_Dict;
+ typedef HPDF_HANDLE   HPDF_EmbeddedFile;
+ typedef HPDF_HANDLE   HPDF_OutputIntent;
+ typedef HPDF_HANDLE   HPDF_Xref;
++typedef HPDF_HANDLE   HPDF_Shading;
+ 
+ #else
+ 
+@@ -1171,6 +1172,11 @@ HPDF_EXPORT(HPDF_STATUS)
+ HPDF_Page_SetExtGState  (HPDF_Page        page,
+                          HPDF_ExtGState   ext_gstate);
+ 
++/* sh */
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Page_SetShading  (HPDF_Page    page,
++                       HPDF_Shading shading);
++
+ 
+ /*--- Special graphic state operator --------------------------------------*/
+ 
+@@ -1450,7 +1456,23 @@ HPDF_Page_SetCMYKStroke  (HPDF_Page  page,
+ 
+ /*--- Shading patterns ---------------------------------------------------*/
+ 
+-/* sh --not implemented yet */
++/* Notes for docs:
++ * - ShadingType must be HPDF_SHADING_FREE_FORM_TRIANGLE_MESH (the only
++ *   defined option...)
++ * - colorSpace must be HPDF_CS_DEVICE_RGB for now.
++ */
++HPDF_EXPORT(HPDF_Shading)
++HPDF_Shading_New  (HPDF_Doc         pdf,
++                   HPDF_ShadingType type,
++                   HPDF_ColorSpace  colorSpace,
++                   HPDF_REAL xMin, HPDF_REAL xMax,
++                   HPDF_REAL yMin, HPDF_REAL yMax);
++
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
++                          HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
++                          HPDF_REAL x, HPDF_REAL y,
++                          HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b);
+ 
+ /*--- In-line images -----------------------------------------------------*/
+ 
+diff --git a/include/hpdf_error.h b/include/hpdf_error.h
+index b04e2cd..ef4fa61 100644
+--- a/include/hpdf_error.h
++++ b/include/hpdf_error.h
+@@ -145,6 +145,9 @@ extern "C" {
+ #define HPDF_INVALID_U3D_DATA                     0x1083
+ #define HPDF_NAME_CANNOT_GET_NAMES                0x1084
+ #define HPDF_INVALID_ICC_COMPONENT_NUM            0x1085
++/*                                                0x1086 */
++/*                                                0x1087 */
++#define HPDF_INVALID_SHADING_TYPE                 0x1088
+ 
+ /*---------------------------------------------------------------------------*/
+ 
+diff --git a/include/hpdf_objects.h b/include/hpdf_objects.h
+index 525adda..b16de02 100644
+--- a/include/hpdf_objects.h
++++ b/include/hpdf_objects.h
+@@ -61,6 +61,7 @@ extern "C" {
+ #define  HPDF_OSUBCLASS_EXT_GSTATE_R  0x0B00  /* read only object */
+ #define  HPDF_OSUBCLASS_NAMEDICT      0x0C00
+ #define  HPDF_OSUBCLASS_NAMETREE      0x0D00
++#define  HPDF_OSUBCLASS_SHADING       0x0E00
+ 
+ 
+ 
+@@ -595,6 +596,7 @@ typedef HPDF_Array HPDF_Destination;
+ typedef HPDF_Dict  HPDF_U3D;
+ typedef HPDF_Dict  HPDF_OutputIntent;
+ typedef HPDF_Dict  HPDF_JavaScript;
++typedef HPDF_Dict  HPDF_Shading;
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/include/hpdf_pages.h b/include/hpdf_pages.h
+index 44b816c..60b1d84 100644
+--- a/include/hpdf_pages.h
++++ b/include/hpdf_pages.h
+@@ -55,6 +55,7 @@ typedef struct _HPDF_PageAttr_Rec {
+     HPDF_Dict          fonts;
+     HPDF_Dict          xobjects;
+     HPDF_Dict          ext_gstates;
++    HPDF_Dict          shadings;
+     HPDF_GState        gstate;
+     HPDF_Point         str_pos;
+     HPDF_Point         cur_pos;
+@@ -101,6 +102,10 @@ const char*
+ HPDF_Page_GetExtGStateName  (HPDF_Page       page,
+                              HPDF_ExtGState  gstate);
+ 
++const char*
++HPDF_Page_GetShadingName  (HPDF_Page    page,
++                           HPDF_Shading shading);
++
+ 
+ HPDF_Box
+ HPDF_Page_GetMediaBox  (HPDF_Page    page);
+diff --git a/include/hpdf_types.h b/include/hpdf_types.h
+index 8b3e0a8..a2e2157 100644
+--- a/include/hpdf_types.h
++++ b/include/hpdf_types.h
+@@ -557,6 +557,20 @@ typedef enum _HPDF_NameDictKey {
+     HPDF_NAME_EOF
+ } HPDF_NameDictKey;
+ 
++/*----------------------------------------------------------------------------*/
++
++typedef enum _HPDF_ShadingType {
++  HPDF_SHADING_FREE_FORM_TRIANGLE_MESH = 4 /* TODO the rest */
++} HPDF_ShadingType;
++
++typedef enum _HPDF_Shading_FreeFormTriangleMeshEdgeFlag {
++  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_NO_CONNECTION = 0,
++  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_BC,
++  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_AC
++} HPDF_Shading_FreeFormTriangleMeshEdgeFlag;
++
++/*----------------------------------------------------------------------------*/
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6f93d18..d428b78 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -56,6 +56,7 @@ set(
+   	hpdf_page_operator.c
+   	hpdf_pages.c
+   	hpdf_real.c
++  	hpdf_shading.c
+   	hpdf_streams.c
+   	hpdf_string.c
+   	hpdf_u3d.c
+diff --git a/src/hpdf_page_operator.c b/src/hpdf_page_operator.c
+index 23f5920..dda1078 100644
+--- a/src/hpdf_page_operator.c
++++ b/src/hpdf_page_operator.c
+@@ -312,6 +312,37 @@ HPDF_Page_SetExtGState  (HPDF_Page        page,
+     return ret;
+ }
+ 
++/* sh */
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Page_SetShading  (HPDF_Page    page,
++                       HPDF_Shading shading)
++{
++    HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION);
++    HPDF_PageAttr attr;
++    const char *local_name;
++
++    HPDF_PTRACE ((" HPDF_Page_SetShading\n"));
++
++    if (ret != HPDF_OK)
++        return ret;
++
++    if (page->mmgr != shading->mmgr)
++        return HPDF_RaiseError (page->error, HPDF_INVALID_OBJECT, 0);
++
++    attr = (HPDF_PageAttr)page->attr;
++    local_name = HPDF_Page_GetShadingName (page, shading);
++
++    if (!local_name)
++        return HPDF_CheckError (page->error);
++
++    if (HPDF_Stream_WriteEscapeName (attr->stream, local_name) != HPDF_OK)
++        return HPDF_CheckError (page->error);
++
++    if (HPDF_Stream_WriteStr (attr->stream, " sh\012") != HPDF_OK)
++        return HPDF_CheckError (page->error);
++
++    return ret;
++}
+ 
+ /*--- Special graphic state operator --------------------------------------*/
+ 
+diff --git a/src/hpdf_pages.c b/src/hpdf_pages.c
+index fcc9b5c..c0a7c4f 100644
+--- a/src/hpdf_pages.c
++++ b/src/hpdf_pages.c
+@@ -514,7 +514,7 @@ HPDF_Page_GetLocalFontName  (HPDF_Page  page,
+     /* search font-object from font-resource */
+     key = HPDF_Dict_GetKeyByObj (attr->fonts, font);
+     if (!key) {
+-        /* if the font is not resisterd in font-resource, register font to
++        /* if the font is not registered in font-resource, register font to
+          * font-resource.
+          */
+         char fontName[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -603,7 +603,7 @@ HPDF_Page_GetXObjectName  (HPDF_Page     page,
+     /* search xobject-object from xobject-resource */
+     key = HPDF_Dict_GetKeyByObj (attr->xobjects, xobj);
+     if (!key) {
+-        /* if the xobject is not resisterd in xobject-resource, register
++        /* if the xobject is not registered in xobject-resource, register
+          * xobject to xobject-resource.
+          */
+         char xobj_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -654,7 +654,7 @@ HPDF_Page_GetExtGStateName  (HPDF_Page       page,
+     /* search ext_gstate-object from ext_gstate-resource */
+     key = HPDF_Dict_GetKeyByObj (attr->ext_gstates, state);
+     if (!key) {
+-        /* if the ext-gstate is not resisterd in ext-gstate resource, register
++        /* if the ext-gstate is not registered in ext-gstate resource, register
+          *  to ext-gstate resource.
+          */
+         char ext_gstate_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -673,6 +673,55 @@ HPDF_Page_GetExtGStateName  (HPDF_Page       page,
+     return key;
+ }
+ 
++const char*
++HPDF_Page_GetShadingName  (HPDF_Page    page,
++                           HPDF_Shading shading)
++{
++    HPDF_PageAttr attr = (HPDF_PageAttr )page->attr;
++    const char *key;
++
++    HPDF_PTRACE((" HPDF_Page_GetShadingName\n"));
++
++    if (!attr->shadings) {
++        HPDF_Dict resources;
++        HPDF_Dict shadings;
++
++        resources = HPDF_Page_GetInheritableItem (page, "Resources",
++                                                  HPDF_OCLASS_DICT);
++        if (!resources)
++            return NULL;
++
++        shadings = HPDF_Dict_New (page->mmgr);
++        if (!shadings)
++            return NULL;
++
++        if (HPDF_Dict_Add (resources, "Shading", shadings) != HPDF_OK)
++            return NULL;
++
++        attr->shadings = shadings;
++    }
++
++    /* search shading-object from shading-resource */
++    key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
++    if (!key) {
++        /* if the shading is not registered in shadings resource, register
++         *  to shadings resource.
++         */
++        char shading_str[HPDF_LIMIT_MAX_NAME_LEN + 1];
++        char *ptr;
++        char *end_ptr = shading_str + HPDF_LIMIT_MAX_NAME_LEN;
++
++        ptr = (char *)HPDF_StrCpy (shading_str, "Sh", end_ptr);
++        HPDF_IToA (ptr, attr->shadings->list->count, end_ptr);
++
++        if (HPDF_Dict_Add (attr->shadings, shading_str, shading) != HPDF_OK)
++            return NULL;
++
++        key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
++    }
++
++    return key;
++}
+ 
+ static HPDF_STATUS
+ AddAnnotation  (HPDF_Page        page,
+diff --git a/src/hpdf_shading.c b/src/hpdf_shading.c
+new file mode 100644
+index 0000000..53204c0
+--- /dev/null
++++ b/src/hpdf_shading.c
+@@ -0,0 +1,231 @@
++/*
++ * << Haru Free PDF Library >> -- hpdf_shading.c
++ *
++ * URL: http://libharu.org
++ *
++ * Copyright (c) 1999-2006 Takeshi Kanno <takeshi_kanno@est.hi-ho.ne.jp>
++ * Copyright (c) 2007-2009 Antony Dovgal <tony@daylessday.org>
++ * Copyright (c) 2017 Kitware <kitware@kitware.com>
++ *
++ * Permission to use, copy, modify, distribute and sell this software
++ * and its documentation for any purpose is hereby granted without fee,
++ * provided that the above copyright notice appear in all copies and
++ * that both that copyright notice and this permission notice appear
++ * in supporting documentation.
++ * It is provided "as is" without express or implied warranty.
++ *
++ */
++
++#include "hpdf.h"
++#include "hpdf_utils.h"
++
++#include "assert.h"
++
++typedef struct _RGBVertex
++{
++  HPDF_UINT8 EdgeFlag;
++  HPDF_UINT32 X;
++  HPDF_UINT32 Y;
++  HPDF_UINT8 RGB[3];
++} RGBVertex;
++
++static const char *COL_CMYK = "DeviceCMYK";
++static const char *COL_RGB = "DeviceRGB";
++static const char *COL_GRAY = "DeviceGray";
++
++/* bbox is filled with xMin, xMax, yMin, yMax */
++static HPDF_BOOL _GetDecodeArrayVertexValues(HPDF_Shading shading,
++                                             HPDF_REAL *bbox)
++{
++  HPDF_Array decodeArray;
++  HPDF_Real r;
++  int i;
++
++  if (!shading) {
++    return HPDF_FALSE;
++  }
++
++  decodeArray = (HPDF_Array)(HPDF_Dict_GetItem(shading, "Decode",
++                                               HPDF_OCLASS_ARRAY));
++  if (!decodeArray) {
++    return HPDF_FALSE;
++  }
++
++  for (i = 0; i < 4; ++i)
++  {
++    r = HPDF_Array_GetItem(decodeArray, i, HPDF_OCLASS_REAL);
++    if (!r) {
++      return HPDF_FALSE;
++    }
++
++    bbox[i] = r->value;
++  }
++
++  return HPDF_TRUE;
++}
++
++static void UINT32Swap (HPDF_UINT32  *value)
++{
++  HPDF_BYTE b[4];
++
++  HPDF_MemCpy (b, (HPDF_BYTE *)value, 4);
++  *value = (HPDF_UINT32)((HPDF_UINT32)b[0] << 24 |
++           (HPDF_UINT32)b[1] << 16 |
++           (HPDF_UINT32)b[2] << 8 |
++           (HPDF_UINT32)b[3]);
++}
++
++/* Encode a position coordinate for writing */
++static HPDF_UINT32 _EncodeValue(HPDF_REAL x, HPDF_REAL xMin, HPDF_REAL xMax)
++{
++  HPDF_DOUBLE norm = (x - xMin) / (xMax - xMin);
++  HPDF_DOUBLE max = (HPDF_DOUBLE)(0xFFFFFFFF);
++  HPDF_UINT32 enc = (HPDF_UINT32)(norm * max);
++  UINT32Swap(&enc);
++  return enc;
++}
++
++HPDF_EXPORT(HPDF_Shading)
++HPDF_Shading_New  (HPDF_Doc         pdf,
++                   HPDF_ShadingType type,
++                   HPDF_ColorSpace  colorSpace,
++                   HPDF_REAL xMin, HPDF_REAL xMax,
++                   HPDF_REAL yMin, HPDF_REAL yMax)
++{
++  HPDF_Shading shading;
++  HPDF_Array decodeArray;
++  HPDF_STATUS ret = HPDF_OK;
++  int i;
++
++  HPDF_PTRACE((" HPDF_Shading_New\n"));
++
++  if (!HPDF_HasDoc(pdf)) {
++    return NULL;
++  }
++
++  /* Validate shading type: */
++  switch (type)
++  {
++    case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
++      break;
++
++    default:
++      HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
++      return NULL;
++  }
++
++  decodeArray = HPDF_Array_New(pdf->mmgr);
++  if (!decodeArray) {
++    return NULL;
++  }
++
++  /* X-range */
++  ret += HPDF_Array_AddReal(decodeArray, xMin);
++  ret += HPDF_Array_AddReal(decodeArray, xMax);
++
++  /* Y-range */
++  ret += HPDF_Array_AddReal(decodeArray, yMin);
++  ret += HPDF_Array_AddReal(decodeArray, yMax);
++
++  const char *colName = NULL;
++  switch (colorSpace) {
++    case HPDF_CS_DEVICE_RGB:
++      colName = COL_RGB;
++      for (i = 0; i < 3; ++i) {
++        ret += HPDF_Array_AddReal(decodeArray, 0.0);
++        ret += HPDF_Array_AddReal(decodeArray, 1.0);
++      }
++      break;
++
++    default:
++      HPDF_SetError(pdf->mmgr->error, HPDF_INVALID_COLOR_SPACE, 0);
++      return NULL;
++  }
++
++  if (ret != HPDF_OK) {
++    return NULL;
++  }
++
++  shading = HPDF_DictStream_New(pdf->mmgr, pdf->xref);
++  if (!shading) {
++    return NULL;
++  }
++
++  shading->header.obj_class |= HPDF_OSUBCLASS_SHADING;
++  ret += HPDF_Dict_AddNumber(shading, "ShadingType", type);
++  ret += HPDF_Dict_AddName(shading, "ColorSpace", colName);
++
++  switch (type)
++  {
++    case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
++      ret += HPDF_Dict_AddNumber(shading, "BitsPerCoordinate", 32);
++      ret += HPDF_Dict_AddNumber(shading, "BitsPerComponent", 8);
++      ret += HPDF_Dict_AddNumber(shading, "BitsPerFlag", 8);
++      ret += HPDF_Dict_Add(shading, "Decode", decodeArray);
++      break;
++
++    default:
++      HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
++      return NULL;
++  }
++
++  if (ret != HPDF_OK) {
++    return NULL;
++  }
++
++  return shading;
++}
++
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
++                          HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
++                          HPDF_REAL x, HPDF_REAL y,
++                          HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b)
++{
++  HPDF_STATUS ret = HPDF_OK;
++  RGBVertex vert;
++  float bbox[4];
++
++  HPDF_PTRACE((" HPDF_Shading_AddVertexRGB\n"));
++
++  if (!shading) {
++    return HPDF_INVALID_OBJECT;
++  }
++
++  if (_GetDecodeArrayVertexValues(shading, bbox) != HPDF_TRUE) {
++    return HPDF_SetError(shading->error, HPDF_INVALID_OBJECT, 0);
++  }
++
++  vert.EdgeFlag = (HPDF_UINT8)edgeFlag;
++  vert.X = _EncodeValue(x, bbox[0], bbox[1]);
++  vert.Y = _EncodeValue(y, bbox[2], bbox[3]);
++  vert.RGB[0] = r;
++  vert.RGB[1] = g;
++  vert.RGB[2] = b;
++
++  ret = HPDF_Stream_Write(shading->stream,
++                          (HPDF_BYTE*)(&vert.EdgeFlag), sizeof(vert.EdgeFlag));
++  if (ret != HPDF_OK)
++  {
++    return ret;
++  }
++
++  ret = HPDF_Stream_Write(shading->stream,
++                          (HPDF_BYTE*)(&vert.X), sizeof(vert.X));
++  if (ret != HPDF_OK)
++  {
++    return ret;
++  }
++
++  ret = HPDF_Stream_Write(shading->stream,
++                          (HPDF_BYTE*)(&vert.Y), sizeof(vert.Y));
++  if (ret != HPDF_OK)
++  {
++    return ret;
++  }
++
++  ret = HPDF_Stream_Write(shading->stream,
++                          (HPDF_BYTE*)(&vert.RGB), sizeof(vert.RGB));
++
++  return ret;
++}
+-- 
+2.16.0
+
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..37c65b826878
--- /dev/null
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+MYP=RELEASE_${PV//./_}
+
+DESCRIPTION="C/C++ library for PDF generation"
+HOMEPAGE="http://www.libharu.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MYP}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-1-Included-necessary-char-widths-in-generated-PDF.patch
+	"${FILESDIR}"/${P}-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
+	"${FILESDIR}"/${P}-3-cmake-fixes.patch
+	"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
+)
+
+mycmakeargs=(
+	-DLIBHPDF_EXAMPLES=NO # Doesn't work
+	-DLIBHPDF_STATIC=NO
+	-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index bff0dda0fbb7..78c7b4fe46be 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -11,11 +11,11 @@ DIST libpng-1.6.32-apng.patch.gz 10382 BLAKE2B 572f2f9e4fdff185de2c86781370bf880
 DIST libpng-1.6.32.tar.xz 997136 BLAKE2B 5013e8740ac7b263de4bce4abb536def085de18aaa36561aba3af1adb2a54fb7cf39f291b2e92ad6dfc5bcae76436eb264c16b0997063a7ef319c03a7a5270e8 SHA512 24cf4d38dc08d1db7721fc580d8bf6cee9a105afcea32f1245b7bb3727c8a8645ad733a24534782ef5dfb0d4315a5fd6b0eee9e7f0704e0c635350f80c19a708
 DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
 DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
-EBUILD libpng-1.2.57.ebuild 1015 BLAKE2B b8d3fd1371e04ee091ece4c23f67b492b05d064eaee7b1b3945216daeac6e7b0e37c2de23760c5e7659afe2b056570c058db3b01ae2cf86482af750a2204b78b SHA512 ae0fa8d9595a3439ffa8427b971124bb0c44b13199d23943cf5b50d1aa95b707b560950cd40e4d0fbb150c148d3598cf4d3b0e78d09c70c4e9cc1907ea1f8bfa
-EBUILD libpng-1.5.28.ebuild 1790 BLAKE2B 223c1ba2280d1e64f376d3bf820856fc483c8c4f4a311e1ecd3ba2695090a471460225ae4a5c1bb20fbab122eb3600f125216ef04841d00d0433d08bd56c5830 SHA512 100016d33a3cb1b94e101b006f4cb21f0afc056fce229302836d88b894d43f713a878ba75e619dbb40250511cc235be68d386eaaca31f5c7f9b672bb87dde5ce
-EBUILD libpng-1.6.27.ebuild 1396 BLAKE2B 91c3c52fb21643dcba38fc0be67b4527f14862759e4541c04a44eef038b530e51ea86790e4c028b42b9d9754394ec1a36cc6a1b3b81181a1278f9500032aebf4 SHA512 aa1633c553d0364c34b3e131bad3d58d46f3cab29a8bf5397c6ddb965147ad88085ae332ccff475f4b2b5fa2807e5d07f60c9f05bda6c28a8386ff0b59b577b5
-EBUILD libpng-1.6.29.ebuild 1473 BLAKE2B 6c429d2962ed78f777cda32d52a22a94dc71c05b611025c806595f0992cf3bf546f66c4acdb94657eba288b919eb459e16aa3e5a89cd4c1754175741af62d54b SHA512 d6e74f799b3ccc27112153bec490d6a6ed37014e89232fd78643b7d25436c545bfffd2603db15716e0d9f5050d8913444bb4ec348ec2bf6bf169fa9f1680ebbc
-EBUILD libpng-1.6.31.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
-EBUILD libpng-1.6.32.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
-EBUILD libpng-1.6.34.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
+EBUILD libpng-1.2.57.ebuild 1003 BLAKE2B dc6e1f723471ced6448d0458213a9d88995efd397003de2952c4f393fa64a84990a61737b5abd81cdccea800e2efd1fa675dbe9020d1e1cb747f2db99b296b40 SHA512 3ef798d4f394e35d833a3b1ee66521186cfcaa00770141a64347e7592972f620a10321f9cfe32d8eff8e0c2b2c3c91b3b690e8ed51b5aa493410d2f253e1ca08
+EBUILD libpng-1.5.28.ebuild 1778 BLAKE2B 544221137ad9594e82f7204f09631804984015ad3db7c8eb7123bbdca95c80a55206b212e51a54521e699bf95c1bc08ec8e5704d73e58e691b0af9c8f96341cf SHA512 67fef4c1a3bd619de59515c6409b566ab8d595ef1b777bc48646fcff8acbb315719462961275b078d9a7bf70200e523b081dc2669c5338b0d7de26fb4596d190
+EBUILD libpng-1.6.27.ebuild 1384 BLAKE2B 4e061b59938050d4eb0cda041f5a80e9d152f0704bdc1b9f98c9728d3f5568c1babcf7698f9eabae3376789a47cf6a20bef617ca38d3909349f2f9848ded609f SHA512 eded8c75fc7f472e588837b498693883312bb45a9c591bf3578ebfbc082b3ee44d9b1ed31bfb10abe565f1a6353ba8d5ff540ae886e31685dd6e754d6d4afc11
+EBUILD libpng-1.6.29.ebuild 1461 BLAKE2B ce6d523c26a91654346ffe52f57f12bd725448a94b9875c7d2fbe4a54ff049769bdfafb3f7c8e1591f0f478dbdd7dd78063b59cf8325e3f6793b61e205f397e4 SHA512 b052477b925c86814b42ae23f5086d76e25f3f5c7b31972fb41b41784c9169dffbe02f672e4e1af14b19cd17f9d0858cdb60e0744d64bad89a7c109b5d6c35ba
+EBUILD libpng-1.6.31.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
+EBUILD libpng-1.6.32.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
+EBUILD libpng-1.6.34.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild
index aa7c7dd5ff59..e94ff6442c3e 100644
--- a/media-libs/libpng/libpng-1.2.57.ebuild
+++ b/media-libs/libpng/libpng-1.2.57.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="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
index ba8c989b848a..4845cc7dca5f 100644
--- a/media-libs/libpng/libpng-1.5.28.ebuild
+++ b/media-libs/libpng/libpng-1.5.28.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.27.ebuild b/media-libs/libpng/libpng-1.6.27.ebuild
index 47a6cefb1cd0..608fa8163258 100644
--- a/media-libs/libpng/libpng-1.6.27.ebuild
+++ b/media-libs/libpng/libpng-1.6.27.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://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE="apng neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild
index aaaac3d6a141..7d532ea92a75 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.29.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://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.31.ebuild b/media-libs/libpng/libpng-1.6.31.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.31.ebuild
+++ b/media-libs/libpng/libpng-1.6.31.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://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.32.ebuild b/media-libs/libpng/libpng-1.6.32.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.32.ebuild
+++ b/media-libs/libpng/libpng-1.6.32.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://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.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://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index a6cc724bcb79..3ad85dcba4ff 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,13 +1,13 @@
 DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.5.tar.gz 1280046 BLAKE2B 167267922a1a8d16e3b13dbf4c8cda3bfa31a9e5d98eb9fc3929eb61df4cf6491a49772d1fd8a18da525709481afa34c7b85c996d02445012ddcadb90bbc0675 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81
 DIST LibRaw-0.18.6.tar.gz 1282212 BLAKE2B db53d22a38535f0b96fd02aa52969206d4003579706a4c2b8ed00c6df0785e062ea92fd9613bfe5e94efc65bb69fefb8661d2afc4b57341800a4176ba264bc83 SHA512 ce916a85dcc8ad50a631e9f0e4532d4cc300624b5c78d233531317f33cdf74363cdbcab1fbef3207e89b77bac5be370ef8ff1b806dbb9ae2c4cc0ec607b53e55
+DIST LibRaw-0.18.7.tar.gz 1280935 BLAKE2B 6bc35b05ecca81cb1a8d0e054c2b74eb8f2f4e58e4f6085a1c4886bf96180a547452d4164c6d0f74fa49e6c1b06ee6663b4b9b94aadbaee4c7de890e4e11959e SHA512 5d906e69427d4f9edff8b3bc24eb85896e037dd98578cf07c668b96f6abd82bc8dd9f937ecbca6472d334c4cf8d8cbc8b07c2c84aba748e22ec55cecc6a4ed78
 DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
-DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 BLAKE2B 6881852b59bc728eee6f31d5b355ee7583390adcc62446d0f4c9df6efe45b0384e192e9ce8e48815c960af89890a9ee4c3f5a2f0e0f1086bc943c8425b7e5930 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5
 DIST LibRaw-demosaic-pack-GPL2-0.18.6.tar.gz 32638 BLAKE2B 070a09732a018c3c759fd6417ff9f8b97ba6cf4bafc2efcb24c9d0809fe53565ff74b60c46f640e76a3a95486fc70a08f6059fb311e4f3b3337048665caef38d SHA512 2a4f317c2594825a7a7ad62eb5592ad3d512026dc49b87123ae4f5a05731912fcf4f3e22169acbc1decf6b79aec34a7250d892b686fe824f8bb2c5afa759c7ae
+DIST LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz 30659 BLAKE2B 11bb00034838470c9b5762761acde6d6c49c0dfe7e342cc1a6e4f0744b718ba6c5dfb027c5144a0858214c91faf9b726e5c008758cc5c2f9464b7feb4db9eda9 SHA512 1a967eb06807bc5ce2177d4e13d394e8f4afe15e5ef07d9a49c1a2172f0961cd122a3bfa84fa66a203766d50735adacbffd48ba8deead8a202c3c2a1e4a97ffa
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
-DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 BLAKE2B 8ad0e18c0f33d4cd485668cb126ca18677271f4b141c64e0adfe918b3a04e4dbf2b4a11eb810ca6b93e850babf755ed4df1f2d85c9ca8cfbfe78ca3b5a14ac63 SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028
 DIST LibRaw-demosaic-pack-GPL3-0.18.6.tar.gz 39247 BLAKE2B 73319b2c33c24b570036725585c15bffe9bffb1252a8cf64cd3628dab22cf17e12e7fc87efb5c5ae8581dfcd59d0f9bd7dc41817a2ceb1dd2b1e2b09e76423ce SHA512 53ad72654f407dbb3b591f2d1ff12de1cb273de5339d598e76260ee2e2c4095d70d3b0f30536cbb7eb06d802bcf6cc76e6b870837a3e4dc640f4a14da020a704
+DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e290c088bdde9646ca94a7ecaf4997af5e2da4410ec70671d0e597c1748072266c241b7021b16344a8d8507ebc938ce03ab1f061630a6 SHA512 347a39d8326e4614b83c2721baa09414738416d405d7db516d155a867902dd85cf51d156705d1fd0bc933802cd3a01cfb1c9da43f4cdff15b7a7253674b91c4a
 EBUILD libraw-0.18.4.ebuild 1709 BLAKE2B e9f8aa141cc9a75922d8cd242194f18c6c4aee4869d005a39a45aea15134607274309e03c785c03ca542f2fccad46ed296849143f057b7a72f4741e34fb0df22 SHA512 bc71024b25099e5d8f1d159da3c0c547e66daccc8154d925f5b261c72db5e2cb3fb840974a7c84888d9190254388da892d0746ab77ad58392d9f5eba471dc14f
-EBUILD libraw-0.18.5.ebuild 1718 BLAKE2B d5a7c80018a5848d097ef300d3ff49bef0589f8c092934f603d5f09efbdf64a4f32ff78b30ae7afb6a5868221fb15394525db8d8cd3d096f6dce270ff2e22b4d SHA512 7a411fcef607ef7b41496284df88f9e6c4bd82ba87cdd0693ed34b820c698dba384a81886764fac86c0386f004fdfba787d29f22ca58e12aad58e7f5e56bbc3f
 EBUILD libraw-0.18.6.ebuild 1724 BLAKE2B b54447a16c286c835e3d8dfac31dd879fe33604a7f6b58c3fbf7bcee01314bb1a7380dd265b7c3195c5de981b8a73591cf1650bb65a2825d626540867de704cf SHA512 c8d43d50d6e092fa4469cc0262d0eac82f6c09893aa1d507f9a4a5d5f4340084a558d98a73b8ffa975bfc854b5af47e3b220ef4c079d7d060ab0d335d56201f2
+EBUILD libraw-0.18.7.ebuild 1724 BLAKE2B 0ee8e541096ea18d807bd415b555787a1b05ed4de25da96532acff9c3c5dc66195ab55aa89122a0927b359d393ab6ad5a6a95ad152aff53c6bd78322874512b5 SHA512 4e6337c9558d007325a24aa839cb167fa68c3e18d3bd4d671d03d87f93bd9f012924145355f87e2543c4f0fbf67f0dc3424d17e502718c39da551a17b47f3636
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.5.ebuild b/media-libs/libraw/libraw-0.18.5.ebuild
deleted file mode 100644
index e66ec29b75cb..000000000000
--- a/media-libs/libraw/libraw-0.18.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.7.ebuild b/media-libs/libraw/libraw-0.18.7.ebuild
new file mode 100644
index 000000000000..4989fcd6c7fb
--- /dev/null
+++ b/media-libs/libraw/libraw-0.18.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
+	demosaic? (
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
+	)"
+
+LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
+SLOT="0/16" # subslot = libraw soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable demosaic demosaic-pack-gpl2)
+		$(use_enable demosaic demosaic-pack-gpl3)
+		$(use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jasper)
+		$(use_enable lcms)
+		$(use_enable openmp)
+	)
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1c30391a96e0..f6c533023d42 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,8 +2,10 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900
 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
 DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
 DIST mesa-17.3.3.tar.xz 10637708 BLAKE2B a2cec4abc58eb71c1ec92d073ac3a128e1f993f69b163c9f6e474fef4520fe074d84ca8d972a7822a76226e132230f6e7fac320b940ea3462553d398ef6bcfce SHA512 7ac8ecdcf3b2b43239835bc2c5da7f2730f80a2db945fe00df03d1548920fbc074dd4806ddd345a1ce682fd29d75b2209ef81b6b06e657f9c8ae8622a34a03c1
+DIST mesa-18.0.0-rc2.tar.xz 10962300 BLAKE2B 89444a46261d837bd5c7bc54898ebdafe58e863d3532bd80f6592432d2925317fc0ac144dd55862a249d6390efc3955942dc2980ce87e589b9360de61a1f6148 SHA512 aada4caf4c2021bc1e7c071b32ed0ccbbbfe415bc1cb5a80eee3911b1b11a2bd87a10e99c5a152790709488afbdb60e87b4b66c2ca22c0cf89c029fb10c6e8b3
 EBUILD mesa-17.1.10.ebuild 13439 BLAKE2B bb22c34fa2e7a794ba78ea621e7e3fc6e0aeeb65efe3599f2d5d6024a2e1b21101ac91c5e3a706a7f23c868db662928684be478d1be4c0ee4ed3bb186d981285 SHA512 033085950f8ee3c6390e1f083ed18abfe3c0fb875a8f71fc488857c2fa663e4e10221c0d43d32520928abd2eaa308ee807c67bfe296e050ab90af0d811dbcb9d
 EBUILD mesa-17.2.8.ebuild 14999 BLAKE2B 48693ff690c7f7283e5d8412b282265a24100d7e5a05acc2054b5058bad9d1971b3bfd5b4070803eff6c045c8904accc78b68e84958c73528036e42d8a856335 SHA512 c00b4d4ebaeabfbece7727f9605d9a91c691a759247b59d7b719bd576864f69ac6887a92b1bade227e374da19d8c609abe934a979714a7259e21cb60b10abe31
 EBUILD mesa-17.3.3.ebuild 14892 BLAKE2B 4b44795597c2e47151553133e75476155fde4c438f384434254027a7d73f2d80de3412ba11edfee83d434814378234875b1f4f884897fce7153baab5ac6c592b SHA512 3246e7864889ffb4d0bb907e3393edc9d718398f0002478e0b5a5cb02aa3a2320c3675b7320053c46b3336d62dcd366d96af85c37d2b8d10539d0adbea66870e
+EBUILD mesa-18.0.0_rc2.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
 EBUILD mesa-9999.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.0.0_rc2.ebuild b/media-libs/mesa/mesa-18.0.0_rc2.ebuild
new file mode 100644
index 000000000000..e2f425d49acd
--- /dev/null
+++ b/media-libs/mesa/mesa-18.0.0_rc2.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	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"
+
+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 )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+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:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 42f2d81566ee..44d40886aa70 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 EBUILD mlt-6.4.1-r2.ebuild 5611 BLAKE2B afd7fbeea301840cda11ac7c8855c15f94fe22d8701fe35efe520ec9efae68e6e9342d8c23bf754a48ab150b5f97ed8187480aef4b3334c63c382a38b065246c SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20
 EBUILD mlt-6.4.1-r4.ebuild 5814 BLAKE2B ba612ea2de197a01ce80ff6a6a618995e44a0abfab61d552a4f06915df3adff9a1d8b00b49cf9480acd39b0550305c18a897355cdb37b8488c36a12645a72aad SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064
-EBUILD mlt-6.4.1-r5.ebuild 5687 BLAKE2B a8c50f6c2fc9f18aeabd10cdd485736220de8eff4a47e68e90b4ad4b9915ee4c79598cd0ba57758049f6e8e906c27fca330b8b047a97e1e39ef5b72a178d6216 SHA512 91cc96806795f71a3c2e8d0ba5974f554b2435d30ff610d0cb99eb0313a89731eec5afdccd7c99a27eb37129d270bda9571e0b3ad66bf448331e1318cb1429eb
+EBUILD mlt-6.4.1-r6.ebuild 5687 BLAKE2B 00fdbefaa9c1c8f2609b1ad6d72d5d43f446cf5c3353bb0a03bfe4d8a727eccb7139f8b289be338ec847ec8cc3d0fac49a26fcbc5aeb7feee54fb9bbce27db0b SHA512 4a7046100abe253d3afd9ad5943a3a32f0d417d68197889e326ad56ac42d28b32a484a41e42fa32ae4857c4f3cf74cf211c382611c5387a9b17b15e69d9f6979
 MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.4.1-r5.ebuild b/media-libs/mlt/mlt-6.4.1-r5.ebuild
deleted file mode 100644
index cf1136ab792b..000000000000
--- a/media-libs/mlt/mlt-6.4.1-r5.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby22"
-inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
-# java perl php tcl vidstab
-IUSE="${IUSE} kernel_linux"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#rtaudio will use OSS on non linux OSes
-COMMON_DEPEND="
-	>=media-libs/libebur128-1.2.2
-	ffmpeg? (
-		libav? ( media-video/libav:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?] )
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		media-libs/rtaudio
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		>=media-libs/libsdl-1.2.10[X,opengl,video]
-		>=media-libs/sdl-image-1.2.4
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-#	vidstab? ( media-libs/libvidstab )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-RDEPEND="${COMMON_DEPEND}
-	!media-libs/mlt++
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
-	"${FILESDIR}"/${P}-libebur128-unbundle.patch
-	"${FILESDIR}"/${P}-opencv-3.3.patch
-	"${FILESDIR}"/${P}-glibc226-{1,2}.patch
-	"${FILESDIR}"/${P}-qtopengl-{1,2}.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
-	done
-	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-
-	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	# bug 589848
-	append-cxxflags -std=c++11
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-swfdec
-		$(use_enable debug)
-		$(use compressed-lumas && echo ' --luma-compress')
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable gtk gtk2)
-		$(use_enable sdl)
-		$(use_enable jack jackrack)
-		$(use_enable ffmpeg avformat)
-		$(use ffmpeg && echo ' --avformat-swscale')
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable libsamplerate resample)
-		$(use_enable rtaudio)
-		$(use vdpau && echo ' --avformat-vdpau')
-		$(use_enable xml)
-		$(use_enable xine)
-		$(use_enable kdenlive)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	if use qt5 ; then
-		myconf+=(
-			--enable-qt
-			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
-			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
-		)
-	else
-		myconf+=( --disable-qt )
-	fi
-
-	if use x86 || use amd64 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang="none"
-
-	econf ${myconf[@]} --swig-languages="${swig_lang}"
-
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-6.4.1-r6.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild
new file mode 100644
index 000000000000..1d9f408817c2
--- /dev/null
+++ b/media-libs/mlt/mlt-6.4.1-r6.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby23"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+	>=media-libs/libebur128-1.2.2
+	ffmpeg? (
+		libav? ( media-video/libav:0=[vdpau?] )
+		!libav? ( media-video/ffmpeg:0=[vdpau?] )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+#	vidstab? ( media-libs/libvidstab )
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+RDEPEND="${COMMON_DEPEND}
+	!media-libs/mlt++
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
+	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
+	"${FILESDIR}"/${P}-glibc226-{1,2}.patch
+	"${FILESDIR}"/${P}-qtopengl-{1,2}.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# bug 589848
+	append-cxxflags -std=c++11
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-swfdec
+		$(use_enable debug)
+		$(use compressed-lumas && echo ' --luma-compress')
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable gtk gtk2)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use ffmpeg && echo ' --avformat-swscale')
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	if use qt5 ; then
+		myconf+=(
+			--enable-qt
+			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
+			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
+		)
+	else
+		myconf+=( --disable-qt )
+	fi
+
+	if use x86 || use amd64 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	if ! use melt; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang="none"
+
+	econf ${myconf[@]} --swig-languages="${swig_lang}"
+
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		insinto $(python_get_sitedir)
+		doins mlt.py
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
new file mode 100644
index 000000000000..d223d67dab55
--- /dev/null
+++ b/media-libs/munt-mt32emu/Manifest
@@ -0,0 +1,4 @@
+AUX docs.patch 810 BLAKE2B 941da013c47dd7b51ceb18be748b21edaec86157afa43fbaeab2310229302b3fb7ca2cbf058fc104ce9d9135089084aa2b009706618c81e8c4cae48a601fafde SHA512 99a2707a7eb94579de27a8f0351641d22dd963257edc58ae5d01f8d79722827f25677e6d7ca0b4d24ffbf71281df5cac428a8c0ddde8f42925995f5451d326bf
+DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
+EBUILD munt-mt32emu-2.3.0.ebuild 592 BLAKE2B 124ac1da68cbe70f86a61c9de2f1cc50fc9bb0ccdd0387b85e5dff56a344bf2a9ce551314d6046964ce05d1b7f846e90e40dcc02a6869e8ec15fab3d8530c502 SHA512 ff901148241e2ac1358146798ec08d7f0251a048c0970a88064dbe3e8abcd17a6704ba618662a4efacce9afb25640c46df8eb449e61bfc941f63ca3ae1b16d2e
+MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/files/docs.patch b/media-libs/munt-mt32emu/files/docs.patch
new file mode 100644
index 000000000000..20034b933641
--- /dev/null
+++ b/media-libs/munt-mt32emu/files/docs.patch
@@ -0,0 +1,27 @@
+From 43b3a932650ffd52fc1bc56f5c515ee4855bfd79 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 22 Jan 2018 21:07:52 +0000
+Subject: [PATCH] Install documentation in Gentoo-compliant manner
+
+---
+ mt32emu/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mt32emu/CMakeLists.txt b/mt32emu/CMakeLists.txt
+index 248f576..704d4f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -251,8 +251,8 @@ endif()
+ 
+ if(libmt32emu_PACKAGE_TYPE STREQUAL "Runtime" OR NOT libmt32emu_PACKAGE_TYPE STREQUAL "Devel")
+   install(FILES
+-    AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.txt TODO.txt
+-    DESTINATION share/doc/munt/libmt32emu
++    AUTHORS.txt NEWS.txt README.txt TODO.txt
++    DESTINATION share/doc/$ENV{PF}
+   )
+ endif()
+ 
+-- 
+2.15.0
+
diff --git a/media-libs/munt-mt32emu/metadata.xml b/media-libs/munt-mt32emu/metadata.xml
new file mode 100644
index 000000000000..168b3b7149fc
--- /dev/null
+++ b/media-libs/munt-mt32emu/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">munt</remote-id>
+		<remote-id type="github">munt/munt</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		A multi-platform software synthesiser emulating (currently inaccurately) pre-GM MIDI devices such as the Roland MT-32, CM-32L, CM-64 and LAPC-I. In no way endorsed by or affiliated with Roland Corp.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
new file mode 100644
index 000000000000..8e19616aa4da
--- /dev/null
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="munt_${PV//./_}"
+DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu"
+
+PATCHES=(
+	"${FILESDIR}"/docs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index f0d2a34c8e1d..a09c8d42bed9 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
-EBUILD openal-1.18.2-r1.ebuild 2027 BLAKE2B 96f03de444a5933b72104c88d6c76675b8823cf8e87905f2d398d6f7418125af2fcf8ceba1ab4025e989bf653e85c15e61d527a251fdf0e381fb262aded054f4 SHA512 81a7c17bde4045bed9eb54432e9d5d3c5db79d8750aeed50176ab1c3434b574e7b34d4254df5951305d5127620e9ed1f56dc140b9b6dd3056377f3b86304df90
+EBUILD openal-1.18.2-r1.ebuild 2026 BLAKE2B 19565179ae0ee6da4f82a035aca850d0b155c754451b0399e2ef3f8deeab4c9036323f7ae9e000a0cb97095fad1fd6cb39dcdf8dd98117bac8589d176a72f5e6 SHA512 48a8131eecc06bd97486f1fc1bd0a283e9fbb0460f61cae532eb1a44d057b66d7babc31772e2b38fb4b762d239016cb084040bc249bd8633426e37d000d0b8e2
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index fa00593534f4..4ec48c899f8a 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index b0bbbff79e8e..b479d7cd1afe 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,14 @@
-AUX openimageio-1.3.5-openexr-2.x.patch 1655 BLAKE2B e75ad1bd47d640e4f6b79246f90a853b0d6f8436b252e5625e48c5630b93a3a7754386cd038617c81d9efb606d69efe7d42ac1a92bbb139daf7970d7de020758 SHA512 3e7819aa866129b20d66ee371d653e80b34fd86a173a70ee280453f38d2b6815ca8fa403ddb85b2ae26a8f20dfbb6d319646b486b664933e665c48ea9ac54a87
 AUX openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch 15826 BLAKE2B 7f1744321e4dd59264502ecbb9ec958a6d0ee26a0e1a53be3e0b31fa5e3cc7f0846c95af81b66796f1901378689fb5c217bfd9f991d44451a95de0716a1bcb78 SHA512 57fbd123445ea474609239bb54a2032f4f97fd686ce74479431a90e1b251d4cae1d7f740b14c8360dd498edcac9c51c1d84dece82b2f6b513e709c386bb9ad9e
 AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877 BLAKE2B 0325e373bae367d3581343d49cda84ee27161a8a9a07e85ec00c81e6a0f11de5ce26d71ccc91153187ee79a97933d8307cbff84713524b3a5e40083dc075384c SHA512 e507ba714689a5da0f0a864804eaa0862b1aa4fc0e77f68934ae369c4de11ca566c9efd75ba5060d0294b42bf2bd7f20127eaf8e50efb4ff92497f1b60295f4c
 AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
 AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
 AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
-DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
-EBUILD openimageio-1.3.5.ebuild 2751 BLAKE2B 906669397274921918f70ab582cd8b493ba2cf953b9b0efd3a878ffac352462b52bbf5ad75cadf88af105e0535fd6c3899aa247fd808af43a9847cbc742c607b SHA512 27bd18128ca8728ba14f6bb4efebc95d0fc4d8beb3b3fc761d9911eece4bc0f0111b22aaf323182d39b7f40c3437839df4e9d8ecf620c34b2c97f4ec4bce7265
-EBUILD openimageio-1.6.13.ebuild 2466 BLAKE2B 7273dfa5a76b39e7aaa7a9e6bfbda3c2de387d8c6c6e78605dd94b95342384b6c02242319df25e6eb927744e8d623c452b892ff509ac33904df13e840fe8c21b SHA512 3f9d4b34e90248b6bd8b8d0d2f631974d00af19dee7a232d025deba7919c549386644ba4c3959ed6f70a9442e180afdf181def470cf4dde8b037ac672390ee54
-EBUILD openimageio-1.6.18.ebuild 2965 BLAKE2B b090ec9bad08a9989363012a212fc781e44cce2877fb00bda995ff6076ce863255c913487c6a1a373dc41e8ec40af83ab741f749661b566201f0975d22b2ad01 SHA512 8de65e7d4a338ae771cefda91e48f0a90a2bf094e257ff7cf20c16fcd96e1f9e78c697be0005fafaadebf024d17fe89398a80bc10fea89a48a0e70e7ac077732
-EBUILD openimageio-1.7.17.ebuild 2964 BLAKE2B f9e01b2eaed873edd5935e01beb6c4149a5934b0a00ae8b949ce22a502577d790f86de147406e206ffd0ba12a8d0f0bbf4d070b876c08ad2b4c62baa624fe556 SHA512 a4a625449eb2737072760c8d00413d2193b7ddd3a70b5eeff1fb2e9daec31c6884635a0e6e49b61c65a3ebe83df118f29153464232cdae13cb0697404575a3c1
-MISC metadata.xml 993 BLAKE2B 5a252fa4f9f3fc0de4cfebaf1b4fe00e48943f018f1860c35d189e1ce78e995371a25ee6c9366fcc5e0d6d1d0e09144973c2c44b418002fd8e0badeafa0921a6 SHA512 71a43980fef699fcf83ff6a9773a8f10c33b87fe40ff0a3540052f79cf130eb71a0ad18f97247ca6ac9355a9dcf3d847e7df0822e775dd9877f5d2501733917f
+DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
+EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
+EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
+EBUILD openimageio-1.7.17.ebuild 2947 BLAKE2B e3acdfbdc35099f771713866210a32a5dbb461a5c38f9a7351f65e2e12b168cf5d314f2a71b324f2577acaa427bdfa97f79424bc16433646c50733474ab57b86 SHA512 5237f675425d64a87a15d09b23c1f335d57f7a230f9c823bf823b0d0ea81e91f46490c591b60366bc98ec7f748b1ab7ab172187ff65d9affaa922a23ac34635a
+EBUILD openimageio-1.8.7.ebuild 2936 BLAKE2B bb57729c82e47998ff76ce112dca5d63950ae4e3c02b93ae8b3c57aef4d5af69ed8984318306c6ad38c66cf735cb856de7d1281d2880307d887656ce2eac6cac SHA512 d96f0ce9f748da35447758b6c1c9d38dff61ffc7d7823887cf8f5b8a97a282fc4a6237793905a7fc5b20ddeb69a6a8eb527600210a292d673d942625f45a0bb6
+MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
deleted file mode 100644
index 0668f0466a9a..000000000000
--- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-There is no IlmBaseConfig.h in OpenEXR 2.x
-
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach'
-
---- src/cmake/modules/FindIlmBase.cmake
-+++ src/cmake/modules/FindIlmBase.cmake
-@@ -176,17 +176,11 @@
- set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
-   CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
- 
--# Link with pthreads if required
--if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
--  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
--    ILMBASE_HAVE_PTHREAD
--    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
--  )
--  if (ILMBASE_HAVE_PTHREAD)
--    find_package (Threads)
--    if (CMAKE_USE_PTHREADS_INIT)
--      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
--    endif ()
-+# Always link to pthreads for OpenEXR 2.x
-+if (NOT WIN32)
-+  find_package (Threads)
-+  if (CMAKE_USE_PTHREADS_INIT)
-+    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-   endif ()
- endif ()
- 
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 935e4012defd..27cefe35ec56 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="ptex" restrict="&gt;=media-libs/openimageio-1.6.18">
 			Use <pkg>media-libs/ptex</pkg>
 		</flag>
-		<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenImageIO/oiio</remote-id>
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
deleted file mode 100644
index db5c150d4757..000000000000
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils multilib python-single-r1 vcs-snapshot
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml:=
-	media-libs/glew:=
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/openexr:=
-	media-libs/tiff:0=
-	sci-libs/hdf5
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	gif? ( media-libs/giflib )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	colorio? ( >=media-libs/opencolorio-1.0.7:= )
-	opencv? (
-		>=media-libs/opencv-2.3:=
-		python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		)
-	ssl? ( dev-libs/openssl:0 )
-	tbb? ( dev-cpp/tbb )
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled code to make it build
-	# https://github.com/OpenImageIO/oiio/issues/403
-	rm */pugixml* || die
-
-	# fix man page building
-	# https://github.com/OpenImageIO/oiio/issues/404
-	use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DBUILDSTATIC=OFF
-		-DLINKSTATIC=OFF
-		$(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FIELD3D=OFF # missing in Portage
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		$(cmake-utils_use_use truetype freetype)
-		$(cmake-utils_use_use colorio OCIO)
-		$(cmake-utils_use_use opencv)
-		$(cmake-utils_use_use opengl)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use python)
-		$(cmake-utils_use_use qt4 QT)
-		$(cmake-utils_use_use tbb)
-		$(cmake-utils_use_use ssl OPENSSL)
-		$(cmake-utils_use_use gif)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm -rf "${ED}"/usr/share/doc
-	dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
-	docinto pdf
-	dodoc doc/*.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index d1f065679aee..f7a101f8a20c 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype"
+IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -45,12 +45,6 @@ RDEPEND="
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
 	ssl? ( dev-libs/openssl:0 )
 	truetype? ( media-libs/freetype:2= )"
@@ -91,7 +85,7 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PYTHON=$(usex python)
 		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_QT=$(usex qt4)
+		-DUSE_QT=OFF # Deprecated
 	)
 
 	if [[ ${EPYTHON} == python3* ]]; then
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 874a927f7b8d..7f5f2086dbf8 100644
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/boost:=
 	media-libs/openexr:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:0= )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	field3d? ( media-libs/Field3D )
@@ -46,12 +46,6 @@ RDEPEND="dev-libs/boost:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:0= )
 	ssl? ( dev-libs/openssl:0= )
 	truetype? ( media-libs/freetype:2= )"
@@ -101,8 +95,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 20a3d9542038..163f0a64e763 100644
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
 	>=media-libs/openexr-2.2.0-r2:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
@@ -49,14 +49,11 @@ RDEPEND=">=dev-libs/boost-1.62:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	truetype? ( media-libs/freetype:2= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
@@ -105,8 +102,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
new file mode 100644
index 000000000000..1c69cf3c6d6a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils vcs-snapshot python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	colorio? ( media-libs/opencolorio:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		media-libs/glew:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex] )"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CPP14=ON
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_JPEGTURBO=ON
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_NUKE=NO # Missing in Gentoo
+		-DUSE_NUKE=OFF
+		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 4c00f952917b..9fd7465f3c12 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -6,10 +6,10 @@ DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0
 DIST openjpeg-data_20160921.tar.gz 401771303 BLAKE2B f3ce2f4614a5ae19bed58dd46d1eb5855130b339d715893cd30cd2517c8ce12240d28a4ede046b82e6e0c34d199f6e3413f4f81965bbcf5ea9f6bcf5417818ce SHA512 58521c14f49c546b24a0c7b17ebdb3dfecf6ffdcc814b3c59a79a1325e5adf88047b2bd8a4ae608c5d106b584f08efc4e6c66f03254119763e01abee2da7d027
 DIST openjpeg-data_20170809.tar.gz 497454555 BLAKE2B dba7ded4a19f0139c1ad7e716930a7211d24bfb8d0e4387e171172406dd4df8a3a80b535f3df35f0592cac989456d45ebb345b8febc85a52c8eac5020fe50c48 SHA512 7beb0cb944764b526ed7a011ba0c72768e22516950f337f1df713fa6949b1255e800933aebffde81c6ebeedd32050b7d5627112e44bf7d24cab75274c59d7d49
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 2004 BLAKE2B 171fddd8465100dacb006b35414347dd9435d8a7bfff017002d5681e5776ba1cb803087a77088a4c4987fd50d0a9f793993ef5a61203fa2284a002442509426b SHA512 83b3e453f73185ff359e930e33a37833f9391644a894c4a5b545de2a648aeff2d6279bd9f4196c88500a130ffd8b5948ff457de79444ee8fabca81bb1c1530ef
-EBUILD openjpeg-1.5.2.ebuild 1999 BLAKE2B a93f89e9dcf1a15b4db84da050fe2f3299df32ad8aca0ea540a2446218230e1403dbc26a39f7c1aa9b89448539388d614939abe38d6169d01fd766931f0e2e44 SHA512 f1e7193be4a303555803a90d54dff3da1c1d6bd396b7ef4b329ce677d914a0f5ec25cf874dc2a016ca32b4f770a0e6b2f06d193df8e97299f8610f7774af719d
-EBUILD openjpeg-2.1.1_p20160922.ebuild 4104 BLAKE2B b7a1ece07efda5c9fd71a7579087fb071540c8a69f2c73262f8e6b764a0337874c0d2e43a7136ca95c33a22b08950bea4067153f48b408a21c837f3af92cb32f SHA512 3759a99a8846e7bd48dca6479dc2f5d8c3a6e289c0e0facbfb09b5c0fe8f61a7c56a44510837d9229b7d0e4f437a2bec3cf0abb7fe54b7c946ed069e8f97f1c1
-EBUILD openjpeg-2.1.2.ebuild 4013 BLAKE2B 997390fc5acd50f60df245a4d3a96c962458a29780e43aef548db1130abe7afb4bef8d3118aa29de5db41351fca58e095bcd535208fe2e5b090e68b97022d313 SHA512 b25b772e1dba9af812d82d1a416c7bbd025ccf699e72999fa8d7df45871417bc716436b81a4ce6917b359e3edb95571f58deb70dd49f2bf3889157d91a6ce688
-EBUILD openjpeg-2.2.0.ebuild 4008 BLAKE2B f24ca1b7d00645eae086e0b4bac475013497634f1b579c3764f115aa9f664a42e75b9649a0b0d55528a121bece04f5eae31a25affe7eb68ccae6ccf79f15a5e6 SHA512 67d000a44837aa623b08d95b66a14b1f6a95ba4e03729fec93eabd983295ac9bfe14b2a2f107b047095203598826bd9c9e7936d4737f1fc11bc86fce60f8066a
-EBUILD openjpeg-2.3.0.ebuild 4123 BLAKE2B 055c26ace299d0f9d05da8ecfe49fce1275dfb6565902e00593d6154ada14b89f748c708eb35df85dff854166076367b57c0e910b5f6a0694470b7947df8ad4e SHA512 79638cee72d7e0999af5cb117de7310cf3def54fe47b0c06e9d0d8738beb21fe9cf69bcf170af0ed978ee36f4221239cdb98fa7e683dcbeba0a0fa31548d4366
+EBUILD openjpeg-1.5.2-r1.ebuild 1992 BLAKE2B 8cc839bd75ddfad70068673a75b9ba74701ea52ace5990d83f680a4a27ef09f2c89814e538175f328709cacbbeac9faa7d9445753d56898caaae01d5b73a1069 SHA512 b2e9e487f819fc3bd4ece6788cc9c08bac3c6bdcc8e316cb38847f1839245b23f01eff29f81cf23eda767efe4e9f2480605c3c95ede38ac246fe0c3c64244eb6
+EBUILD openjpeg-1.5.2.ebuild 1987 BLAKE2B db3baed20766524d12687b9e444197c09ec49ac7937ad0deeb83f1f5a6367dbb81d44a7dedd172357a1ef188fe5823542ed6cdcbdd068b7d9f2e54f76408a981 SHA512 64f90025e0c15e7b90e2528ff96c6a18cb0e67a082e354ab994f076ed4c8d492a5e266e76eca694dd0eac6731da918685099a5656f382673f1840bde4179f65f
+EBUILD openjpeg-2.1.1_p20160922.ebuild 4092 BLAKE2B 85ab13d0633af394100d407c6eff373f2b9f39d3327695dd9d2680091ed692219167c4055570956c1885345905fe76101903fedd0d8d6c1db883ed998e0f1a11 SHA512 5090949204cbfe463f34440337e62508ac90540ba68891dd3654f4e2ddeec320b5395db5e179866ade6a035ed7d9604b8a429bd74f9692e2322ecdfef8b16a83
+EBUILD openjpeg-2.1.2.ebuild 4001 BLAKE2B c44c16ca3332ec81f9cb6eb4cf453fc73d37a56a0a863f1a06d273c6b1f5902c6e0a9f720180176379dc3e1a0104dc5773e48781bc483478d2573f27a805f961 SHA512 a35adf52d35c9dedede2578adc0a28768166fefa8ef5221b09cb1197c788a50288d19962a48793bb5352c0bfc36cc905468d62c72a53a55f5328b3b6740eab90
+EBUILD openjpeg-2.2.0.ebuild 3996 BLAKE2B 0b371bcec49e8cb58c7bdf9f652b4e955d8e3a5b166741032b4068de708f9c1346da53ed5df02ee4a8b834dc571d710be2a2bb7608574d422399e11437efcd21 SHA512 b4a73b2ac624e9488a0d03da236bd28ca79664eb8b66fba77f996ad7f76c4f8f1a8e23423c84e4e85e1b676a0c4a65c6d7e29cc7fd567c489c5f332c74446575
+EBUILD openjpeg-2.3.0.ebuild 4111 BLAKE2B 377fb0dae725fe265a356a0bdcd08ce5303d264198b20491fd3584437d1968fc5f9c6a1add469702601e1cbe5c12af673e889152aac9448bb7ccf693bb4ab56a SHA512 ca71685f5185d52a766946e08d2664362f7a16bc53dadfe9d9c1dc66a574e5b15501c702d31af9c218ec78dc1044c47893285749f0605903306c601b04e845c8
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index d18ff016351f..0f2a1158f9a5 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-1.5.2.ebuild b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
index 91e87da6e58f..929ae7fa4767 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild b/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
index 7f5bbd95c5a6..38028f5227e8 100644
--- a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.1.1_p20160922.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 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/${MY_P_COMMIT}.tar.gz -> ${P
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.1.2.ebuild b/media-libs/openjpeg/openjpeg-2.1.2.ebuild
index 38944c8dc6fb..bffdb98ee645 100644
--- a/media-libs/openjpeg/openjpeg-2.1.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.1.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.2.0.ebuild b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
index bacb56b8b37d..97799c976dd9 100644
--- a/media-libs/openjpeg/openjpeg-2.2.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.2.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 4bb165d93fb2..67d0d09f8ad8 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 6d9a023f262e..e442f31a6904 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -14,7 +14,7 @@ AUX tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch 1228 BLAKE2B ca3babb8a10c96ec
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
-EBUILD tiff-3.9.7-r1.ebuild 2084 BLAKE2B 729f896f2bbb1b502ada459db539b03bd628ea4f183a55e87295b9aadb4aae44d34748a4fe44a7e27829b73902431176bd544cdaba1c6ad96933a8cd6fc320bd SHA512 9204dbe59144189fc74619eb9cc87e3cc13bdefb00ff569ab1b7986e8f0112a94283febbceba27ad61cf265977c7cffd653844a86ff59b23446a0fff4740677e
-EBUILD tiff-4.0.8.ebuild 2631 BLAKE2B 7f60433b851f5e6f97da5251f94791019641fe891507e7785dc862aae0cb8166595d87ec12a07e8fbd6d626c646e06731d17056ff3913eddae5a0fae12119f99 SHA512 0f751cb980e6375726e3d1cf3747c2d36e48f2a6321972d82f54a7732fc92a8d671f673d5b78ed865c3a99f1192890178c6a8891863dce5cbed04b9309ee09b0
-EBUILD tiff-4.0.9.ebuild 2498 BLAKE2B 60706b627aa7833637e824c90532898447856abc57b5f30868d5d9f065875f416cd76da254b5d1d191e3232c35881f0b050da88b35072326e37e0dde782eeaf2 SHA512 731e3f99dc2f938513d243a4c1c86e92ff4abce397c719daf4f1b3e6e95350c8751dc7e4d1e06049b326f1b2d6a3790c5d51498ef516981a30d649f76a242972
+EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
+EBUILD tiff-4.0.8.ebuild 2619 BLAKE2B ea84c84c765588cd4e148e4f62f3182062532cea1ec5a1460bf0fc0be286df2619b6daabbe999ba9446d4d4e9f16e6d8d8197e6696b6952d3593e9c5a2db48c3 SHA512 c2754d6d0a097319f2b1ac9122e16ec2e0f25ddd434f4158f806631670cfa00a9a5a838cb50fb9336d70e0baa54c6cfabaec9fe7380c65fb0f58e65dc0a39900
+EBUILD tiff-4.0.9.ebuild 2486 BLAKE2B 39a931e22b9cc13b7ca8a863ddfa07e5812a3299465799b0bd156b044edb3154cb94a6d4cfe11cb1a3ff09a99df5d19485fd4f606a0072a898e848b3be0cba90 SHA512 fc596b278c56d07fa5f58a053528f73d4486935a3783d4d1653f0d83bd891697b70a9e0fc3098c419dc34a9f674398299037ea47870eed9d596a98109ff7f4c5
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index 66315663f5fe..a691fbf8fd05 100644
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-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
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index 6f8049841afe..238df3e4c9d5 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.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"
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.9.ebuild b/media-libs/tiff/tiff-4.0.9.ebuild
index 403bd9768b40..cebe715adcac 100644
--- a/media-libs/tiff/tiff-4.0.9.ebuild
+++ b/media-libs/tiff/tiff-4.0.9.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="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 21d035e7b053..7c452e29b0ec 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index ffb1c198b7e4..f69cf7b229c3 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 BLAKE2B a37da2f3411bf8a65a65bab2c0acdb246feeda44f7bf843f6fb20a39c9835e2dc9c332683831d628fc861c08c03303768eb728725462abaff417deed43ae2e1f SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6
-EBUILD gst-plugins-assrender-1.12.3.ebuild 403 BLAKE2B 39b50004ae509c448fd8fa4ecb8c9747139eafe6403387a5205f00ff033c922d322d82ffc2774c17c34c7d4628fff3e9c7036fbb6d64be019d512c502f61846d SHA512 d3d43addc8f1044f6b22b9e36a6c9d68fd1f17f7d4087ce603cd06cab63b94ce9305e905c48bd54068aea0bb2ea04be03ddf439d3939faae40c7feec1b611ee5
+EBUILD gst-plugins-assrender-1.12.3.ebuild 405 BLAKE2B 3f29d673d85bfd487956f053d08580298e7c60b9b9847aaaf795dee5ee398b5387ec997d297018a0dc0e2daa8e37bb73f41716548c8dbaa1da5c75db2f9c4de4 SHA512 a277e58ef2ff5d1f0bf83f6a925e606413ee6b32e9f9cf81c1877502dd7bf9201511cea235c2d280148f9cb88c850b6bc73bcc53171fd97f8c87ea072ff1788e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.3.ebuild
index 73afc84d3d60..a93d21c071b1 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.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
@@ -10,5 +10,5 @@ DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
-RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index fd9c0b782116..cec1562d9b54 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
deleted file mode 100644
index 0a035b8ea59e..000000000000
--- a/media-radio/tucnak2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tucnak2-2.42-appname.diff 795 BLAKE2B 62b3de63e5f54adbc35dc1e6db19839811b148dba2fb5aba00e24a6f4c0505e351832a69e72026848f4a6f913a334930a711ea03e552a02890d099e46c8fa43d SHA512 1f5830d9fd2c75a41f01a685f9e9639525f0af327ebf7c52878ce7bdafd1a1122c3ea8294f67c56fd1c97e02b664fb22e81fba866d5ad50e09e7c5762cbf57d7
-AUX tucnak2-2.48-doc.diff 520 BLAKE2B 3217950366c102064dec9befa1d57ce1ab337f83de2734853bafe7f518c5603ce60b30b8639975a17647346e142969496b0d06ad6be45aab4c3ed787eafa2367 SHA512 87dc306a137bdf30de246268a9280f4f92950e05e1790e61126ec10852b66ad531e639d553f1e7fb76b19af5542e9ec58273fd0596da39fbc9a978d35add8e8c
-AUX tucnak2-2.48-hamlib.diff 971 BLAKE2B 1665abbb7227d601d4ded8bb5a920561ca5b9b5a50a059626e7f7ea2e02f2cdd551417f56d7f05efb036c02162e4e4a1014360a60ef30f39f43ac8e804880cdd SHA512 297db48604680939321a644deb10df9004c913eda78cbd58fca2327487ff3d7b9142f53e5524950e2b8025c0f62deb2cc311ba272fd1dd83ca50fdb71be56593
-DIST tucnak2-2.48.tar.gz 2985018 BLAKE2B a3b576e5f8132856cfb4e1f6c690343d968d98989f9b7c4132eb8275531211158334ad9b8ea01ec7b813132628dc9eb9d0e6dd9e965ecc4de517b74a96ee5af1 SHA512 e2803fb492ff7bab0fd698587de1a92805be8d7cb3935ac8ad7119ada8981399add8bf30842ba1155aaad6a5cd9b48300c16d2c38e66516188fb2e81f8f08f20
-EBUILD tucnak2-2.48.ebuild 1972 BLAKE2B 38cbd75355d60916c8cef2d855a7baf6390fc71ca16a5643b04e770c947546449370f6fb7851686f650d6ee4f3aff9b4c959c8958e77355c789b30a4b65c4cea SHA512 b588c545749f3a2c6984324b317e9a9ef2cf53018964d2d13c090590aab37de3a0c49761c84f5bc500cb5cda87ef0a9ee02c9caeaa4d61d3e13baae88c75ec23
-MISC metadata.xml 469 BLAKE2B 55fe6395edce58d868af59264e1a42ab31a5ef88a4aaab95e07120120755c31d0486753b44036cb48692c19ea423b69cb9518bff363b101ba450caf2f83d7d4f SHA512 27cd01c173a2266369753c2cddd7a8e510914e605a4fc49e01cee5063002f691d495eb3b2386a181eada31c8cbc6342f7de4f0f8edfc4a8c0586bdaf34ecd9fc
diff --git a/media-radio/tucnak2/files/tucnak2-2.42-appname.diff b/media-radio/tucnak2/files/tucnak2-2.42-appname.diff
deleted file mode 100644
index 3d832ef78ab8..000000000000
--- a/media-radio/tucnak2/files/tucnak2-2.42-appname.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-
---- src/Makefile.am.orig	2011-05-12 17:51:43.000000000 +0200
-+++ src/Makefile.am	2011-05-12 17:52:01.000000000 +0200
-@@ -1,9 +1,9 @@
- datarootdir = @datarootdir@
- 
- #bin_PROGRAMS = tucnak soundwrapper stucnak
--bin_PROGRAMS = tucnak soundwrapper 
-+bin_PROGRAMS = tucnak2 soundwrapper 
- 
--tucnak_SOURCES = adif.c alsa.c bfu.c cabrillo.c charsets.c \
-+tucnak2_SOURCES = adif.c alsa.c bfu.c cabrillo.c charsets.c \
-     chart.c codepage.h codepage.inc \
- 	control.c cor.c cor.h cordata.c cordata.h cordata.inc \
- 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c \
-@@ -24,7 +24,7 @@
- 	ttys.c txts.c txts.h txts.inc uni_7b.inc \
- 	win32.c winkey.c wiki.c wizz.c zstring.c
- 
--tucnak_LDADD = @TUCNAK_LDADD@
-+tucnak2_LDADD = @TUCNAK_LDADD@
- 
- soundwrapper_SOURCES = soundwrapper.c	
diff --git a/media-radio/tucnak2/files/tucnak2-2.48-doc.diff b/media-radio/tucnak2/files/tucnak2-2.48-doc.diff
deleted file mode 100644
index efac0b22d189..000000000000
--- a/media-radio/tucnak2/files/tucnak2-2.48-doc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.am.orig	2011-02-25 18:29:32.000000000 +0100
-+++ Makefile.am	2011-02-25 18:29:52.000000000 +0100
-@@ -1,15 +1,11 @@
- datarootdir = @datarootdir@
- 
--SUBDIRS=data debian.unofficial doc intl pkg share src win32
-+SUBDIRS=data intl pkg share src win32
- 
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- 
- EXTRA_DIST = COPYING INSTALL leaks rebuild eee.sh 
- 
--docsdir = $(datadir)/tucnak2/doc
--	
--docs_DATA = AUTHORS ChangeLog TODO   
--
- stamp = `date +%Y%m%d_%H%M%S`
- 
- distd: dist
diff --git a/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff b/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff
deleted file mode 100644
index f0d573837a77..000000000000
--- a/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-# Fix forgotten #ifdef if hamlib not available
---- src/rotar.c.orig	2012-03-13 14:35:34.000000000 +0100
-+++ src/rotar.c	2012-06-04 17:26:54.000000000 +0200
-@@ -20,12 +20,13 @@
- 
- gpointer rot_hamlib_main(gpointer xxx);
- 
-+#ifdef HAVE_HAMLIB
- static int rot_print_model_list(const struct rot_caps *caps, void *data)
- {
-     log_addf("%-6d %-14s  %-20s  %s\n", caps->rot_model, caps->mfg_name, caps->model_name, caps->version);
-     return 1;  /* !=0, we want them all ! */
- }
--
-+#endif
- 
- struct rotar *init_rotar(struct config_rotar *crot, int rotchar){
-     struct rotar *rot;
-@@ -117,13 +118,15 @@
- }
- 
- void free_rotar(struct rotar *rot){
--	if (rot->hl_thread){
-+#ifdef HAVE_HAMLIB
-+    if (rot->hl_thread){
-         rot->hl_thread_break = 1;
-         dbg("join hamlib rotar...\n");
-         g_thread_join(rot->hl_thread);
-         dbg("done\n");
-         rot->hl_thread=0;
-     }
-+#endif
-     g_free(rot->desc);
-     g_free(rot->netid);
-     g_free(rot->rem_rotstr);
diff --git a/media-radio/tucnak2/metadata.xml b/media-radio/tucnak2/metadata.xml
deleted file mode 100644
index 6607838addda..000000000000
--- a/media-radio/tucnak2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tomjbe@gentoo.org</email>
-		<name>Thomas Beierlein</name>
-	</maintainer>
-	<use>
-		<flag name="ftdi">Enable support for FTDI USB chips</flag>
-		<flag name="hamlib">Enables support by the Hamlib amateur radio 
-		rig control library to get/set frequency and mode of the  ham radio</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-radio/tucnak2/tucnak2-2.48.ebuild b/media-radio/tucnak2/tucnak2-2.48.ebuild
deleted file mode 100644
index 684980fd0734..000000000000
--- a/media-radio/tucnak2/tucnak2-2.48.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw ftdi gpm hamlib suid"
-
-RDEPEND=">=dev-libs/glib-2
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	ftdi? ( dev-embedded/libftdi:0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix destop file bug 483730
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak2.desktop || die
-	epatch "${FILESDIR}/${P}-doc.diff" \
-		"${FILESDIR}/${PN}-2.42-appname.diff" \
-		"${FILESDIR}/${P}-hamlib.diff"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with alsa) $(use_with ftdi) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3) --with-sdl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman debian.unofficial/tucnak2.1
-	dodoc AUTHORS ChangeLog TODO doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak2 add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak2 can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 615a8c43654a..0ea7e344b724 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,8 +1,5 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.14.tar.gz 11452537 BLAKE2B e8ec6853e91190375d880a221aab75e1297cf5a93af7a45667a0f0b1ef4d457c7e55dfcfa77e5bd8f2906214c72a5760eccdb811f2f3ea1c0b8427adaf3e9cd4 SHA512 1f63e841191b81c477273777923bb4e537bac70b02cb5deca18b30adc44158369794435a0c1c22915bf42fc3fe2e46891cd531ad6ce2563d0f543a1012074660
 DIST xlog-2.0.15.tar.gz 11461174 BLAKE2B 99b1d1cdcf6bad60f283d6885eb8c9317d5d35e411d2c449732e8f8bf9ed69e552fd73f2c1fcfc56ca386df447df8e5e2bbbffa80d596d8da4c347379231890c SHA512 58403d6cd05a222900236a9b165d1b51951f2efa668aba5989970036135a91955af64a4662a5cd6f6e7c4629e3353b3c93c79c3e14d81c7ae65a82cf9ade6397
-EBUILD xlog-2.0.14-r1.ebuild 1734 BLAKE2B 00602e74195d3d85c550d3a624118a974b29a2332dc714e57881df68eecba15892e666b6e2bdea63eb0affb62762924bae6c61beed8804b21a84185a03df0947 SHA512 338f8e115061113a1c725000dfdf6c3acd2be504f041a981cffd27a8aa5fc7f4565986727c707fe07f656838dfbf448b67080b8f0a8d6bac5862ee6d2e5d39b4
-EBUILD xlog-2.0.14.ebuild 1434 BLAKE2B a224b3b6adb95aac16c28a9a1d6ed674fe0a08a2d61264ca4304b7188280303bcb5af2c573648e76c623a2454aa558d95f7ca9b86009c55461caf3aa73b8114c SHA512 11ff98edad83e146e3d4bf63a91084218006e78c55f33a75ebd679d6f8e708419464e6dedcccbeca4a141c2c688d1db0c62ac0d1056dd2e9c3bc6ca25cdcbba4
 EBUILD xlog-2.0.15.ebuild 1434 BLAKE2B 05e563ea4701058972728e0beaa25fe6cfe8533aeb634ed9eb71d334e0f36b20f366e053e8d3f24537ce424ff0bc16c1c8a30e6fb6f1b86ce18f1bcab973c658 SHA512 add1be481bce44e2fde778b8c1a64e05b99b98238cf30587cb77cfeb22336aa6fcff3090212c936360949e4dc28a7ed2379f7336684a7c4751df5c77c533d55c
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.14-r1.ebuild b/media-radio/xlog/xlog-2.0.14-r1.ebuild
deleted file mode 100644
index 31e7aef83e1a..000000000000
--- a/media-radio/xlog/xlog-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime toolchain-funcs
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://www.nongnu.org/xlog"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS data/doc/THANKS NEWS README )
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
-	# Let portage handle updating mime/desktop databases,
-	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
-	# Drop -Werror
-	sed -i -e "s:-Werror::" configure.ac || die
-	# fix underlinking
-	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
-
-	# Fix broken png files<<
-	einfo "Fixing broken png files."
-	pushd "${S}"/data/doc/manual/output/html
-	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
-		pngfix -q --out=out.png ${png}
-		mv -f out.png "${png}" || die
-	done
-	popd
-	einfo "$x png files processed."
-
-	eapply_user
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
-	einstalldocs
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-radio/xlog/xlog-2.0.14.ebuild b/media-radio/xlog/xlog-2.0.14.ebuild
deleted file mode 100644
index 682dec1bae63..000000000000
--- a/media-radio/xlog/xlog-2.0.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime toolchain-funcs
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://www.nongnu.org/xlog"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS data/doc/THANKS NEWS README )
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
-	# Let portage handle updating mime/desktop databases,
-	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
-	# Drop -Werror
-	sed -i -e "s:-Werror::" configure.ac || die
-	# fix underlinking
-	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
-	einstalldocs
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-radio/xwxapt/Manifest b/media-radio/xwxapt/Manifest
index 072ebddf20d6..696cc7727c56 100644
--- a/media-radio/xwxapt/Manifest
+++ b/media-radio/xwxapt/Manifest
@@ -1,5 +1,8 @@
+AUX xwxapt-3.3-install.patch 809 BLAKE2B f452c343859afa1199624f2aa231ca1b820b514887ff997bdcd493bb310159101bc195326998ac2e67cf05a5ee6f5a9d89ee4a00951c7659c1a9eccccdd3c9be SHA512 c8ccc5a6c76bbaa0fe600f60f31b538fbb7a50a1a16268eae3629cc6e4c48af695de5bdf7a6eb2963227646f082a21da9ae301910010aa275d6b8e5741b5c737
 DIST xwxapt-3.1.tar.bz2 258794 BLAKE2B 9a78f66a03095da209575096206e440149f329cce7be0e887704da9ef95c593e07c20107703744cfeae801e1afda94e42e312f3be788af6455d44b65c15bccb5 SHA512 68e332ddd50567181d0d8e36d1466adf7baab85670d94a92cbda478c7e61bc1bac547062b8c4ec34cbf2e832919ad76002423360c7c804525a1436ce7acb7ba9
 DIST xwxapt-3.2.tar.bz2 258901 BLAKE2B 4e82c8c21d43f9407c38699b275c690cce80555e5a738b0d22f20e32cf6586f078ba84563c4b92ebdfcc8714b24128e3f142b432e38b62cdb619976234b024fc SHA512 46adcbabaf46d0a91b5284d8171d94777846dabce62cdf36df785d9e6f94fa3df987e3b7cce636d96aed6b3cffb9b5e295dc4d46b7bc3bd209acf896c8c45858
+DIST xwxapt-3.3.tar.bz2 260010 BLAKE2B b26c8a6a05c879f1aa6f3a844f72383fdce1ce3f6efeb36305723fb3aba7f01f05cd4fd244f574e2cd8b759b499f95a5aa54db244ebefc8fb3d91d8179ce0ea5 SHA512 ea9ecc8bc5948005a09ff15e9909387980a873e9770f28efbd828a8475a0161329bd4b00e4dde9c7c50e9e4ffbfd288e25ad09224bec66250acf8eeeba23ced6
 EBUILD xwxapt-3.1.ebuild 1240 BLAKE2B 7ea6309ab0f054725b0ce04c877725594610e422c4eb3486c545995d46279b808792fc4aa309208915123c412c8f8200edb22c92b410d8b4b621651c3d9568f9 SHA512 adafc425ac840837aa18f4a9bb48211406703190f950bc986450a4d2cefb875287832d868e9f6745b9ff9d113e02cfcd7356bed7277dcbb666975e1ca3759c8c
 EBUILD xwxapt-3.2.ebuild 1240 BLAKE2B 7ea6309ab0f054725b0ce04c877725594610e422c4eb3486c545995d46279b808792fc4aa309208915123c412c8f8200edb22c92b410d8b4b621651c3d9568f9 SHA512 adafc425ac840837aa18f4a9bb48211406703190f950bc986450a4d2cefb875287832d868e9f6745b9ff9d113e02cfcd7356bed7277dcbb666975e1ca3759c8c
+EBUILD xwxapt-3.3.ebuild 1285 BLAKE2B 1a62b050cb05595817173da5edf2b0f37cf5a145f15811d593e56eae01b416c5190d543cc092334924a23c39323cd784429e875af7d8d5ff4b4ab5e76100a204 SHA512 2574b243c81b3a5be37192f51b809f3541960e90c696d598616d8e962c8ab6e4fd9b489073355b5ceedaff4e5f354237bc410dc04dd15cf427b206c5e100d84b
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xwxapt/files/xwxapt-3.3-install.patch b/media-radio/xwxapt/files/xwxapt-3.3-install.patch
new file mode 100644
index 000000000000..eed2464d3706
--- /dev/null
+++ b/media-radio/xwxapt/files/xwxapt-3.3-install.patch
@@ -0,0 +1,22 @@
+--- Makefile.am.orig	2018-01-22 19:40:47.638751354 +0100
++++ Makefile.am	2018-01-22 19:41:28.830090441 +0100
+@@ -48,18 +48,5 @@
+ 	if test -d files/; then \
+ 	  cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
+ 	  cp files/$(PACKAGE).png $(DESTDIR)/usr/share/pixmaps/; \
+-	fi; \
+-	if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \
+-	  mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
+-	fi; \
+-	if test -d doc/; then \
+-	  cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
+-	  cp -r doc/$(PACKAGE).1.gz $(DESTDIR)/usr/share/man/man1/; \
+-	fi; \
+-	if !(test -d /home/`logname`/$(PACKAGE)); then \
+-	  cp -r $(PACKAGE) /home/`logname`/; \
+-	else \
+-	  cp $(PACKAGE)/$(PACKAGE).glade /home/`logname`/$(PACKAGE); \
+-	fi; \
+-	chown -R `logname`:`logname` /home/`logname`/$(PACKAGE);
++	fi; 
+ 
diff --git a/media-radio/xwxapt/xwxapt-3.3.ebuild b/media-radio/xwxapt/xwxapt-3.3.ebuild
new file mode 100644
index 000000000000..9e68a17be3dd
--- /dev/null
+++ b/media-radio/xwxapt/xwxapt-3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
+HOMEPAGE="http://www.qsl.net/5b4az/pages/apt.html"
+SRC_URI="http://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-wireless/rtl-sdr
+	media-libs/alsa-lib
+	dev-libs/glib:2
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+HTML_DOCS="doc/xwxapt.html"
+
+src_prepare() {
+	eapply_user
+	eapply -p0 "${FILESDIR}"/${P}-install.patch
+	# suppress -Weverything flag
+	sed -i -e "s/= -Weverything/= /" src/Makefile.am || die
+	# create missing mkinstalldir and prepare package
+	glib-gettextize --force --copy || die "gettextize failed"
+	eautoreconf
+}
+
+src_install() {
+	default
+	insinto /usr/share/${PN}
+	doins xwxapt/xwxaptrc
+	doins xwxapt/xwxapt.glade
+	dodir /usr/share/${PN}/images /usr/share/${PN}/records
+}
+
+pkg_postinst() {
+	einfo "You must copy the /usr/share/xwxapt directory into your home directory"
+	einfo "and configure the contained xwxaptrc file before starting the program"
+	ewarn
+	ewarn "If you just upgraded from <=xwxapt-3 do not miss to check"
+	ewarn "for changes there"
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1fa3a8718359..2ad77bfb9b40 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index c28a4ffd9118..55de3f9567a6 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,7 +1,5 @@
 AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
-DIST kid3-3.5.0.tar.gz 1414288 BLAKE2B b400c83ae611fe66387686441bfa02a55686f474f14c04589d81693ae6bcc462b641d164088c010a2bbe4b32f253875fa4bcc2c350cf8ef5abd10cc6a2e53923 SHA512 a70aef4c775ec8a2d760856fdda38394384d71fbfb5847ba4da2d6396a1167c740a57a5609ef99a06ca99c090de974e91a87b13344f2e123b33842c51860cf34
 DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
-EBUILD kid3-3.5.0.ebuild 2012 BLAKE2B b9653916a465980ed1e1ad0473a783f697a4f1d54d149814cc71316d144c04177540c248c381844392e1f79fb62f12bdf3ffb7d894788962d473188a41472964 SHA512 c2a9f141724d8073240a76a1c9e9a7c3352bb91f62c05298de81ecc085772dcccd9b0a90fff3c7ac39992dc7ba481c60f3f633e56e5e18cbcc573b275f7a3df6
-EBUILD kid3-3.5.1.ebuild 2014 BLAKE2B 3135e515c02f8a14b9a77676809b81595ff223df6e2803ad1e0cd4a8b3d62bbb370f56b4a3aed7514067149b4444ce76f658278eb5269b5850a78a0d666191ea SHA512 39077f8810c78da6d71ff2ccff9b6ac5d3ae31835844c25a49ac6500604a16c3ff60511fa0ddaebab938f805611ff0ada2b4a5649e093be2160757f543194cf7
+EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
 MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.5.0.ebuild b/media-sound/kid3/kid3-3.5.0.ebuild
deleted file mode 100644
index 64def7acd3df..000000000000
--- a/media-sound/kid3/kid3-3.5.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.5.1.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
index 98825f9596ae..a2e641496a1d 100644
--- a/media-sound/kid3/kid3-3.5.1.ebuild
+++ b/media-sound/kid3/kid3-3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/munt-mt32emu-alsadrv/Manifest b/media-sound/munt-mt32emu-alsadrv/Manifest
new file mode 100644
index 000000000000..21daec9436fc
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/Manifest
@@ -0,0 +1,3 @@
+DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
+EBUILD munt-mt32emu-alsadrv-2.3.0.ebuild 1136 BLAKE2B 93659786cae61437cf4b723b00b94a9fae11bcbafe901887af3ad8d82bdc4cc4e68063dd9d01f8ca5c67ca9455d8c74563451850b574f3582e57851a534e42d4 SHA512 8e05f033cda128954fda8fd85d61f94afb10ba459e58a929446716a686572665eb7598cf669469bec9bff476064ccabd7dad1d1ed343856ff818f57e20939864
+MISC metadata.xml 619 BLAKE2B 6e281508d1398900dbdab6d3fb338e43ca631ed0032b000b8447c65dc9629f4fdcb2b2af4051b363a816a82c54fac6a9eebfe24db67cba22daff02b1b145ea88 SHA512 f4a36fa2ff28998528db05fa9eff442dc463bbbfc23f57bda48dde0a540f8fb836ce481575a789471e80a0b1a5a9dbf70dd768dd12593562658f10d06da103d8
diff --git a/media-sound/munt-mt32emu-alsadrv/metadata.xml b/media-sound/munt-mt32emu-alsadrv/metadata.xml
new file mode 100644
index 000000000000..3ee0e2c84df7
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">munt</remote-id>
+		<remote-id type="github">munt/munt</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		mt32emu_alsadrv is a module of the Munt project. It uses the mt32emu library and provides an ALSA MIDI driver which emulates (approximately) the Roland MT-32, CM-32L and LAPC-I synthesiser modules.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
new file mode 100644
index 000000000000..135f9f121553
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs prefix
+
+MY_P="munt_${PV//./_}"
+DESCRIPTION="ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="media-libs/alsa-lib
+	media-libs/munt-mt32emu
+	X? (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu_alsadrv"
+DATA="/usr/share/mt32-rom-data"
+
+src_prepare() {
+	default
+
+	# Fix MT32 ROM path.
+	hprefixify src/alsadrv.cpp
+}
+
+src_compile() {
+	emake mt32d CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+	use X && emake xmt32 CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin mt32d
+	use X && dobin xmt32
+	dodoc {AUTHORS,README}.txt
+	keepdir "${DATA}"
+}
+
+pkg_postinst() {
+	einfo "MT32_CONTROL.ROM and MT32_PCM.ROM cannot be legally included so you must"
+	einfo "obtain them and place them in ${EPREFIX}${DATA}."
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 05107cde976b..eb85315197b8 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -3,5 +3,5 @@ DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e2322
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
 EBUILD pragha-1.3.1-r1.ebuild 2602 BLAKE2B 31d242654e528af065c91731d624df1e5fdf989a9e1f259603db65fab0bcfecba913478557b67110719d7c284f8c566fd64442ab97201e2451f01a600dc6e9c5 SHA512 c17edf8c79aa6a16803de9cbcc9c9f62a3a5f9f02c427f80548623b087feccd6be5e10584bbe8fe01b6b559e2344b367d1db06328fd9d1081f7c37c3fd7145a4
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
-EBUILD pragha-1.3.90.ebuild 2487 BLAKE2B 198d2d7ff6b546f1f805cb7fd3c5e7ee8e5d6447514522f01c2329b2ffa42c1549ffdc91dc9b39862fe1a5217b92f4e53e71c807d55a0def06ba1a693ce1352f SHA512 57514988c2f5ef8e19d0abf8c329cee174be7d0e15c71bc1d0d8881cad14ceef6f4938a5610c4e3dfadf43144ddb0b87e9de10c2a031549025c8462bc4eb3c72
+EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
 MISC metadata.xml 1158 BLAKE2B b7d3fe9b4867324351eabb050306806202e4af8f4c4b1cbbd02f0d88eae27fcf0d6e52fe39f7cf470508db1528684fe064c1e0861658c883bb0a3f4a04abd799 SHA512 68257f425b4e8634f4ed696e7066a8b0c328b1bca0794a72a54f438d2aaa174b4cf816cf693046221bfef88e6b8fc08dfe2211e9be98c28da0d119d957bf9812
diff --git a/media-sound/pragha/pragha-1.3.90.ebuild b/media-sound/pragha/pragha-1.3.90.ebuild
index c5dfe2453911..32a9c17084b4 100644
--- a/media-sound/pragha/pragha-1.3.90.ebuild
+++ b/media-sound/pragha/pragha-1.3.90.ebuild
@@ -41,7 +41,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	>=dev-util/xfce4-dev-tools-4.10
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	xfce-base/exo"
 REQUIRED_USE="glyr? ( peas )
 	grilo? ( peas )
 	libnotify? ( peas )
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index a82146276baf..26ce753135ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 DIST pulseeffects-3.1.5.tar.gz 612665 BLAKE2B 18fd3c8126f0ad53ac0a7c270b5cafa66c8df7a65c9ef99a84469a3a6b0f1c6875c11e163acf9ce8fec6465b561638ca3fce77000631c4c3c5f64f5cc6d9ffc8 SHA512 e24efa5a0313d25cdbd960c176efbe487cb6e6002d7f0887f92d8287fc70f02fa16456c709fbe4a99c3680b3bbe51758dfe05a7a412ce8d4c5cd2c976685cbb4
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
+DIST pulseeffects-3.1.7.tar.gz 610153 BLAKE2B 64746f1eb8f16613183bac30d8e132d8001cfd9183f735fa262a02c1313f452de5cfffde33543dd0a38a629af898ca264a6864c3f005a45a6da18c00079b9f18 SHA512 7812d4b8c3fd88b533d86dcc70f3e219f3c1fe879bd8731741983c53ed00be2d3c39bc1090a674cb1347ee30a9135c86306ea1d3cb46dce7f45d1cc21fe1585c
 EBUILD pulseeffects-3.1.5.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
 EBUILD pulseeffects-3.1.6.ebuild 1489 BLAKE2B d7e167c67de1d3064451adc47144f82de00715ec05b1795fcc0379c85ac4b1178482a393fc5e1fb8fa40e63d558b53a757e0c44826897772bb93f243242ae817 SHA512 3fca264bb9f36b2535d12cbc3db074909a792a23385d0cdca3b4695c9ee03fa24f049162005fbcfe22bb9e76ea622795959d17e23d766015d754c365b1d13af5
+EBUILD pulseeffects-3.1.7.ebuild 1489 BLAKE2B d7e167c67de1d3064451adc47144f82de00715ec05b1795fcc0379c85ac4b1178482a393fc5e1fb8fa40e63d558b53a757e0c44826897772bb93f243242ae817 SHA512 3fca264bb9f36b2535d12cbc3db074909a792a23385d0cdca3b4695c9ee03fa24f049162005fbcfe22bb9e76ea622795959d17e23d766015d754c365b1d13af5
 EBUILD pulseeffects-9999.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
new file mode 100644
index 000000000000..ca19673c0603
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
@@ -0,0 +1,63 @@
+# 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 gnome2-utils meson python-r1
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	media-plugins/swh-plugins
+	>=x11-libs/gtk+-3.18:3
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	>=media-libs/lilv-0.24.2-r1
+	>=media-plugins/calf-0.90.0[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio[equalizer]
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 4bb2dc4dcb3e..1e1b502db909 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,8 @@
 DIST spotify-client_1.0.69.336.g7edcc575-39_amd64.deb 89614954 BLAKE2B a489aa2ad52d06e3651dc7aeb53adadf5f0447d959fca95e7bd49b943188622c8d96868e19d3d3761e4d01432548240a219107de07f1262bc7b8d630cdd64e77 SHA512 cc0cdc5065d21ebb2fa3d05f088b43c49ce95a7ddbedbb474841a11b6a6a79771767e939828cc18ec8f21bb6ba5a3931c6c62ba69321990ed72911c8cd872c04
 DIST spotify-client_1.0.69.336.g7edcc575-39_i386.deb 93798286 BLAKE2B 2ef644a6da0c497aab2347b4fea49966f17ca89b36c85ca48cc1ba6496bd49745028cab934a4077c82968875870243bb84fe5a7576f2319663fc3490ce371427 SHA512 41ab715a247029e1d380387962c554153af734e4eaf6965d1e175f9370d71cefe7559e358b0d402162955bb069a72cd24249d341b1bb7c75fc40b9b65bbc80da
+DIST spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb 89572934 BLAKE2B 70fa53d8bd4fac88133cd57171721636d17ccc1863a224048572c34eba132baf2642c5b51022f4dd59bbe8abe61c43440dc9339687bc2d3c0ba6fbbe5339a0fa SHA512 f5ce65a535daffe251152f6dc1c3affe2cbdf815ce1129e204ef03b589ebf7ac1015a9be2c77d7bcdd506fa23b9f24390b961843bb311366f6839756563912bf
+DIST spotify-client_1.0.70.399.g5ffabd56-27_i386.deb 93896122 BLAKE2B 541de6cddb207440baabff6e43af6bd101ae43e8b30359a14078429506b742faf6bd32719bc6579068196bd01859a24af35677b3b53233b79ff56007fa38a30c SHA512 b72a7b4286d067a0a825b423ff62d426a82d8a7cc111500e1d5ab64df000f0cce024a6c7d9cc5cbf253800152907ae2889f55eead46556739f8d5069e7c0abf2
 EBUILD spotify-1.0.69.ebuild 3254 BLAKE2B c40aa8de27a8135923611d83626fa5712f445be4071ce1ec0579fe731dd1ac1be5ca294adc58bdb02af89b3943cee07714075428ef8dc59c7211421916fd37fe SHA512 97f6f45cfd176ef4d044b4e580979c791d2594e04dc45ee08956f183a06e295342fc050d60727d832f4d7602615715c3a36d4b2afb152bedf1219afc673ce838
-MISC metadata.xml 349 BLAKE2B 961ee21c86e7e1f8bf31b6339003cf2e59c7c6bb38146e63d43b2ac44b41c71e409a6cc9c1460f8ca6a8ff8b2acfb9e7e0b56fff0f7f4260fb6a4c6efcd7a83c SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1
+EBUILD spotify-1.0.70-r1.ebuild 3312 BLAKE2B f87bba06d6caa58b49b4d24b4f7eea10e7c3a20084f965ec6bcaeeb102d4ea0d9c6f2e1e43fbbfb847d82df788a83cedd576c31278ca640c97d51aba6cd61345 SHA512 e6c9372c89ff5cd6e937681fe11bc031c497631beb18592a92e097fbd2662ba33a4d36d3f5ed748bbd4e22f940b9f1bccf7b377225aea5fe5f2cdc9edc815755
+EBUILD spotify-1.0.70.ebuild 3304 BLAKE2B 3a8e82540777d21e2928f7d56a144971acce4c458c12d53df3729c977e9304cee447488a9e006fae6d12efc128f1a69d517e2d5d5ba71225ddb8aee1265b2688 SHA512 75cffbf2c4a8dafefc2ceed986d01331dddee9c1c600d2cc6e37dfd540dc80594b686c4af83bd408ee45bf860f34373c4f7996855f48254c2e93df2180cd5a8d
+MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 9ce054e1b38b..1e06c14d2fd1 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <use>
     <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+    <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
   </use>
 <maintainer type="person">
 <email>prometheanfire@gentoo.org</email>
diff --git a/media-sound/spotify/spotify-1.0.70-r1.ebuild b/media-sound/spotify/spotify-1.0.70-r1.ebuild
new file mode 100644
index 000000000000..6fa5db4d1378
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.70-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID_AMD64="399.g5ffabd56-26"
+BUILD_ID_X86="399.g5ffabd56-27"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl,curl_ssl_openssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/spotify/spotify-1.0.70.ebuild b/media-sound/spotify/spotify-1.0.70.ebuild
new file mode 100644
index 000000000000..1e34e86dd459
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.70.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID_AMD64="399.g5ffabd56-26"
+BUILD_ID_X86="399.g5ffabd56-27"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl,curl_ssl_openssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 692574cba265..f3508e811242 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index caeb8cd623a3..02132e682c09 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,17 +1,7 @@
-AUX ffdiaporama-2.1-ffmpeg-2.4.patch 755 BLAKE2B 0a69dbb6ba4a6208461c1c5697fe732f2d3824e807f941e59714b6e32849c38e0919802043ffddb04f092749e821ad394079cbaa581102438ab9ed14648e7a32 SHA512 791a4885188536b4bfb5d4877783c887e1d457878c1d69d925c4e4257ae65864cc0a8eb1ab0063ea082ac13a57791147c16be80087b663fe81b1c8e68dbd8f38
-AUX ffdiaporama-2.1-ffmpeg-3.0.patch 9617 BLAKE2B b270dbbb426c39a365e46b4ba93da6cc4f4f2dd9ed01710fc964e968d61ed99d7b59cd8fbdf5b6ac50b465b921656f1396c26727adf0eb1992ec3495da7e5ed3 SHA512 427df6b22b8c758d6e47a53de0219c1b84806cbb7b9bcdacff40e797e5d52fccd2f90ddba1aabe39f1c184628309d712ca521ad33bdabd0d07caead29b407399
-AUX ffdiaporama-2.2-qt4multimedia.patch 750 BLAKE2B bc1d45a21ec546dd15d2aa8a821610c52c6abade8cb903f3d1828ec078aaeffc196f04e9e194f2d825b0ac8e68381113ae9620197978e6bc5d7756681ba921d8 SHA512 9bd9ad4e0948b1bf31635c87473c901f306556bde8d39a1e660d0f6deca714607a6231b9ab5e8b756ec40c166b2226b238b6999ffb6848ec3718cfd052087a42
-DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54 SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
-DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6 SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
-DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473
-EBUILD ffdiaporama-2.1-r1.ebuild 2275 BLAKE2B b5216e5e6c85e2184cffa8364dc73116bcb3b4cb5026561630c5090d60ea8c57aa538bde441ddda3aaeea205d3561ced5b1726fb870b51304ffc37516505b1e2 SHA512 d235e42333d57429e6e03a41df3c7168d984c4a8ddfc16ddc0614bee0c79b49e3b342c6302fae27c3c625bacf5fbf1558c76f4efa969bfc1aa361efcfda8413f
-EBUILD ffdiaporama-2.1.ebuild 2163 BLAKE2B f3594ffa917a15ea0fb609224d48d90b222037032a3bfc3c4d33a28b31bfdd3ece5a6f9ef1c067318f97c3c8bce16f241f3d095f00f16511b4acff9aa6b683c6 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52
-EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2044 BLAKE2B 4dc752cdabbd712227d197c9efe086a98d35f6152cbf1680f36e0b25874f512443dd5d93aa248c7a15609f66c1f58fd8fd87e0a4314ec7c304014878153941fe SHA512 73258f49196f2b0ed7600ac2d224575f6e6f2d5db6549cc0828da28cbd4b76a48265267790a3add57fefae4d969d67d1de6099a4a353fb59cea5800c53b8aa37
-EBUILD ffdiaporama-2.2_pre20140701.ebuild 2303 BLAKE2B 5995296adc68000b6d20b337f0d5b0c8ee76b7b8982602de7d842f699be860bf8d8795c851674f5d31836ddf14c1147d1e3ab31d7bf7ee1d62f68dea240c7453 SHA512 932d83e57f7fc6a097c46c129be6eaa69e01bf10d22481c9265eaf4d8f9eeb91359ee60709195d90db357dd76e286f363bb37f2fd0ed7c9cd10da94d052a018e
+EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979
 MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
deleted file mode 100644
index da652736f010..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.1-libav10.patch
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${P}-libav10.patch "${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
deleted file mode 100644
index 48456601fcbe..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-ffmpeg-2.4.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
index 0ec5707e0aa6..0a8509a3a0bd 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.
 LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
deleted file mode 100644
index 1d9d671b5400..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils gnome2-utils qmake-utils
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-	http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-	texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav openclipart qt5 texturemate"
-
-RDEPEND="
-	media-gfx/exiv2
-	media-libs/taglib
-	openclipart? ( media-gfx/openclipart[svg,-gzip] )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qthelp:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qtsql:4[sqlite]
-		dev-qt/qtsvg:4
-	)
-	libav? ( >=media-video/libav-11:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch "${FILESDIR}"/${PN}-${MY_PV}-qt4multimedia.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	default_src_prepare
-}
-
-src_configure() {
-	use qt5 && eqmake5 QMAKE_CFLAGS_ISYSTEM=
-	! use qt5 && eqmake4 QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	if use openclipart; then
-		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
deleted file mode 100644
index 7a8e664add37..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:02:12.592365100 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:01:59.202463800 +0100
-@@ -84,7 +84,12 @@
- #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100)
-     #define FFMPEG
-     #include "libswresample/swresample.h"
--    #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #ifdef SWR_CH_MAX
-+      #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #else
-+      #define RESAMPLE_MAX_CHANNELS 32
-+    #endif
-+    
-     #include "libavfilter/avcodec.h"
-     #include "libavfilter/buffersink.h"
-     #include "libavfilter/buffersrc.h"
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
deleted file mode 100644
index 4eb8c9704235..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 10:48:04.000000000 +0100
-+++ src/ffDiaporama/engine/cBaseMediaFile.cpp	2016-02-21 19:00:43.129114600 +0100
-@@ -113,10 +113,23 @@
- #define VC_USERDATA     0x00000008
- #define VC_FLUSHED      0x00000010
- 
--#define PIXFMT          PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXELFORMAT AVPixelFormat
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXELFORMAT PixelFormat
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT        QImage::Format_RGB888
- 
--AVFrame *ALLOCFRAME()           { return avcodec_alloc_frame(); }
-+AVFrame *ALLOCFRAME()           { return 
-+  #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    av_frame_alloc();
-+  #else
-+    avcodec_alloc_frame();
-+  #endif
-+}
-+
- void    FREEFRAME(AVFrame **Buf){ avcodec_free_frame(Buf); *Buf=NULL; }
- 
- //****************************************************************************************************************************************************************
-@@ -2402,7 +2415,7 @@
-                             AVFrame *FrameRGB=ALLOCFRAME();
-                             if ((FrameRGB)&&(!Thumbnail.isNull())) {
-                                 avpicture_fill((AVPicture *)FrameRGB,Thumbnail.bits(),PIXFMT,RealW,RealH);
--                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PixelFormat)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-+                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PIXELFORMAT)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-                                 if (img_convert_ctx!=NULL) {
-                                     int ret = sws_scale(img_convert_ctx,FrameYUV->data,FrameYUV->linesize,0,FrameYUV->height,FrameRGB->data,FrameRGB->linesize);
-                                     if (ret>0) {
-@@ -3482,7 +3495,7 @@
-         struct SwsContext *img_convert_ctx=sws_getContext(
-             Frame->width,                                                     // Src width
-             Frame->height,                                                    // Src height
--            (PixelFormat)Frame->format,                                       // Src Format
-+            (PIXELFORMAT)Frame->format,                                       // Src Format
-             W,                                                                // Destination width
-             H,                                                                // Destination height
-             PIXFMT,                                                           // Destination Format
---- src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:53:00.487286000 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:52:47.623287800 +0100
-@@ -53,7 +53,9 @@
- 
- #include <libavutil/mathematics.h>
- #include <libavutil/pixdesc.h>
--#include <libavutil/audioconvert.h>
-+#if (LIBAVUTIL_VERSION_INT<AV_VERSION_INT(54,31,100))
-+    #include <libavutil/audioconvert.h>
-+#endif
- 
- #include <libavcodec/avcodec.h>
- 
-@@ -90,10 +92,10 @@
-       #define RESAMPLE_MAX_CHANNELS 32
-     #endif
-     
--    #include "libavfilter/avcodec.h"
--    #include "libavfilter/buffersink.h"
--    #include "libavfilter/buffersrc.h"
--    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-+    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(55,17,103))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(57,24,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(57,25,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(57,0,101))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(6,31,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(4,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(2,0,101)))
-+        #define FFMPEGVERSIONINT    300
-+        #define FFMPEGVERSION       "FFmpeg 3.0 or higher"
-+    #elif     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-         #define FFMPEGVERSIONINT    210
-         #define FFMPEGVERSION       "FFmpeg 2.1 or higher"
-     #elif   ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102)))
-@@ -108,6 +110,13 @@
-     #else
-         // unsupported version
-     #endif
-+    #if (FFMPEGVERSIONINT<300)
-+      #include "libavfilter/avcodec.h"
-+    #else
-+      #include "libavcodec/avcodec.h"
-+    #endif
-+    #include "libavfilter/buffersink.h"
-+    #include "libavfilter/buffersrc.h"
- #endif
- }
- 
---- src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:19:13.935794200 +0100
-+++ src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:33:52.928215900 +0100
-@@ -20,7 +20,11 @@
- 
- #include "_EncodeVideo.h"
- 
--#define PIXFMT      PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT    QImage::Format_RGB888
- 
- //*************************************************************************************************************************************************
-@@ -410,8 +414,13 @@
-     // Setup codec parameters
-     VideoStream->codec->width               =ImageWidth;
-     VideoStream->codec->height              =ImageHeight;
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUV420P;
-+    #else
-     VideoStream->codec->pix_fmt             =PIX_FMT_YUV420P;
-+    #endif
-     VideoStream->codec->time_base           =VideoFrameRate;
-+    VideoStream->time_base                  =VideoFrameRate;
-     VideoStream->codec->sample_aspect_ratio =PixelAspectRatio;
-     VideoStream->sample_aspect_ratio        =PixelAspectRatio;
-     if ((codec->id!=AV_CODEC_ID_H264)||(!VBR)) {
-@@ -434,7 +443,11 @@
- 
-     } else if (codec->id==AV_CODEC_ID_MJPEG) {
-         //-qscale 2 -qmin 2 -qmax 2
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUVJ420P;
-+        #else
-         VideoStream->codec->pix_fmt             =PIX_FMT_YUVJ420P;
-+        #endif
-         VideoStream->codec->qmin                =2;
-         VideoStream->codec->qmax                =2;
-         VideoStream->codec->bit_rate_tolerance  =(ImageWidth*ImageHeight*2*VideoFrameRate.den/VideoFrameRate.num)*2;
-@@ -564,7 +577,11 @@
-     #endif
- 
-     // Create and prepare VideoFrame and VideoFrameBuf
--    VideoFrame=avcodec_alloc_frame();  // Allocate structure for RGB image
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoFrame=av_frame_alloc();
-+    #else
-+    VideoFrame=avcodec_alloc_frame();
-+    #endif
-     if (!VideoFrame) {
-         ToLog(LOGMSG_CRITICAL,"EncodeVideo-OpenVideoStream: avcodec_alloc_frame() failed");
-         return false;
-@@ -654,7 +671,11 @@
-         return false;
-     }
- 
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    AudioFrame=av_frame_alloc();
-+    #else
-     AudioFrame=avcodec_alloc_frame();
-+    #endif
-     if (AudioFrame==NULL) {
-         ToLog(LOGMSG_CRITICAL,QString("EncodeVideo-OpenAudioStream:: avcodec_alloc_frame failed"));
-         return false;
-@@ -1095,7 +1116,11 @@
-             if (Continue) {
-                 // Init AudioFrame
-                 AVRational AVR;
-+                #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+                av_frame_unref(AudioFrame);
-+                #else
-                 avcodec_get_frame_defaults(AudioFrame);
-+                #endif
-                 AVR.num                     =1;
-                 AVR.den                     =AudioStream->codec->sample_rate;
-                 AudioFrame->nb_samples      =DestPacketSize/DestSampleSize;
-@@ -1180,7 +1205,11 @@
-     int     errcode;
- 
-     if (Image) {
--        avcodec_get_frame_defaults(VideoFrame);
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        av_frame_unref(AudioFrame);
-+        #else
-+        avcodec_get_frame_defaults(AudioFrame);
-+        #endif
-         if (avpicture_fill(
-             (AVPicture *)VideoFrame,            // Frame to prepare
-             VideoFrameBuf,                      // Buffer which will contain the image data
-@@ -1225,9 +1254,14 @@
-         }
-     }
- 
--    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0) VideoFrame->pict_type=AV_PICTURE_TYPE_I;
--        else VideoFrame->pict_type=(AVPictureType)0;
-+    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0)
-+        VideoFrame->pict_type=AV_PICTURE_TYPE_I;
-+    else
-+        VideoFrame->pict_type=(AVPictureType)0;
-     VideoFrame->pts=VideoFrameNbr;
-+    VideoFrame->format=VideoStream->codec->pix_fmt;
-+    VideoFrame->width=VideoStream->codec->width;
-+    VideoFrame->height=VideoStream->codec->height;
- 
-     if ((Continue)&&(!StopProcessWanted)) {
- 
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
deleted file mode 100644
index 6dd0367337e2..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ffDiaporama.ori/src/ffDiaporama/ffDiaporama.pro	2014-05-04 10:33:56.000000000 +0200
-+++ ffDiaporama/src/ffDiaporama/ffDiaporama.pro	2016-12-06 00:03:27.392114339 +0100
-@@ -26,19 +26,13 @@
- 
- greaterThan(QT_MAJOR_VERSION,4) {
-     # QT5 version
--    QT += widgets concurrent help multimedia
-+    QT += widgets concurrent help
- } else {
-     # QT4 version
--    CONFIG += help mobility
--    MOBILITY = multimedia
--
--    unix {
--        INCLUDEPATH += /usr/include/QtMultimediaKit
--        INCLUDEPATH += /usr/include/QtMobility
--    }
-+    CONFIG += help multimedia
- }
- 
--QT          += core gui xml network svg sql
-+QT          += core gui xml multimedia network svg sql
- QMAKE_STRIP  = echo
- APPFOLDER    = ffDiaporama
- TARGET       = ffDiaporama
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f9d53897517c..4a880d2ec7a4 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,5 +1,3 @@
-DIST kaffeine-2.0.13.tar.xz 4374124 BLAKE2B 14e5d026cf41308e400072b53fdafdb616d4df48ee3413a1115aa4028c7c69407064278e2a60af3b7859dfefc841b09b1827278b093071df29af39491df3a736 SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5
 DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
-EBUILD kaffeine-2.0.13.ebuild 1431 BLAKE2B 6df2475430dfb14f0867ce9661fbb5e83e641554608471c23bacf78f5cbff3ffbc82304fd2cb4d3e22da82ba1b0e13f0a23b6f2c555f92f7565bfbb5c9860f1a SHA512 7a89677fd7a5c0f4f820da6a76037ff032ba9bb24e0a92fa529d01dfe8eea88c36830d99e311cb60b26c538ec18999a2d904688c252f50bddf7538a720bbe419
-EBUILD kaffeine-2.0.14.ebuild 1457 BLAKE2B 52d174f5f36a49caf1eff0f083c49f9175ab2e44c1c3a5da1ed89e17bc88b4ada9de930f6a4f79ac7fdcec9629e11fd5cb074f900c54ef16ff9302a65460b1bd SHA512 1d83100b0affa96ecddd9520b845073768459a0760b908fd97149cc8c4797043231887fd3329ef6be852e5f7f3b96adfb9d6ff33aced6013f608edac7037cdcd
-MISC metadata.xml 447 BLAKE2B a8d3f7396f9ec720f0a47f90a81218ec536edef061cdf11912caa7e99370f03061594fa8c8943eeb0b494a341c3aae6cd1460979c11f306b1a426ecab9df2e1c SHA512 e2c7a2f56b06dae76e7714fa7a2b2170b47330712bf6b9d91a22854d75469bef20e16b916678674e81ba089f920d9bd27b04cd796cabb7fc4762f79740828d7c
+EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
+MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.13.ebuild b/media-video/kaffeine/kaffeine-2.0.13.ebuild
deleted file mode 100644
index d6dc589879c8..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		sed -i CMakeLists.txt \
-			-e "/find_package(KF5DocTools CONFIG REQUIRED)/s/^/#/" \
-			-e "/kdoctools_install(po)/s/^/#/" || die
-	fi
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.14.ebuild b/media-video/kaffeine/kaffeine-2.0.14.ebuild
index 5ffcfdfea1f9..77757018422d 100644
--- a/media-video/kaffeine/kaffeine-2.0.14.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.14.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 @@ HOMEPAGE="https://kaffeine.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dvb"
 
 CDEPEND="
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 81fb67df1eba..00c71c8a23d3 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/metadata.xml
@@ -9,7 +9,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kaffeine</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index cf698100782b..0e2eabef4c7d 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,30 +1,15 @@
 AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e
-DIST 0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz 736 BLAKE2B 04e7b9f1b26e3df50e89e9af4663a2765ca6a71bf52b9f931b2d194366526642cdf15b96b1bba98167c1fe1304da71528b05a4504df6153d0cbf4e3b219c0bb7 SHA512 dbdfdf7fc1d42ebd93b0853e85ba0c07d816035c126a9303e6a5656bb9faeea16f16068d7e4aa67c7c4ade8ca09f64669e67f52d7d0a2a65518fa3897d586311
-DIST 0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch 1017 BLAKE2B ec5947dc258c03a4077da898b0895693de3a35979f086d0551696616ab2f2df1e7e122ad53f93ff0fbf78782acfd0ef2a9f664a1a33f4a4d40d9072733638a1f SHA512 8cf8d1dd46a423381e70ab046e5843f13028c1d2ee14877e96339ea6a7d80d3ae5b2441b5b41ca23ba0104a5ff2d1b7e871f43680967bad0b7f242952d7b0be9
 DIST fate-11.tar.xz 691009480 BLAKE2B 01e1e8125d34a623b5bd4bf1da0daee96d045e73fd069cf438f471970ad4cf71df8bd3235306b3493cb547fb5ac4bb8fce416e194fec9a7e9b9de68a5a15d572 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1
 DIST fate-9.tar.xz 467671500 BLAKE2B df4ef8187f257c91b7b6c3c25c2f204c2d4a476cc73cca199ec1c8af2c4641cbb3a314e39ab38f6d8b68c5fe0b91ff1b4b592dec6b518d544806eaeaca003608 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202
-DIST libav-11.3.tar.xz 4858864 BLAKE2B f029581ea013564b69257f0ba71114c489afff3705bfeb9b7dad4a5c95eb64f727ebee4127b1205d1bbca0a2f56e2ebc907d57c25a5abf02ffdaf0b20ae30004 SHA512 f25b9fb7392d5bb4df35937f79beae26bd8f6606f0ad7cdebf16963834eb9b423d882f6a3a44b5120a5d5d853c7c31bb8c3420a427cd2b360f41a48a6d5df284
-DIST libav-11.4.tar.xz 4860264 BLAKE2B 3e56751b806cdf542bf078e790085bb0599696df0646f7bab5187e7af1b008041952ceadb5e1a10a021202c84eb878a8316993eddb6973d9b22fea042114db65 SHA512 82ffe6aaccb1a19782dfcb0de641c8255531ce34ee5f49f9b8ec7f5a11c81713432aafc3a6b7c4de927eb8141ddea41f28e4e3a1ab715b943774193050fb02e7
-DIST libav-11.6.tar.xz 4860268 BLAKE2B 52bd7cce7c1bbf7550d8ebfc00b735903bad1aefe0ecff6bfe80eb23deec6702974f63ec4b50d6956a6511f8dbeb9c6ee57b74786e6f8155b958c3c507391c8d SHA512 bff3e22de93e4ab357715ae20e25b6435df52d1868c5164426a693d14fe7f54e47a46c4c62a36fbf27bd204e12f6a29a6f58016c7deaa838915d424b5ce530bd
-DIST libav-11.7.tar.xz 4861984 BLAKE2B 4191e47808b4e2827594398c33f4cd95c789379c0ec1256a18385d4570139054fbb0549c2ab45f3c20c41d2a5cb861ea439a7e76939ccfa856ea2101fc181f55 SHA512 23c6ffd0efdfa6b22c7863bf440d7469eba03a7990382fe33c8c4c7871edf250641ac536572516225679b0934e5c250ee0e2e91ea093c770a0c4c32b4776e3c5
 DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be
-DIST libav-12.1.tar.xz 5267292 BLAKE2B 4b8e5c9175aa34b2195238e16af4a21706ef18babb491c0c08d4432cb73ad576eaea55b5231af9033dc252a66b1fd51c5964b1d8ad80c85fe2600c27c332c3da SHA512 a0dd5fcc95cb62901b05b59a63ce4fcc6fb2943f0032a824ff6cfeeab2d13bd5edc65811aba1d06fe4d794119da049c52e5a9efbbc3599b445b61769992c9919
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
-DIST libav-12.tar.xz 5265280 BLAKE2B 2fca534267537343ae51bf07ce226057ec0ecef81163c81559c7492a1591b611f393b2e8026733a733c715a890137b353140743a53227f030806a1c35418c910 SHA512 55f7dd171882d191c79c6ade10f02123b8b7d897cbbd13c77766c9af944c5ba4bfbc81487966bac1ee459bc61f7a2471ddd9a3ea29b412296e9044b98440c423
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
-EBUILD libav-11.3-r1.ebuild 11294 BLAKE2B a89833f466c93db6a6479bbf4f6366b095e4e550d6cba8ec7e5194488bc198761bb7a3ff22e025997132fd0d96dd3ecdd06f7177fdadf17a5b728d027cf57b9c SHA512 fe16d5e1b238a9a39b4ebcfd18cc1b1609afc8d5c2d89de3e743932f5b290f3f0b42e3821faa1cebef94260add0a9595d03cc614db82a77a69e5727a9b0e0689
-EBUILD libav-11.3.ebuild 11199 BLAKE2B 313beb709725fd85d74bf93297302a7114c8142ec33e604142220978da82130b49ea9f8a1eb6fdd4e017e482bad8b6e8772d008479263288bb2019ce9e4356f3 SHA512 0c0248f1e456a00e7acb1ad4bab0158a886588cb7d4a9d9299b304196b14c9a17a436cf1367e4f46bc833664880ab5cab61c8332397205c3a393dfee46026141
-EBUILD libav-11.4.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
-EBUILD libav-11.6.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
-EBUILD libav-11.7.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
 EBUILD libav-11.8.ebuild 11181 BLAKE2B b7e0f5d841c6ae3173490503d6079dccac7aee934b2d1225602d16696978a45784c5fde44866bff54afe69a95bb724f10c062bb0872dfce4d6ac431454fa397d SHA512 167c8c1c0931ea35b0661f894956969c03debff3de338d6f8b336b1cf0d2f88938cf626aa88ba91daf597394be29c2e0d622756ffd4e94f18ef3053f141851b8
 EBUILD libav-11.9999.ebuild 11141 BLAKE2B d7205d9a0d0e359b12c1e43ce315d0998dbe825fa39bc6cd02f23b142d1281a8327ca5578ced5767af43e89885509ee51e7eb2921b20f019b754b55ca7c63ada SHA512 c879c5bc09b22f77387bf62066b845d8d2e6f6e130d1a439dcc648cf7f1802df0abddcfb9a6c7f3fe11d122abe33da3726cd89eab1346fcce39730cc47f18cfe
-EBUILD libav-12.1.ebuild 11722 BLAKE2B 708f5509fb8493f5d5ca1944eea832b781d940f7841e71a2b792da72fa543afcf03adf3a35a69e1f39aa9469633d975c215978d11b6e545f354e85693dffeeec SHA512 989293bae7659082d707edbc01c1b5c6d5aa0ba31065640daa17e325887ab43cc43aee0efb64c2ab181905d7a465f0089b9052c610d7576135fdcb96107f3082
 EBUILD libav-12.2.ebuild 11522 BLAKE2B 1aaf92397a4829251a03abae83ec3b06208c490f6f80ee37aad48930771c958afe88b50656b99a4f4a0a7d889137c413a347f0a46b681e5a4aad1dbf75c8be97 SHA512 a6afb2e793af497cff59660936b2aee2ff990faade1d8af9b52aa62c2380b3229f340a7698ff892aa87c603490e6965bdf1b422124cd560d76f77b961058f062
-EBUILD libav-12.ebuild 11704 BLAKE2B 3440e462cb395fc887ad2982bf5fd4ead8b5f6bc505ad13abf9c14d94d12c7741fb63e2b9691131a408520a9aa3fe13295bf9c0002b5e09fe933b6742047cf1d SHA512 8601573882fb7170f9cc5e62f82afa87aa7e55750f8d41d8a6b50893e278837a2b31472a6a9625660248c3cd136030eed50f83afd05c8e90133d4da6d72e8a61
 EBUILD libav-13_pre20171219.ebuild 10941 BLAKE2B 80bca84307c4e999f621ddb8f495a53979221c769eec27f36ef930d5f72c4154871ee0579c8925fd0726dc24914463667625482d3d66532eccaeda0b845c28bc SHA512 ad192093c6d8897ec42af7f12009d84c4c2a0af35a1ae5fdc8569d9b86293fd3781f6858bb6e100d46790df18c81297aee0e20e90c459a01b2032a8d6dd36373
 EBUILD libav-9.17.ebuild 10192 BLAKE2B 5cba6be794e6f712aec7086805244ff6bc0e3d007844e63393f36a955508808aed89bd74e3b8a09280501785a5fa174a07b7590e6cd667b848afba5bef004e6f SHA512 c12da6532ceeb8da0eff9336727d189cd67c6a296c2597cd20e3216082a111c5baefaf329eaed3376b7c8cd6434dc56af806819df83599a61d3998114b8dbb4e
 EBUILD libav-9999.ebuild 11000 BLAKE2B c17516a7dcf3a3683b2eff1f77f72292ed3103306a94744e547ccf65a9753024480087954fafc71e1b61d3f37695344ea84fddef802a4e455feee435a963362c SHA512 575a6074f8341186c57191d95ab7f40be180fdc4f3a58b981d5ef7d7e8427556841bacd08fd28504f4f96a3e07abbf8fb2afe10b9e3058e382064ef086f6b03a
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
deleted file mode 100644
index ddd93225c964..000000000000
--- a/media-video/libav/libav-11.3-r1.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
-	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-11.3.ebuild b/media-video/libav/libav-11.3.ebuild
deleted file mode 100644
index db8e6c4c8e99..000000000000
--- a/media-video/libav/libav-11.3.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
-	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-11.4.ebuild b/media-video/libav/libav-11.4.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.4.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		# It is a security concern and removed in the next version
-		--disable-protocol=concat
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-11.6.ebuild b/media-video/libav/libav-11.6.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.6.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		# It is a security concern and removed in the next version
-		--disable-protocol=concat
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-11.7.ebuild b/media-video/libav/libav-11.7.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.7.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		# It is a security concern and removed in the next version
-		--disable-protocol=concat
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-12.1.ebuild b/media-video/libav/libav-12.1.ebuild
deleted file mode 100644
index e3d51f053751..000000000000
--- a/media-video/libav/libav-12.1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	FATE_VER=${PV%%_*}
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-# 9999 does not have fate-*.tar.xz
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	nvidia? ( media-video/nvidia-video-codec )
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
-	NVIDIA_LIBS="-L/opt/cuda/lib64"
-	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
-						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		use nvidia && myconf+=( --enable-nvenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && use arm && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
-}
diff --git a/media-video/libav/libav-12.ebuild b/media-video/libav/libav-12.ebuild
deleted file mode 100644
index 35f9021007d8..000000000000
--- a/media-video/libav/libav-12.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	FATE_VER=${PV%%_*}
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-# 9999 does not have fate-*.tar.xz
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	nvidia? ( media-video/nvidia-video-codec )
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
-	NVIDIA_LIBS="-L/opt/cuda/lib64"
-	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
-						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		use nvidia && myconf+=( --enable-nvenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
-}
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index e39d371d8f0b..36578508f720 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,6 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
 AUX makemkv-wget.patch 1013 BLAKE2B 123152789d07f8fd0497e5fbd3f3f54108434991242a5a7665920b6007c653c5ffdb2f66467ab8ed3e1f23b7257906340cdc26282d6ba2a087b3f4632ca57f6f SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f
-DIST makemkv-bin-1.10.9.tar.gz 9115532 BLAKE2B 2e8d290d3dbdfcd560f73aeb8f286d02e34006d29fb29de817407f0e8ce9880a8af99331646b7e28b1d9e3b3101a6285848e5e28bd955c55af3cebf6e5c6e910 SHA512 36d2a7f8bace847a89dec5a821d6c6235d9e3aaffac4dbd59233a611070d30758d039a5f27fce5a857a80410d586e15d948a9b980392ba31759ccb7ca9ee6155
-DIST makemkv-oss-1.10.9.tar.gz 4572328 BLAKE2B 47667c04c05faa8438b93c97178646fd6e1db0affdf38d72982a978e9bd80a8ece2c123a55d60147c602203218f30d9e951bd2c9b41b049dd2e68ac4334d07be SHA512 cdcdd0479ff3c6600a1aba823eea3214e57bfe0d3023f8efc44ca55c8f7653931c13f3f0ad7a7c31cc97c6e2dc50974315e7dceffe9383a511cfe298938d875e
-EBUILD makemkv-1.10.9.ebuild 2910 BLAKE2B 52773c4a13197954e6efd92a2120f1f52bd33be35342cc1b54a2d250e6448947bfcba03b327629da4a43416560832b1b2d9352c1371e70fab98f2b8cc69bd508 SHA512 bf41dcc543f64a6c764d4e6639cab2dc9519f0efbcda034e4463316f084e459b4fe4a208fdbb9b3867c1058b65da5ae4a601b0f1c1ba64c335bf44ef7072fea8
+DIST makemkv-bin-1.10.10.tar.gz 9119354 BLAKE2B ed0d2031701aad5d1cc6f9ef8704a8a985ff3fdc343a9dc02310751856c336c08ba83675e3305b3e856a810176ff02d7da148a4dc1d4b9298fe62bce3c8a236f SHA512 d070ccabbcfeaab1a72f5f52cb0efa98cbd6c4c1b7d8445971d76a76c89b487b6debf0f1183af13d877e41a2d7e7deaae355fe30194a783b80704395a2a03b8e
+DIST makemkv-oss-1.10.10.tar.gz 4572400 BLAKE2B 1ac6c9605cb31f3abdc75430476c398ff01d9a9b500149b2c26a7e2c10d14be11a03b9a0ffe52f805e03b8fdbfdf22f72fa5f3ff7b23c3c24c924e95f8286d5b SHA512 5c73044c7f6a522bd8410cf6454bf38e9829cbcf83a755916242aa242477befb248be8da962b070ec99950dfba7180486fb90c34c86fc62e87485baf9fa99b13
+EBUILD makemkv-1.10.10.ebuild 2948 BLAKE2B 11a19400c703662fbe6521cb5d72ea9e93b0cb07aedc8f286c3fae94faa506f26635baa1e81a19f63f9a2de41034d3577b52e363a00997180edd8ad6a091887b SHA512 dc2c911050573eee6b26e54f34b9a982f0a6715c41c01fcd0db146e81116eee44797899dee65745945eaaa63c85deb97f046ec6ffb4c4808f51694a43629df8e
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.10.10.ebuild b/media-video/makemkv/makemkv-1.10.10.ebuild
new file mode 100644
index 000000000000..05739fbcc6b0
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.10.10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils flag-o-matic linux-info
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav multilib"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
+	dev-libs/openssl:0[-bindist(-)]
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
+	libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+	net-misc/wget"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/makemkv-oss-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		--disable-qt4 \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
+}
+
+src_install() {
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bins
+	if use x86; then
+		dobin bin/i386/{makemkvcon,mmdtsdec}
+	elif use amd64; then
+		dobin bin/amd64/makemkvcon
+		use multilib && dobin bin/i386/mmdtsdec
+	fi
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*.{mo.gz,xml}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
+
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/makemkv-1.10.9.ebuild b/media-video/makemkv/makemkv-1.10.9.ebuild
deleted file mode 100644
index 9b3bdc586d57..000000000000
--- a/media-video/makemkv/makemkv-1.10.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-	http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav multilib"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-	sys-libs/glibc[multilib?]
-	dev-libs/expat
-	dev-libs/openssl:0[-bindist(-)]
-	sys-libs/zlib
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
-	libav? ( >=media-video/libav-0.8.9:0= )
-"
-RDEPEND="${DEPEND}
-	net-misc/wget"
-
-S="${WORKDIR}/makemkv-oss-${PV}"
-PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
-
-src_configure() {
-	# See bug #439380.
-	replace-flags -O* -Os
-
-	econf \
-		--enable-debug \
-		--disable-noec \
-		--disable-qt4 \
-		$(use_enable gui) \
-		$(use_enable gui qt5)
-}
-
-src_install() {
-	default
-
-	# add missing symlinks for QA
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-	cd "${WORKDIR}"/${MY_PB} || die
-
-	# install prebuilt bins
-	if use x86; then
-		dobin bin/i386/{makemkvcon,mmdtsdec}
-	elif use amd64; then
-		dobin bin/amd64/makemkvcon
-		use multilib && dobin bin/i386/mmdtsdec
-	fi
-
-	# install profiles and locales
-	insinto /usr/share/MakeMKV
-	doins src/share/*.{mo.gz,xml}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
-	elog ""
-	elog "Note that beta license may have an expiration date and you will"
-	elog "need to check for newer licenses/releases. "
-	elog ""
-	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-	elog "is no longer necessary and you should delete it from there to"
-	elog "avoid warning messages."
-	elog ""
-	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
-	elog "libbdplus, allowing transparent decryption of a wider range of"
-	elog "titles under players like VLC and mplayer. To enable this, set"
-	elog "the following variables when launching the player:"
-	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}
-
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/mkclean/Manifest b/media-video/mkclean/Manifest
index fb8398e2bb5a..9b4d4cd18328 100644
--- a/media-video/mkclean/Manifest
+++ b/media-video/mkclean/Manifest
@@ -1,5 +1,3 @@
 DIST mkclean-0.8.10.tar.bz2 764380 BLAKE2B 94ce2f7eda5865312e6fdc48b001d824b2216625c36a3a728dd78e93444e23a02e07cacb67281f97e77009e15348c99cdfab19f1c066c4b675c124373196fae9 SHA512 8e12ac906205b14c162f0fd29d9e1a56ee854e7946706adf22c3df40376ddeb2c23a02c499d8146aeafc945381eabb96e16ca33da1323dda5929a1fc1f337892
-DIST mkclean-0.8.9.tar.bz2 739749 BLAKE2B 50a315f0c866b319e550c5a7eaa21b8454702784447e46227e06f82d2707245bce398ea850dbbdfb3d517c96c1531954044ea5b5c8f7bbf90797492f259eff27 SHA512 23cf1d6ae66089ea717a09afb02b532b3555a4e3061916c460c15a71c0834127b5650fcb663b8d06d88aa9ba45ffff0b063a4b8914d852cb1086d4b59df59b98
 EBUILD mkclean-0.8.10.ebuild 982 BLAKE2B 680c61e626456b88d0b87e8510eddf060f69c5ee27d29766787f28b35fedcb25596a6cb2d113893b65a8a64eec37f9ef493cff79602508c4fb286c1aedb53527 SHA512 380a0a9ea83757500d33ad8638b1f32a98fef1d68e97ebf2541f31f7c85f9e24a485caa64e543bb898ecca9cb074638400f017d2c4ef91e9ee035e65d9af6886
-EBUILD mkclean-0.8.9.ebuild 849 BLAKE2B 135788e9ea514c60b126dd0d3aa6d335faf08469529aca7119a016a0af94c316fb1df6707721b6121a68c0f293ce26a3b58370fa476551051683c66b7a251e18 SHA512 d7db7640bfadea73ab75a74ad9e99bc1adef241fbb910b2cd1559e436a8d8391b613e6f74076193d7231f444287a26c2fa6da95bb2f63153778ec822171c9ad8
 MISC metadata.xml 948 BLAKE2B 4aa66a16ce8416c47366bf03dc09846ddf74ccafa4559521c75f63725c7efa9c33a836671db63eec2fda997fdee713cfb6a96b57d8e356c3152721d401f461ef SHA512 c246ead2ee597aaf369567b30e4577d6865befa0ef89877f512b1e192913459800d980c84e81f43a06d006e9a8f35204c8d484713a24c2886fa39b5201d226a2
diff --git a/media-video/mkclean/mkclean-0.8.9.ebuild b/media-video/mkclean/mkclean-0.8.9.ebuild
deleted file mode 100644
index bae50b89372c..000000000000
--- a/media-video/mkclean/mkclean-0.8.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
-HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	# non-standard configure
-	./configure || die
-
-	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
-}
-
-src_compile() {
-	emake -f GNUmakefile -j1
-	emake -C mkclean -f mkWDclean.mak -j1
-	emake -C mkclean/regression -f mkcleanreg.mak -j1
-}
-
-src_install() {
-	dobin release/*/mk*clean*
-	newdoc ChangeLog.txt ChangeLog
-	newdoc ReadMe.txt README
-}
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index 7a55fd3756a2..dad7e15f1f38 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1,5 +1,3 @@
-DIST mkvalidator-0.5.1.tar.bz2 589116 BLAKE2B a634d93054726f3ef5a0d79a9800b4b1b67633820da1ce1758f6ec1d758711dd65c5211834f4b2517a7a4a6740118bd1f9b3207331bc5a3457e3d842d354b817 SHA512 236f15f2161e59b9a9923c1f9e4347069696578956d490def776e0b11339b9ba90eeb9a4b4ac85e1e506c250830e9ff3f007b52f7208c10d05180489abd1ccb9
 DIST mkvalidator-0.5.2.tar.bz2 612382 BLAKE2B a60b64902e068b82f95f61295088dbf56ab122918e46a36043246310fcf7e4a6c7f997866a8802a119e18305acbbe532acfb7cde907499168f75436b86ad7482 SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc
-EBUILD mkvalidator-0.5.1.ebuild 803 BLAKE2B b4cf6684a0d32463eae88289a1a46445c886c77e663fcf1ea56f417658588c47d955dc51c32c664e5a8fadb7c18f2bed1386078bbaa376a7e935d48a204bbd2b SHA512 7009aae1ed262265434d1b011b3e22b985bc19855631add68baa4a2b94e314a8adbe2349add03653e56ccd6342d859c832fb1d515f2ddeb85fa85f5fcbd4b76b
 EBUILD mkvalidator-0.5.2.ebuild 902 BLAKE2B c994d2bf14b6312fff948247c6482e5f6ec2dc4a1948ca98ae0fe8d928b05b4049307b9da97bf0a821cc1a97fd0abaccb2cc69c8ca56dde725607d7fed547574 SHA512 76f3b3118045d5ff688e404e5f02cad909c299a8dd62d91448b446dd84a1c3b935dc10aec9fa97ef968d062f94d94e06b3b56c59bba1cbb5497b5df404ebea9a
 MISC metadata.xml 637 BLAKE2B c103109a8fa0baa6da05fc578f9ab0ed02057f362e73a097630468291b2a8f04ea56e11c2fbe6d198a44e1d33bdc1c88e35163b8909d2686f28fca7677390a41 SHA512 5fb4d548f51476d67d42f1ef830303f45e0f6aba344f943c017a111518aa575998fa89312112dffe140681ba92a04eb98eee7d32a86ea876405bb6de67c8751b
diff --git a/media-video/mkvalidator/mkvalidator-0.5.1.ebuild b/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
deleted file mode 100644
index 07d62646f609..000000000000
--- a/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
-HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	tc-export CC CXX
-	# non-standard configure
-	./configure || die
-
-	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
-}
-
-src_compile() {
-	emake -j1 V=1
-}
-
-src_install() {
-	dobin release/*/mkv*
-	newdoc ChangeLog.txt ChangeLog
-	newdoc ReadMe.txt README
-}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4a28cda6ead7..a2336da9a09c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -5,13 +5,10 @@ AUX mplayer-1.2_pre20150730-encode.patch 3022 BLAKE2B ab314f4ebf8363fe0a5140886f
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
 AUX mplayer-1.3-vdpau-x11.patch 543 BLAKE2B 5e8b01243a8fd8a09389adeefadd2e3631a679138b3e50d100737703854121bb02815829dcc2ff408ad90389cba95da8ba1e4585e8c8dbd25ef52c9802f56f2e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
-DIST MPlayer-1.2.1.tar.xz 13029936 BLAKE2B 1aa7afdbfbc9319d0e4051c61f95dc15a1597d0317313a574332bd4aeb5d3c8ea61fc1aebb969047f2bb61c25a617d1c2948f4b9941d4f8a080e6bcee7282f98 SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.2.1-r1.ebuild 17429 BLAKE2B 2601b5d4536a51209233e837a689ba4d6bb9cfdae546de5466d1c9e776695478cb3ff93dcfd2f2a3b9c1202adcea45c88bdd08e9217f36ed8a84c1f7632cd433 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3
-EBUILD mplayer-1.3.0-r2.ebuild 17194 BLAKE2B 80a881f1e48cbb210b85f5a1ca206280dbf1728dbbdd812524d2b9a7603c9122caf35bc7771b23e3716032cf15cbb5a626da7352297d3f150673f8800474c744 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d
 EBUILD mplayer-1.3.0-r3.ebuild 17342 BLAKE2B 968171c2de7bdacaeedeb157f47c27cbef6cfaf19e4835914da70ed7c390acae57428fb55904eb75d8eba797c9c4f9a73418869ba9c356fac53e116d9b115381 SHA512 5bb5222df9ba043dd5ab7d251a5bb5f749274bd78d95b3fa535a104d5d196da134ac423fd8010d17df81d5b4a0707d37ce998033659bc48713b949a98e3f495d
 EBUILD mplayer-9999.ebuild 17206 BLAKE2B 56a4583ebee886adca2bc76e31e9904797f5f925d1772df7a1340898d9bf1874218d887a80a48dd5f2973fb3ff49c2d510c5a56fb0d4fe2ae41d8eccfb448f5e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/mplayer-1.2.1-r1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild
deleted file mode 100644
index da0d2b6068cb..000000000000
--- a/media-video/mplayer/mplayer-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib:0= )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
-	if has_version '>=media-video/ffmpeg-2.9'; then
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
-		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.3.0-r2.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild
deleted file mode 100644
index d6bfb7e6ba2d..000000000000
--- a/media-video/mplayer/mplayer-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,626 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-3.0:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib:0= )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="~alpha ~arm ~hppa ~ia64"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 99a3f72de221..f528d98adc47 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -4,7 +4,9 @@ AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed11
 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81
 DIST smplayer-17.12.0.tar.bz2 5040463 BLAKE2B 6171cc0071e35c001678816464c55a9c16a5978ae4cae9a428c609e4940d0d0516e7d4928e961ca1e97469d77776c7e03f8c9a5c1c6ea3597c9724a2f6ea1ada SHA512 7b09ed08cf94f03eb4f992bc1a70ba938d081410044892e55236aec791732ec34bbdd31c6cbd05aa0eeb5cab6c0bf0a7b458373157ba49eed2c6a90e0ac257d1
 DIST smplayer-18.1.0.tar.bz2 5033686 BLAKE2B e05a8044e725ddcd1a31c9209fe83abf03553d671570db0affabd55c28fa11ac7c81c853c5ac0ef7e9bb5b0d69e7924e2ef8a8f57fd07e2354b926b887c4cba8 SHA512 f0fb844634fbb22c975744cc4d557503aba7131cb52c5e1165a3ff9eec259bf45ebde5b7dfefa48d5f17e2946c1cfa0cce34429b373918f488e3f51c3398884e
+DIST smplayer-18.2.0.tar.bz2 5033848 BLAKE2B 8996707609788f48b92868421d8feee14d267119e8980da57472735bbb66f9d63df20762295d2005e9a0cc572d2c04debff3f5e59ebd0c68b649b849b709df2a SHA512 43be64b82f77b223ef885b63b1bb3302b96cb93897cbf66df6272075bcfb76dbf11091526ae2b1bcde6845e25053a31456361fbd841a4dad8d229bacfab8bdb5
 EBUILD smplayer-17.11.2.ebuild 3083 BLAKE2B 28ea91680564dd29721212de2084ba86debe81cccc258d4075d39b534526486e55ee94ddda6b9a5ce2ff12fc7d2f985ea6b2ed3b8f9e98b089faba46748b6bca SHA512 a8a9bc7e29d2a2f3a2fa08ea28a762bfe258213980fe2c2057a9ef49d096a62cd1d7e412dd0e82a277a6e4b11539514e717458c773789c747028ea450d5d0a7c
 EBUILD smplayer-17.12.0.ebuild 3085 BLAKE2B 4981f54ed4407df2f7b651dea4714cfba67c976c393a54f58d76e0710e9b8de0e42befd3b5c396ba9682f28a31ca40796369e3a6213e6870f723157eac99d085 SHA512 6337e293afb3e2c2d8543bf4659336dfb960bdae78cc619a3e2842557e2568fad88b68010f31d3ab76bbf31022eb3f131b1d57df105ba85ef0261515146c4cb9
 EBUILD smplayer-18.1.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7
+EBUILD smplayer-18.2.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.2.0.ebuild b/media-video/smplayer/smplayer-18.2.0.ebuild
new file mode 100644
index 000000000000..70deb3e4a369
--- /dev/null
+++ b/media-video/smplayer/smplayer-18.2.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.15.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	default
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 71186bc231ed..77dee986c1e6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5b75753b8450..3e5d4982e927 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jan 2018 18:08:23 +0000
+Fri, 26 Jan 2018 14:38:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 26f90134dcda..3a453797f35a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 415966 BLAKE2B 664ebf4d322399166469a6cd167dfeeba8ecc3b61712e950abcb3c63c18cca02140bfaa206e2eb06bb1476d73682fe2d76e35b8a94dc0228c60af02e86c19a87 SHA512 7d06c7f62e8712502202c5d9e88cc501b34d79560f0bdd5e1f5907dc55cbc791a6d1c654b9e913106a8a96545f88c154fb9731c255532e719a8a5c200a14acc3
-TIMESTAMP 2018-01-21T18:08:27Z
+TIMESTAMP 2018-01-26T14:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpk1xtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0+hAAmkOxAO29+nsifPTFS3x81NOOI5YTbHvPtqtkRv0IwWHmknDidXJyBj5H
-Ka7bVs6YVIPEh6L4/A3+eQ6HiWQwtdjUrFGYfFV3C45hXeMRpLXCrvnmSbpdGu0I
-eR4A6/W+qC/NUWfC7/D4u7gh/PVYrpleODzTvlKotN6oqrCsHaeXqAIg6iTWYpJz
-dVNej8E6Gv1KI+XOzi0V+jqlN8bYhB9mCD3zXyz5CIcIDsEuyCdjD+UkA20Rrh8n
-12pK0CVZLrdZajlPYbipx8K/c3MmMVPnWBURKwiI81emlKcwo90pOB7fOhfIeXVM
-dxAIIwxWZb+N49hqW6LuV/vPxg0QU3HuU16X5wBxSM5I/VEJP6JzMPmX/0GjEn1D
-ZodXaF5npacPtWsWGWD9J/RlAvLX8ZeFnCnBoE5KRRDOd9r+I/supLwIHsRZh0xY
-Oqh0XhPYFDOQ1Kbp/eOP5wHbB0jjUye8VM++KPx7e2iAz7h3L7VD0EeUTB/8w2NX
-XWhxMTc8dfy3GQoK/d1BRRVBjce3Dxz3p0vgBfEzSI28tadk864+0b/jv/hiIwtM
-ubEsqebwB6XOe9F3zAeG3G/LUSQZ/kmKqLsNunKwGRaJftyf+HVjJSMPy2bhHSJ4
-/xO6sovl7TfvZjqR5GtiEa66QnfqLqBptgi1FcRzeO1sW9yDPLQ=
-=UD4+
+klAxYxAAtH5Pn1i40vUGCtIsp4f1t1qbaZnVY3CbZMv0bfi/E7+TnjYiViX9+fUQ
+DlCuP4Iw6znGILlmaHqWBfm3Vp3UbsM/25Hdh5EGLS+aTWqZYVpURLg0Xbbt3j4c
+WN5XQj1Mr55r3Wf4AsltBrlJ97s0PGgaWETQKt6svF8pBWLVtzXLLsKTcHGey5r+
+enF89cUYCKfZ3RPYkPjPpy40v1rU1IE6S+B2wX4Obg74Y20iZQV+e+pV/yNcd1nQ
+NJWCQ9fcoOUBqD5/J0lDACt+Rvv0QVoc2FZDwfJ9wEmcrT6mWtaMz2TuXybfnZkW
+aUgJBXDz/kFqNkMyOs67r/3hUH0oUw7lgshURs+mQrlE4+ddCetu4b08Bo5pye5u
+qVUq3EGUQ2m91DXH3KlN0CPBOWOF0GjG/l7O2L54pB7MUXMuNc8u1mMqF8uhD6JF
+fXZHdb2y7Ww1fLmkPNq0iH5XrrITWM5RqpWFmzCBv8vLFvWR+dZ6GnPClWKjOQBo
+vgRm2sGo26y+HZUthSXhB11iDlVxNmSye048wDDjsmzFyyqMBgUECOdBvtsK5z8n
+eOvBG7sT1c4S6/jHpr6A+pP9S5rIl3ddVjx7VffVNARcTmRwE8f6t2DmNOf37W/N
+/G39PeQvyKCYpTK2hCJZW+pEDvBio9o7wy/4L0CO0OKauXpIkwY=
+=w/A2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5b75753b8450..3e5d4982e927 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jan 2018 18:08:23 +0000
+Fri, 26 Jan 2018 14:38:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 411b3b0a1af4..edf187c0bcad 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 6c1b97ecdd31..4cca8be8c9f6 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/apache-tools-2.2.34 b/metadata/md5-cache/app-admin/apache-tools-2.2.34
index 09c683ed129b..dfff6020633c 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.34
+++ b/metadata/md5-cache/app-admin/apache-tools-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) !<www-servers/apache-2.2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7c08ca67f757c2f0a6e4f52d8bd36a03
+_md5_=445f45885f9549815885a4ad5bca0697
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.27 b/metadata/md5-cache/app-admin/apache-tools-2.4.27
index ee3a6bfe15f4..ebd1ebcd98c9 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.27
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.27
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+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 ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.27.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6a0cc8b16c92e161a787eed3e9bfa7c0
+_md5_=78acee5806d8fb5e655b7110d0bd8802
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.28 b/metadata/md5-cache/app-admin/apache-tools-2.4.28
index eafe58f0de9d..66a6b9f4cdd2 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.28
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.28
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+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 ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.28.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=341e536b65221a9fba8860058cec5407
+_md5_=7b2a3964af2d54efa1d5e3717e9cd13c
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.29 b/metadata/md5-cache/app-admin/apache-tools-2.4.29
index 890d9a001c82..56c8e8c9f8d5 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.29
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.29
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+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 ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=341e536b65221a9fba8860058cec5407
+_md5_=7b2a3964af2d54efa1d5e3717e9cd13c
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.12 b/metadata/md5-cache/app-admin/calamares-3.1.12
new file mode 100644
index 000000000000..eef6a243da4b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Distribution-independent installer framework
+EAPI=6
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.12/calamares-3.1.12.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=672693808a4ff0c04fd8137a35214825
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.7 b/metadata/md5-cache/app-admin/calamares-3.1.7
deleted file mode 100644
index 598ddee35372..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Distribution-independent installer framework
-EAPI=6
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.7/calamares-3.1.7.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=672693808a4ff0c04fd8137a35214825
diff --git a/metadata/md5-cache/app-admin/collectd-5.7.2-r1 b/metadata/md5-cache/app-admin/collectd-5.7.2-r1
new file mode 100644
index 000000000000..ee16a7b85068
--- /dev/null
+++ b/metadata/md5-cache/app-admin/collectd-5.7.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Collects system statistics and provides mechanisms to store the values
+EAPI=6
+HOMEPAGE=https://collectd.org/
+IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=collectd_plugins_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 ) ) collectd_plugins_smart? ( udev )
+SLOT=0
+SRC_URI=https://collectd.org/files/collectd-5.7.2.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ea4594f5480a71456e3b8737b3723245
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.10 b/metadata/md5-cache/app-admin/eselect-1.4.10
deleted file mode 100644
index 4f4b4485ee58..000000000000
--- a/metadata/md5-cache/app-admin/eselect-1.4.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.10.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=123d6456d78039a9103db56b7603ed6b
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.11 b/metadata/md5-cache/app-admin/eselect-1.4.11
index 1d9abaf75cdc..35f6403bb00a 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.11
+++ b/metadata/md5-cache/app-admin/eselect-1.4.11
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.11.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b9a5e8dbb672badc76d8cfd7eada8b05
+_md5_=2719946c739fd818d49fa6e262f25bba
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.12 b/metadata/md5-cache/app-admin/eselect-1.4.12
new file mode 100644
index 000000000000..17670d8d3bb2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-1.4.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
+DESCRIPTION=Gentoo's multi-purpose configuration and management tool
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+IUSE=doc emacs vim-syntax
+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+ || ( GPL-2+ CC-BY-SA-3.0 )
+PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
+RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8a73fdcff70c937b373060dfa90b6985
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.8 b/metadata/md5-cache/app-admin/eselect-1.4.8
index 20909589d86d..b6164b7ff66e 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.8
+++ b/metadata/md5-cache/app-admin/eselect-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.8.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7cf546b651b69ad9e1ac84eb1600302a
+_md5_=9edac4e53032fbb3c9ee221fe9148e3b
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.9 b/metadata/md5-cache/app-admin/eselect-1.4.9
deleted file mode 100644
index 40f050085e72..000000000000
--- a/metadata/md5-cache/app-admin/eselect-1.4.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.9.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c5953359e7885df14b8208c1825828cb
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2 b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
index dcfae478a653..7f013b94a788 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=015123ca9ebc7f95747c2c95e03a71c4
+_md5_=cd343d08056f0003ba853d4c191e4adc
diff --git a/metadata/md5-cache/app-admin/gamin-0.1.10-r1 b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
index 2f9536768ca0..52db595ab0c3 100644
--- a/metadata/md5-cache/app-admin/gamin-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Meta package providing the File Alteration Monitor API & Server
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=>=app-admin/gam-server-0.1.10
 RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10-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(-)?]
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=01f127661a3b24067aa11ba4d030141d
+_md5_=f7a79d64e1e14b49130a7281f64e4854
diff --git a/metadata/md5-cache/app-admin/helm-2.8.0 b/metadata/md5-cache/app-admin/helm-2.8.0
new file mode 100644
index 000000000000..1cb9c3e4af37
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-2.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Package Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/helm/archive/v2.8.0.tar.gz -> helm-2.8.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/aws/aws-sdk-go/archive/760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz -> github.com-aws-aws-sdk-go-760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-ini/ini/archive/300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz -> github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jmespath/go-jmespath/archive/0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/b217b9c388de2cacde4354c536e520c52c055563.tar.gz -> github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-gcfg/gcfg/archive/27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz -> github.com-go-gcfg-gcfg-27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-warnings/warnings/archive/8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz -> github.com-go-warnings-warnings-8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz -> github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz https://github.com/kubernetes/kubernetes/archive/3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz -> github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1bf67820159d3374cee008403845ddb3
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.7 b/metadata/md5-cache/app-admin/kube-bench-0.0.7
new file mode 100644
index 000000000000..dec298f2858a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
+EAPI=6
+HOMEPAGE=https://github.com/aquasecurity/kube-bench
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.7.tar.gz -> kube-bench-0.0.7.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/metalog-3-r2 b/metadata/md5-cache/app-admin/metalog-3-r2
index 61fd8533116b..74865ecaf552 100644
--- a/metadata/md5-cache/app-admin/metalog-3-r2
+++ b/metadata/md5-cache/app-admin/metalog-3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A highly configurable replacement for syslogd/klogd
 EAPI=6
 HOMEPAGE=http://metalog.sourceforge.net/
 IUSE=unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre-3.4
 SLOT=0
 SRC_URI=mirror://sourceforge/metalog/metalog-3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa4f9428d9e045b687e1293db554ff26
+_md5_=1aa49d2b093efe66cc3cef64006ec9ab
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.0.11 b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
index 75e7db1797ee..3e2300ee319e 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.0.11
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 vala? ( introspection )
 RESTRICT=test
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.0.11.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ef78313a87e793847617c3e0526daec2
diff --git a/metadata/md5-cache/app-admin/pass-1.7.1 b/metadata/md5-cache/app-admin/pass-1.7.1
index c3879498f21a..23fe35886c6d 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.1
+++ b/metadata/md5-cache/app-admin/pass-1.7.1
@@ -3,10 +3,10 @@ DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=5
 HOMEPAGE=https://www.passwordstore.org/
 IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-KEYWORDS=amd64 x86 ~x86-macos
+KEYWORDS=amd64 ~arm x86 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9e2038d77254d384f5d81c5af89639be
+_md5_=4411855990d20079f1b54cf90e99a733
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.04_beta b/metadata/md5-cache/app-admin/passwordsafe-1.04_beta
new file mode 100644
index 000000000000..08a00a048af5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.04_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers ) app-arch/zip sys-devel/gettext test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Password manager with wxGTK based frontend
+EAPI=6
+HOMEPAGE=https://pwsafe.org/ https://github.com/pwsafe/pwsafe/
+IUSE=minimal test qr yubikey +xml
+KEYWORDS=~amd64
+LICENSE=Artistic-2
+RDEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers )
+SLOT=0
+SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.04BETA.tar.gz -> passwordsafe-1.04_beta.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d5db3716246d42180d88d12048a06570
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.20 b/metadata/md5-cache/app-admin/perl-cleaner-2.20
index 77e7f9d08235..9ad691fd87ec 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.20
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.20
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.20.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.20.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=685f4aa57f02cccd0b41fe464d90e825
+_md5_=6099af1564da5540bc4892eb9d93318b
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.23 b/metadata/md5-cache/app-admin/perl-cleaner-2.23
index 4d43e2752b7a..52f757389a7c 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.23
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.23
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.23.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.23.tar.bz2
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=92e938e8b473a0fe766b98c4724ef07f
+_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.24 b/metadata/md5-cache/app-admin/perl-cleaner-2.24
index 8664519b60b2..f1c1a588ffd0 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.24
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.24.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.24.tar.bz2
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=92e938e8b473a0fe766b98c4724ef07f
+_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.25 b/metadata/md5-cache/app-admin/perl-cleaner-2.25
index 547468ca2315..37bd14afb189 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.25
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.25
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.25.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.25.tar.bz2
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=8522495bfc1cae8014e7cb742091e65e
+_md5_=a0d25ce4446c2a953754503bab2986e7
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.26 b/metadata/md5-cache/app-admin/perl-cleaner-2.26
index 75c346340a65..d809c7dda6f8 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.26
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.26.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.26.tar.bz2
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=92e938e8b473a0fe766b98c4724ef07f
+_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-9999 b/metadata/md5-cache/app-admin/perl-cleaner-9999
index 7e68fb5f9dc4..caa14ba32ffa 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-9999
+++ b/metadata/md5-cache/app-admin/perl-cleaner-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=92e938e8b473a0fe766b98c4724ef07f
+_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.1 b/metadata/md5-cache/app-admin/puppet-4.10.1
deleted file mode 100644
index 4ac2ea913ca9..000000000000
--- a/metadata/md5-cache/app-admin/puppet-4.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=5
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=f45f5a28e449059ebaea4b0a69aa2168
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1 b/metadata/md5-cache/app-admin/r10k-1.5.1
deleted file mode 100644
index 4f0ed2132741..000000000000
--- a/metadata/md5-cache/app-admin/r10k-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Puppet environment and module deployment
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=31e5c7165085726c0b9e07a27dc7b7a1
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1-r1 b/metadata/md5-cache/app-admin/r10k-1.5.1-r1
deleted file mode 100644
index c8f298056d90..000000000000
--- a/metadata/md5-cache/app-admin/r10k-1.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Puppet environment and module deployment
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d5353de092b02b9a26634d82cc4ac3af
diff --git a/metadata/md5-cache/app-admin/salt-2015.5.10 b/metadata/md5-cache/app-admin/salt-2015.5.10
deleted file mode 100644
index bec45bb85a5e..000000000000
--- a/metadata/md5-cache/app-admin/salt-2015.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2015.2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
-EAPI=5
-HOMEPAGE=https://saltstack.com/community/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2015.5.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=765997b9acae83ec579e6a8649e43ffa
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.13 b/metadata/md5-cache/app-admin/salt-2015.8.13
deleted file mode 100644
index 3ee86e5aab23..000000000000
--- a/metadata/md5-cache/app-admin/salt-2015.8.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2015.2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
-EAPI=5
-HOMEPAGE=https://saltstack.com/community/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2015.8.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=682401f9d903801df35076f83d84d909
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.13-r1 b/metadata/md5-cache/app-admin/salt-2015.8.13-r1
deleted file mode 100644
index 51809876a566..000000000000
--- a/metadata/md5-cache/app-admin/salt-2015.8.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2015.2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
-EAPI=5
-HOMEPAGE=https://saltstack.com/community/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2015.8.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ceacf721097031dfe6e92c25d03f0938
diff --git a/metadata/md5-cache/app-admin/salt-2016.3.8 b/metadata/md5-cache/app-admin/salt-2016.3.8
deleted file mode 100644
index 9ab4fc3f9089..000000000000
--- a/metadata/md5-cache/app-admin/salt-2016.3.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
-EAPI=6
-HOMEPAGE=https://saltstack.com/community/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
-RESTRICT=x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2016.3.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0bbb3ce08819d180d09779e22ed205e9
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.20_p2 b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
index 8d7b1e4fe15f..10d5aeab783f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.20_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl selinux skey +sendmail
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.20p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.20p2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ee481b0042018e9ddf26dd1aeceac319
+_md5_=d8d807e52c44b7122bdb1075c3228704
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.21_p2 b/metadata/md5-cache/app-admin/sudo-1.8.21_p2
index 8970614143f3..2e36b5282f9b 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.21_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.21_p2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.21p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.21p2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5a2af540b3c73a1aee4884662c4f795c
+_md5_=95706be16960118536c4fe6e411bce25
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.22 b/metadata/md5-cache/app-admin/sudo-1.8.22
index cd473e4a284a..f1dcf9a90d6f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.22
+++ b/metadata/md5-cache/app-admin/sudo-1.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9656a781a3206e5773dbcaa1578490df
+_md5_=95706be16960118536c4fe6e411bce25
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 72d744c16a96..c1cd56db586f 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fc6e9ebb5a06107ebb12cec7d382515c
+_md5_=6d452c9ea7cdbae70447dc007abeb922
diff --git a/metadata/md5-cache/app-admin/tenshi-0.17 b/metadata/md5-cache/app-admin/tenshi-0.17
index 6c275cb9c1a9..81715033e2e3 100644
--- a/metadata/md5-cache/app-admin/tenshi-0.17
+++ b/metadata/md5-cache/app-admin/tenshi-0.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Log parsing and notification program
 EAPI=6
 HOMEPAGE=http://dev.inversepath.com/trac/tenshi
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=dev-lang/perl dev-perl/IO-BufferedSelect sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/inversepath/tenshi/archive/0.17.tar.gz -> tenshi-0.17.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=77aae6977666b904b738f0582bbba53e
+_md5_=df8e6b46f189af38e52d94139debb7f7
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 6bd4395b5c02..1eb1094052d4 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.98.7 b/metadata/md5-cache/app-antivirus/clamav-0.98.7
deleted file mode 100644
index 66c1abaceb0c..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-0.98.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0= ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 dev-libs/openssl:0 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Clam Anti-Virus Scanner
-EAPI=5
-HOMEPAGE=http://www.clamav.net/
-IUSE=bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0= ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 dev-libs/openssl:0 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
-SLOT=0
-SRC_URI=mirror://sourceforge/clamav/clamav-0.98.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c1c899938eeaa82fb6ba7620c247e8a7
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.98.7-r1 b/metadata/md5-cache/app-antivirus/clamav-0.98.7-r1
deleted file mode 100644
index 59ca0fe48c93..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-0.98.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Clam Anti-Virus Scanner
-EAPI=5
-HOMEPAGE=http://www.clamav.net/
-IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
-SLOT=0
-SRC_URI=mirror://sourceforge/clamav/clamav-0.98.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bb474c69f646f89c8b4db0c307e759f2
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99 b/metadata/md5-cache/app-antivirus/clamav-0.99
deleted file mode 100644
index 24d267e53f0b..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-0.99
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Clam Anti-Virus Scanner
-EAPI=5
-HOMEPAGE=http://www.clamav.net/
-IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
-SLOT=0
-SRC_URI=mirror://sourceforge/clamav/clamav-0.99.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b091a3fb8218d6ad434fb0174db94839
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.1 b/metadata/md5-cache/app-antivirus/clamav-0.99.1
deleted file mode 100644
index bcd863fbaf6b..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-0.99.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Clam Anti-Virus Scanner
-EAPI=5
-HOMEPAGE=http://www.clamav.net/
-IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
-SLOT=0
-SRC_URI=mirror://sourceforge/clamav/clamav-0.99.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f6ae83bd48f8bbda00ed9e5ba8cb1c72
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.2 b/metadata/md5-cache/app-antivirus/clamav-0.99.2
deleted file mode 100644
index fc372b3250cb..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-0.99.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Clam Anti-Virus Scanner
-EAPI=5
-HOMEPAGE=http://www.clamav.net/
-IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
-SLOT=0
-SRC_URI=https://www.clamav.net/downloads/production/clamav-0.99.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6bd4650071534c1d160b257051664095
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index b64f2aedf315..1543ea80f087 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/bzip2-1.0.6-r8 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
index fce32f4dfb56..54b98cc35c8a 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=5
 HOMEPAGE=http://www.bzip.org/
 IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BZIP2
 SLOT=0/1
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1e1d41e9e144000813b35bb9f920890e
+_md5_=c5b295870353ab5307eabd75bb03e42d
diff --git a/metadata/md5-cache/app-arch/cpio-2.12-r1 b/metadata/md5-cache/app-arch/cpio-2.12-r1
index 627bee69ed2a..a804bfbd1a2c 100644
--- a/metadata/md5-cache/app-arch/cpio-2.12-r1
+++ b/metadata/md5-cache/app-arch/cpio-2.12-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A file archival tool which can also read and write tar files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.12.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b5834d5cb7b89dc29120b0c49e7d1c5
+_md5_=ad3e257af08003a343662bc727bba9e6
diff --git a/metadata/md5-cache/app-arch/gzip-1.8 b/metadata/md5-cache/app-arch/gzip-1.8
index fdb6ca3cc2b7..d367c81a9a13 100644
--- a/metadata/md5-cache/app-arch/gzip-1.8
+++ b/metadata/md5-cache/app-arch/gzip-1.8
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.8.tar.xz mirror://gnu-alpha/gzip/gzip-1.8.tar.xz mirror://gentoo/gzip-1.8.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1cb798f0e53d08f291efb10b876f5355
+_md5_=c91591d8dd68d30c47a7db9f99bc7ab2
diff --git a/metadata/md5-cache/app-arch/gzip-1.9 b/metadata/md5-cache/app-arch/gzip-1.9
index 645ba6f48368..d256ff333b8d 100644
--- a/metadata/md5-cache/app-arch/gzip-1.9
+++ b/metadata/md5-cache/app-arch/gzip-1.9
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e9c70b3ed3bdea49f622e67214f09464
+_md5_=cfb5101541b2eefd497f36a8b12db27e
diff --git a/metadata/md5-cache/app-arch/libarchive-3.3.1 b/metadata/md5-cache/app-arch/libarchive-3.3.1
index 9f180c7d97c2..4bc14fb9adb4 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.3.1
+++ b/metadata/md5-cache/app-arch/libarchive-3.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=BSD tar command
 EAPI=6
 HOMEPAGE=http://www.libarchive.org/
 IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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=BSD BSD-2 BSD-4 public-domain
 RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=http://www.libarchive.org/downloads/libarchive-3.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a031efc3dcd3dc7f99cd5a2f54306343
+_md5_=fd1f0087ba32489b0fdda71c24bd48b4
diff --git a/metadata/md5-cache/app-arch/libarchive-3.3.2 b/metadata/md5-cache/app-arch/libarchive-3.3.2
index 3e10f18c4b57..ba2602025f1e 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.3.2
+++ b/metadata/md5-cache/app-arch/libarchive-3.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=BSD tar command
 EAPI=6
 HOMEPAGE=http://www.libarchive.org/
 IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=BSD BSD-2 BSD-4 public-domain
 RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=http://www.libarchive.org/downloads/libarchive-3.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4260943b83e6ee9d1e24415c810c7b3
+_md5_=2a361c79f99d4d79b6bd24c1a9982391
diff --git a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
index 17057dc463f8..0cc58a196eec 100644
--- a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
+++ b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Convert a .rpm file to a .tar.gz archive
 EAPI=4
 HOMEPAGE=http://www.slackware.com/config/packages.php
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-1
 RDEPEND=app-arch/cpio
 SLOT=0
 SRC_URI=mirror://gentoo/rpm2targz-9.0.0.5g.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af75864a422d6124405db5ecd58e8739
+_md5_=4e9b1132ff2df45e859e38cea2302188
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.2 b/metadata/md5-cache/app-arch/xz-utils-5.2.2
index 9ee2f7af21ee..ab2e1dff18cf 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=4
 HOMEPAGE=http://tukaani.org/xz/
 IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c5cf1d0d99dd794236f8be5d12b7f1f6
+_md5_=69c3b63c10ad8c69b8b3cb8e57929471
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.3 b/metadata/md5-cache/app-arch/xz-utils-5.2.3
index 5f8f26e76922..510b6069c1de 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.3
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
 HOMEPAGE=http://tukaani.org/xz/
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=926aeeb177816d52b5f935d0c4140af7
+_md5_=90b03626c856f0fc7befa6fa856f1686
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 2b030e357b56..2b41f86a83d9 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -9,4 +9,4 @@ RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c1b73eb57b3f07727d0849e2231d0835
+_md5_=27671b11f66e6595d80a5562f018a1d7
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c14d1364998d..33cec5c17461 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/luckybackup-0.4.8 b/metadata/md5-cache/app-backup/luckybackup-0.4.8
deleted file mode 100644
index 105d5cf58bbd..000000000000
--- a/metadata/md5-cache/app-backup/luckybackup-0.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=Powerful and flexible backup (and syncing) tool, using RSync and Qt4
-EAPI=5
-HOMEPAGE=http://luckybackup.sourceforge.net/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 net-misc/rsync
-SLOT=0
-SRC_URI=mirror://sourceforge/luckybackup/luckybackup-0.4.8.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f53c6079ecedb6f4c02e5991bbd79655
diff --git a/metadata/md5-cache/app-backup/luckybackup-0.4.9 b/metadata/md5-cache/app-backup/luckybackup-0.4.9
index e05fe54d7a0b..30354bdbc062 100644
--- a/metadata/md5-cache/app-backup/luckybackup-0.4.9
+++ b/metadata/md5-cache/app-backup/luckybackup-0.4.9
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Powerful and flexible backup (and syncing) tool, using RSync and Qt
 EAPI=6
 HOMEPAGE=http://luckybackup.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-misc/rsync
 SLOT=0
 SRC_URI=mirror://sourceforge/luckybackup/luckybackup-0.4.9.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ff36cea03714ff67d51edc4e8be72ec8
+_md5_=ae9a7cb8c2fe9005db05bbed19c77053
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index e9f3efd8802b..9bf8cd20aa00 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/cdrtools-3.02_alpha07-r1 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
index 30d13e192e5f..1177ed45635d 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/cdrtools/
 IUSE=acl caps nls unicode +filecaps
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a07.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a6ac245ca480d8956c29f38b343341cc
+_md5_=f6f00ba92d429492164cbcf7fbe8e7d3
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 7e177c2a5636..e2bd73350065 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/acme-0.21.1 b/metadata/md5-cache/app-crypt/acme-0.21.1
new file mode 100644
index 000000000000..4539e2533764
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.21.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-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/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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(-)] 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=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe33790c2c8e65303a83e4eb518e8b2c
diff --git a/metadata/md5-cache/app-crypt/certbot-0.21.1 b/metadata/md5-cache/app-crypt/certbot-0.21.1
new file mode 100644
index 000000000000..0485a8e4061f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.21.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-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(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-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(-)] ~app-crypt/acme-0.21.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/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c58ea7ff62be94b5505f092b0879324
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.21.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.21.1
new file mode 100644
index 000000000000..010c60883c16
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.21.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( ~app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/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=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48bbeb15d3aec8efb7431fcbacd80027
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1
new file mode 100644
index 000000000000..537b1b86c0f8
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-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(-)] 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=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-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(-)] ~app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=071a07e5d3eacb34ae7a0dc55714d4c2
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.2.5 b/metadata/md5-cache/app-crypt/eid-mw-4.2.5
index ced18b054503..19d5a8dc99ca 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.2.5
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-mi
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.2.5 -> eid-mw-4.2.5.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=1ed1ec7e6a384c3c71038099896da81b
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.2.8 b/metadata/md5-cache/app-crypt/eid-mw-4.2.8
index efeea05f5807..3d92ea204f93 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.2.8
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-mi
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.2.8 -> eid-mw-4.2.8.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=acf15b1cd32f1aa1094b075499801dd0
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.3.6 b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
index 91201f3fa0fb..c112e1295b21 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.3.6
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.3.6 -> eid-mw-4.3.6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24ed6fa7f47d75595f0a7690fa94ee51
diff --git a/metadata/md5-cache/app-crypt/eid-mw-9999 b/metadata/md5-cache/app-crypt/eid-mw-9999
index da3ad5ea0d6f..5a9d0b9c72f2 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-9999
+++ b/metadata/md5-cache/app-crypt/eid-mw-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5f647d5e99a0095d76d77eb63a4c915a
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2 b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
index 22cba6b7ecd4..02f76d37d9d4 100644
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
+++ b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
@@ -4,9 +4,9 @@ DESCRIPTION=library providing a uniform interface to a large number of hash algo
 EAPI=6
 HOMEPAGE=http://mhash.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=99509c8b7508069b9554617a816086bd
+_md5_=bc2faf49663afa3cc1aeb3ade0908d9c
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r2 b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
index a4ddcd5ae646..b7de03586a46 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r2
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=5
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2220c7ef10386a8a6b8809d8b40fbd41
+_md5_=704864fab7c2ec6b3e92cef8ca743043
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r3 b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
index 72ba79f17b23..465b6af0d782 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r3
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=6
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11bfeef31dbf8b22375fa1f00329601a
+_md5_=d2ee8df2d025cf2f9e9af1588047d755
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 472d93af6229..86503ad2f319 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/aspell-af-0.50.0 b/metadata/md5-cache/app-dicts/aspell-af-0.50.0
index f5ba8316d890..d58f1cc57b84 100644
--- a/metadata/md5-cache/app-dicts/aspell-af-0.50.0
+++ b/metadata/md5-cache/app-dicts/aspell-af-0.50.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Afrikaans language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/af/aspell-af-0.50-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=85d0bfe80cab777f5d9e9c1ad8ccb3b6
+_md5_=f4b50c0597839befe9f62083b354379d
diff --git a/metadata/md5-cache/app-dicts/aspell-be-0.01-r1 b/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
index 570f1fcb58c0..a5707f0d21a8 100644
--- a/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
+++ b/metadata/md5-cache/app-dicts/aspell-be-0.01-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Belarusian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
 IUSE=classic
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/be/aspell5-be-0.01.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=9ab8c63dbe3e35460750e1b84dd20aad
+_md5_=2c79586736a8fd1c05dcb2d8c5681ff4
diff --git a/metadata/md5-cache/app-dicts/aspell-bg-4.1.0 b/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
index 3201c2e8543e..1b2223a95941 100644
--- a/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
+++ b/metadata/md5-cache/app-dicts/aspell-bg-4.1.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Bulgarian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/bg/aspell6-bg-4.1-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=488d7ecc45dd9a60ba7ee51c628421c1
+_md5_=3fa5f43b5e5a6f5bdd0643fc3db0b7fa
diff --git a/metadata/md5-cache/app-dicts/aspell-br-0.50.2 b/metadata/md5-cache/app-dicts/aspell-br-0.50.2
index ba301dc5197f..3eb61ad9d1e9 100644
--- a/metadata/md5-cache/app-dicts/aspell-br-0.50.2
+++ b/metadata/md5-cache/app-dicts/aspell-br-0.50.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Breton language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/br/aspell-br-0.50-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=7aa95ed7a2910a57c7ce52d063c45bde
+_md5_=1d8376c55114124e1346b47fcc57cb94
diff --git a/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1 b/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
index 6c20f7804334..6a176565da23 100644
--- a/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
+++ b/metadata/md5-cache/app-dicts/aspell-ca-2.1.5.1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Catalan language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=74ef6c8ebf0806c5fc5a618f7f0da4ff
+_md5_=0cc2fed31b2d7ca6fc82ab167fedba0a
diff --git a/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614 b/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614
index 63a6e75ca518..38da8f1357cf 100644
--- a/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614
+++ b/metadata/md5-cache/app-dicts/aspell-cs-0.60.20040614
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Czech language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=2826aabaeff063c0c38652ea5c355997
+_md5_=4b8ed0f74bd4cc13657fe8ad5f1d8fa4
diff --git a/metadata/md5-cache/app-dicts/aspell-cy-0.50.3 b/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
index ad0a9ffc3a64..952c99c5c02c 100644
--- a/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
+++ b/metadata/md5-cache/app-dicts/aspell-cy-0.50.3
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Welsh language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/cy/aspell-cy-0.50-3.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=be4dd2e31ea519d0372f5bd6315c632c
+_md5_=f90b37cbe5abdd969aa666fd955fd4c5
diff --git a/metadata/md5-cache/app-dicts/aspell-da-1.7.42 b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
index 635c35989628..054d84f2e3ba 100644
--- a/metadata/md5-cache/app-dicts/aspell-da-1.7.42
+++ b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Danish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://da.speling.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=http://da.speling.org/filer/new_aspell-da-1.7.42.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=417186e9d5d83851727513b95beaab76
+_md5_=2e5d599d9eb434429456b97d61bda976
diff --git a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222 b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
index 95810ec36fff..768fb5e36e9d 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
+++ b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=German and Swiss-German language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+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
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=635c9d4f12a49d1a0362410fa5462dd4
+_md5_=001310c1e656f497b74645701d1aa1f7
diff --git a/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1 b/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
index 0716448a7210..a071457bc77c 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-de-alt-2.1.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=German (traditional orthography) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/de-alt/aspell6-de-alt-2.1-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=f210e6eb86eacf9b5505e8d0929104a0
+_md5_=3f439081ba9250aa5ddb6b1f0106ddff
diff --git a/metadata/md5-cache/app-dicts/aspell-el-0.50.3 b/metadata/md5-cache/app-dicts/aspell-el-0.50.3
index b402b639de58..8d10a82c9428 100644
--- a/metadata/md5-cache/app-dicts/aspell-el-0.50.3
+++ b/metadata/md5-cache/app-dicts/aspell-el-0.50.3
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Greek language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/el/aspell-el-0.50-3.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=b965ad39a1a7dfe3de56e5781623abea
+_md5_=ff018c50793a083669f9a1541684bd90
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0 b/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
index 5d0fcfea8afd..de1794b84dc2 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2016.11.20-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8605034e681248f6d52148387a7e806a
+_md5_=8150e92e02255d33450581729171deef
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0 b/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0
index c5625885fb35..69df4cbd2b12 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2017.01.22-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c85f3b89feedd0345f67d780e6f52050
+_md5_=0007b682944de1a78a0b15f6548849f9
diff --git a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2 b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
index 1c706f789d99..556fbfe191d8 100644
--- a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
+++ b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Esperanto language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=246362f21452f7651acd246fee4d47dc
+_md5_=fbdf1d3af19a6cebe1836c82b976f73f
diff --git a/metadata/md5-cache/app-dicts/aspell-es-1.9a b/metadata/md5-cache/app-dicts/aspell-es-1.9a
index cd982ad6d02c..712b411bffe3 100644
--- a/metadata/md5-cache/app-dicts/aspell-es-1.9a
+++ b/metadata/md5-cache/app-dicts/aspell-es-1.9a
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Spanish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/es/aspell6-es-1.9a-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=fdc6861717452e33a9387dd67fe21c62
+_md5_=d7776e4484c3347c0eb3a843cca62f75
diff --git a/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1 b/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
index 37012500b1ad..4119ad7254aa 100644
--- a/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
+++ b/metadata/md5-cache/app-dicts/aspell-et-0.1.21.1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Estonian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/et/aspell6-et-0.1.21-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=8229565b5a5f48f88284c1458d0d5d35
+_md5_=931a81866652992fadf9d0cd3f305583
diff --git a/metadata/md5-cache/app-dicts/aspell-fi-0.7.0 b/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
index 563f5d20caad..4dae0f47433e 100644
--- a/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
+++ b/metadata/md5-cache/app-dicts/aspell-fi-0.7.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Finnish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/fi/aspell6-fi-0.7-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=4783b571078220d0370ceb1725a55fc3
+_md5_=a7e5e585110453364c0ebeca0f340f35
diff --git a/metadata/md5-cache/app-dicts/aspell-fo-0.51.0 b/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
index 4f2a7b6c99b4..cbcdd46ef245 100644
--- a/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-fo-0.51.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Faroese language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/fo/aspell-fo-0.51-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=11b43846a57377cd2cb8f74a76de7dea
+_md5_=ebece09b775e4bc137d1849fa0c13a4a
diff --git a/metadata/md5-cache/app-dicts/aspell-fr-0.60 b/metadata/md5-cache/app-dicts/aspell-fr-0.60
index 2bfd9cb5f303..65d5f51adc55 100644
--- a/metadata/md5-cache/app-dicts/aspell-fr-0.60
+++ b/metadata/md5-cache/app-dicts/aspell-fr-0.60
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=French language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=4d3fe589c5754bfbe040dbde2ede0077
+_md5_=c8eff0733f54f86ab50a4634f5b883fa
diff --git a/metadata/md5-cache/app-dicts/aspell-ga-0.50.4 b/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
index 8bdc039e8d98..a5db8b377fe0 100644
--- a/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
+++ b/metadata/md5-cache/app-dicts/aspell-ga-0.50.4
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Irish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ga/aspell-ga-0.50-4.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=f56b3c65a7c4d4fffa6fa0da40839736
+_md5_=48bc1b2ca2d14717324347a19f77e10e
diff --git a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2 b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
index 302836c5031b..7e133a769b4c 100644
--- a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
+++ b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Galician language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/gl/aspell6-gl-0.5a-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=40a99d7e66ca3710b78669feb536287c
+_md5_=cd03e0080516dfce4178a3b6c65e3fc3
diff --git a/metadata/md5-cache/app-dicts/aspell-he-1.0.0 b/metadata/md5-cache/app-dicts/aspell-he-1.0.0
index f3171797aa4d..2f9332a678e3 100644
--- a/metadata/md5-cache/app-dicts/aspell-he-1.0.0
+++ b/metadata/md5-cache/app-dicts/aspell-he-1.0.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Hebrew language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/he/aspell6-he-1.0-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=bb4a3390e16a8ac319f642c0780d171e
+_md5_=82a80924ffc4193e70323db0151225a4
diff --git a/metadata/md5-cache/app-dicts/aspell-hr-0.51.0 b/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
index 2863b9d37649..f089e3de84f1 100644
--- a/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-hr-0.51.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Croatian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hr/aspell-hr-0.51-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=e5d8f50110dad511374261c137b6e8fc
+_md5_=e16e9dc2def41612d17bb601d892139e
diff --git a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2 b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
index 310496fc1f99..2e3811a6b201 100644
--- a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
+++ b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Hungarian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=65d1e39c65f05e5f1d892cd811834549
+_md5_=77cceb228ef0897ba7e22d60f1b5848c
diff --git a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0 b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
index df3bc3a713b0..27d0c4dc0c0b 100644
--- a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
+++ b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Armenian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=16a2d6502701f8b1abaafe4f7d287099
+_md5_=5e0c1cff544764a8a47f1e6943fd51c1
diff --git a/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0 b/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0
index c8cbe1a4994e..3af8a8295793 100644
--- a/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0
+++ b/metadata/md5-cache/app-dicts/aspell-is-0.51.1.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Icelandic language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/is/aspell-is-0.51.1-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=f1fded12821446d3f71afc2fe7be7e90
+_md5_=8e6aaec30b5b9eff8a45208e7bffb131
diff --git a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901 b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901
index a061ceb68176..6ec1be213072 100644
--- a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901
+++ b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Italian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://sourceforge/linguistico/aspell6-it-2.4-20070901-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=e28a0e313e02c3b75c62bae646bc41b9
+_md5_=15a8251f0a8d32e6b384382fcd77e3c6
diff --git a/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0 b/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0
index a995a6510e76..c98a5f497f11 100644
--- a/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0
+++ b/metadata/md5-cache/app-dicts/aspell-la-6.0.20020503.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Latin language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=cc2b288a1641cdf3be8638208f2a3606
+_md5_=e27036be8f4648386ed645c56cd3f64a
diff --git a/metadata/md5-cache/app-dicts/aspell-lt-1.0.1 b/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
index 28e619cb526f..60a703a8d281 100644
--- a/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
+++ b/metadata/md5-cache/app-dicts/aspell-lt-1.0.1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Lithuanian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/lt/aspell6-lt-1.0-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=8681a66f6dd694db6db74947cae36ec5
+_md5_=79556e3ee929bdc989f70a2b3c72521d
diff --git a/metadata/md5-cache/app-dicts/aspell-nl-0.50.2 b/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
index a53c339bd524..a13bb7b9d65a 100644
--- a/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
+++ b/metadata/md5-cache/app-dicts/aspell-nl-0.50.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Dutch language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=freedist
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=dcb2b4839337f4765cf90d8cff55fa55
+_md5_=b414b48b0e8fdb0cf3d46a37ff9a055f
diff --git a/metadata/md5-cache/app-dicts/aspell-no-0.50.2 b/metadata/md5-cache/app-dicts/aspell-no-0.50.2
index f29079307fce..04915eddfd8d 100644
--- a/metadata/md5-cache/app-dicts/aspell-no-0.50.2
+++ b/metadata/md5-cache/app-dicts/aspell-no-0.50.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Norwegian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/no/aspell-no-0.50-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=8e6bccae412b3739a26717797e45e51a
+_md5_=2305be1275cf78b04327c446fb848994
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
index 8525e453961f..6e0901bbbd36 100644
--- a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
+++ b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20120418.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Polish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://www.sjp.pl/slownik/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=http://www.sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20120418-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=38028088af8c4e13b3041514c6efe1ba
+_md5_=2d6bced39d16e4d0262536fd8c74d208
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1 b/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
index f1771b349bad..c545d4453eb9 100644
--- a/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
+++ b/metadata/md5-cache/app-dicts/aspell-pt-0.50.2-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Portuguese language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/pt/aspell-pt-0.50-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=59127a85567f9bf77befae1dee3188a9
+_md5_=b7b58305c75f169be146a2f9e847dae2
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702 b/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702
index 7887faa3d9d5..4b893f0c5bdf 100644
--- a/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702
+++ b/metadata/md5-cache/app-dicts/aspell-pt-br-6.0.20090702
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Brazilian Portuguese language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=!<app-dicts/aspell-pt-0.50.2-r1 >=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=a79e88c7db22081280a45ac244f7d871
+_md5_=3d7027ab32a885f70de048fcdd3bab69
diff --git a/metadata/md5-cache/app-dicts/aspell-ro-3.3.2 b/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
index 3c379cc09b83..a14a8e330a73 100644
--- a/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
+++ b/metadata/md5-cache/app-dicts/aspell-ro-3.3.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Romanian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net http://rospell.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=8065bbd402c6a668af6d22741fa7d968
+_md5_=1a76ade001b764c934100175e5148385
diff --git a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1 b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
index 67eb2cddbd34..f65146368a19 100644
--- a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Russian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=629483af2c9cbcfaab2e8d0a81cf404f
+_md5_=5c8bf455d3e430399d3b58cf34c4590b
diff --git a/metadata/md5-cache/app-dicts/aspell-sk-2.01.2 b/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
index 463b783a8104..a403a5376e64 100644
--- a/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
+++ b/metadata/md5-cache/app-dicts/aspell-sk-2.01.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Slovak language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=fe8b7d32e304060e96c7740e3fa40251
+_md5_=c0f83ebecc069ba29edf4a6f70404277
diff --git a/metadata/md5-cache/app-dicts/aspell-sl-0.50.0 b/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
index 58d8d28cc522..c49c33f6ec82 100644
--- a/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
+++ b/metadata/md5-cache/app-dicts/aspell-sl-0.50.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Slovenian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sl/aspell-sl-0.50-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=6223e11ff57f0135fd5aa3714d2f3381
+_md5_=d95cb3aa61957a73670cd2f827bfd7c8
diff --git a/metadata/md5-cache/app-dicts/aspell-sr-0.60 b/metadata/md5-cache/app-dicts/aspell-sr-0.60
index a2028ffa2a3b..80f3ce107211 100644
--- a/metadata/md5-cache/app-dicts/aspell-sr-0.60
+++ b/metadata/md5-cache/app-dicts/aspell-sr-0.60
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Serbian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=http://srpski.org/aspell/aspell6-sr-0.02.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=bab2f0a2593e122801111618e8bcc0c8
+_md5_=90887e1e5474baf8bdf61abe5a75f6ea
diff --git a/metadata/md5-cache/app-dicts/aspell-sv-0.51.0 b/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
index 808ce5a49789..5e35b5d7ab46 100644
--- a/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
+++ b/metadata/md5-cache/app-dicts/aspell-sv-0.51.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Swedish language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=82df7debab28a97537f8a32942528ede
+_md5_=820a4487b3fb0c3369c1fbd573034a7e
diff --git a/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0 b/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
index 0906a6547fa5..718fd63b5205 100644
--- a/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
+++ b/metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Ukrainian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=54339b164fb06e32fa6483378ac4586f
+_md5_=951340569bf49c2fd2655a368c32447e
diff --git a/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1 b/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
index ef5b7864b13c..1118173a0b97 100644
--- a/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
+++ b/metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Vietnamese language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/vi/aspell6-vi-0.01.1-1.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=0dcb1ae5a92d37dab53b8cfdf17fe254
+_md5_=fa716ab7d8ffc3c36ccbbb77701d3ded
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9ef83438bd36..ee68a2efc5cc 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/zsh-lovers-0.9.0 b/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
index 535470f2e716..4467b7d24267 100644
--- a/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
+++ b/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
@@ -3,8 +3,8 @@ DEPEND=app-text/asciidoc
 DESCRIPTION=Tips, tricks and examples for the Z shell
 EAPI=5
 HOMEPAGE=http://grml.org/zsh/zsh-lovers.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://deb.grml.org/pool/main/z/zsh-lovers/zsh-lovers_0.9.0.tar.gz
-_md5_=e88675c2f5f3f6912ce685c8c6eb49fa
+_md5_=42fc01143794e399824d16766bce1a70
diff --git a/metadata/md5-cache/app-doc/zsh-lovers-0.9.1 b/metadata/md5-cache/app-doc/zsh-lovers-0.9.1
index fd0dcab701ee..4731b161b75f 100644
--- a/metadata/md5-cache/app-doc/zsh-lovers-0.9.1
+++ b/metadata/md5-cache/app-doc/zsh-lovers-0.9.1
@@ -3,8 +3,8 @@ DEPEND=app-text/asciidoc
 DESCRIPTION=Tips, tricks and examples for the Z shell
 EAPI=6
 HOMEPAGE=https://grml.org/zsh/zsh-lovers.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://deb.grml.org/pool/main/z/zsh-lovers/zsh-lovers_0.9.1.tar.xz
-_md5_=e7d5163fd32193379652171d006c17bf
+_md5_=eb4fb58b625e11a36cc5c955df27984d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b274034f2081..b855108217b2 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/atom-1.22.1 b/metadata/md5-cache/app-editors/atom-1.22.1
deleted file mode 100644
index 5cbbbed8d813..000000000000
--- a/metadata/md5-cache/app-editors/atom-1.22.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A hackable text editor for the 21st Century
-EAPI=6
-HOMEPAGE=https://atom.io
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/atom/atom/releases/download/v1.22.1/atom.x86_64.rpm -> atom-bin-1.22.1.rpm https://github.com/atom/atom/archive/v1.22.1.tar.gz -> atom-1.22.1.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.0.5.tgz -> atomdep-keytar-4.0.5.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.3.tgz -> atomdep-spellchecker-3.4.3.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.13.tgz -> atomdep-superstring-2.2.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c5b35b85eefec4200e699246462981d
diff --git a/metadata/md5-cache/app-editors/atom-1.23.0_beta1 b/metadata/md5-cache/app-editors/atom-1.23.0_beta1
deleted file mode 100644
index 7455f0f1853e..000000000000
--- a/metadata/md5-cache/app-editors/atom-1.23.0_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A hackable text editor for the 21st Century
-EAPI=6
-HOMEPAGE=https://atom.io
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
-REQUIRED_USE=python_targets_python2_7
-SLOT=beta
-SRC_URI=https://github.com/atom/atom/releases/download/v1.23.0-beta1/atom.x86_64.rpm -> atom-bin-1.23.0-beta1.rpm https://github.com/atom/atom/archive/v1.23.0-beta1.tar.gz -> atom-1.23.0-beta1.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.0.5.tgz -> atomdep-keytar-4.0.5.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.13.tgz -> atomdep-superstring-2.2.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf4a2417baaf935c389cbedabc576ac3
diff --git a/metadata/md5-cache/app-editors/atom-1.23.3 b/metadata/md5-cache/app-editors/atom-1.23.3
new file mode 100644
index 000000000000..90b94d7ed89b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/atom-1.23.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A hackable text editor for the 21st Century
+EAPI=6
+HOMEPAGE=https://atom.io
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/atom/atom/releases/download/v1.23.3/atom.x86_64.rpm -> atom-bin-1.23.3.rpm https://github.com/atom/atom/archive/v1.23.3.tar.gz -> atom-1.23.3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ac6e9d77886ab62054a3255beecae63
diff --git a/metadata/md5-cache/app-editors/atom-1.24.0_beta3 b/metadata/md5-cache/app-editors/atom-1.24.0_beta3
new file mode 100644
index 000000000000..9b8fdbcf5ddb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/atom-1.24.0_beta3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A hackable text editor for the 21st Century
+EAPI=6
+HOMEPAGE=https://atom.io
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
+REQUIRED_USE=python_targets_python2_7
+SLOT=beta
+SRC_URI=https://github.com/atom/atom/releases/download/v1.24.0-beta3/atom.x86_64.rpm -> atom-bin-1.24.0-beta3.rpm https://github.com/atom/atom/archive/v1.24.0-beta3.tar.gz -> atom-1.24.0-beta3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=757958fa0c17df06e67bf9b1d7ab0c43
diff --git a/metadata/md5-cache/app-editors/emacs-25.3 b/metadata/md5-cache/app-editors/emacs-25.3
index 79244563dd59..a1c9d141b99a 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3
+++ b/metadata/md5-cache/app-editors/emacs-25.3
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.3
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e2a1fb04713d065d6966641ed50837f
+_md5_=2dc2f9306bff5361ee397ba9f32d2606
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.0.91 b/metadata/md5-cache/app-editors/emacs-vcs-26.0.91
new file mode 100644
index 000000000000..45bd70fb1797
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.0.91
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-26.0.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-26.0.91.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9eed64f667322a533b23322d7b5ee897
diff --git a/metadata/md5-cache/app-editors/mg-20161005 b/metadata/md5-cache/app-editors/mg-20161005
deleted file mode 100644
index 2d4d337cb8f0..000000000000
--- a/metadata/md5-cache/app-editors/mg-20161005
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
-DESCRIPTION=MicroGnuEmacs, a port from the BSDs
-EAPI=6
-HOMEPAGE=http://homepage.boetes.org/software/mg/
-IUSE=livecd
-KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
-SLOT=0
-SRC_URI=http://homepage.boetes.org/software/mg/mg-20161005.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bc0aa4df0b90e6d20d0e49b8e9c062a
diff --git a/metadata/md5-cache/app-editors/mg-20170401 b/metadata/md5-cache/app-editors/mg-20170401
deleted file mode 100644
index 4d51042c7f19..000000000000
--- a/metadata/md5-cache/app-editors/mg-20170401
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
-DESCRIPTION=MicroGnuEmacs, a port from the BSDs
-EAPI=6
-HOMEPAGE=http://homepage.boetes.org/software/mg/
-IUSE=livecd
-KEYWORDS=alpha ~amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
-SLOT=0
-SRC_URI=http://homepage.boetes.org/software/mg/mg-20170401.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e33d2ff0d00736af7b96323982be4f1f
diff --git a/metadata/md5-cache/app-editors/mg-20170828 b/metadata/md5-cache/app-editors/mg-20170828
index 0b0f961c4d21..cab1692555fb 100644
--- a/metadata/md5-cache/app-editors/mg-20170828
+++ b/metadata/md5-cache/app-editors/mg-20170828
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=6
 HOMEPAGE=http://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=alpha amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=http://homepage.boetes.org/software/mg/mg-20170828.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a53800e9372cc40169d1980cda186457
+_md5_=c563989a1597996c251e129f2ecc13cb
diff --git a/metadata/md5-cache/app-editors/nano-2.7.5 b/metadata/md5-cache/app-editors/nano-2.7.5
index 7311f7636cac..9a4b8cfba300 100644
--- a/metadata/md5-cache/app-editors/nano-2.7.5
+++ b/metadata/md5-cache/app-editors/nano-2.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=5
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.7/nano-2.7.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4fc064094d293e2acc8e7ad39a349dcd
+_md5_=0ed71cad7a957ecfb224f562e57e15b2
diff --git a/metadata/md5-cache/app-editors/nano-2.8.7 b/metadata/md5-cache/app-editors/nano-2.8.7
index 199e98dd8ed6..df7a64401cd5 100644
--- a/metadata/md5-cache/app-editors/nano-2.8.7
+++ b/metadata/md5-cache/app-editors/nano-2.8.7
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=6
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.8/nano-2.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=903bbe91e6bb6a5cbb76ee1dcace7703
+_md5_=3625a34ddfa46225c0762b4c495e4a87
diff --git a/metadata/md5-cache/app-editors/nano-2.9.1 b/metadata/md5-cache/app-editors/nano-2.9.1
index 1203926ab5dd..6dbbb4991174 100644
--- a/metadata/md5-cache/app-editors/nano-2.9.1
+++ b/metadata/md5-cache/app-editors/nano-2.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=6
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=434631e1e6cfea5fedfb74ee98d00f42
+_md5_=e59a972d012fbd1887402e7acbd6abda
diff --git a/metadata/md5-cache/app-editors/nano-2.9.2 b/metadata/md5-cache/app-editors/nano-2.9.2
index 165c3eab8e98..7a8023bd4e80 100644
--- a/metadata/md5-cache/app-editors/nano-2.9.2
+++ b/metadata/md5-cache/app-editors/nano-2.9.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=6
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5314eaeef62f94bfd07cd4256b448390
+_md5_=e59a972d012fbd1887402e7acbd6abda
diff --git a/metadata/md5-cache/app-editors/nano-9999 b/metadata/md5-cache/app-editors/nano-9999
index 57197fb95581..faf882139d04 100644
--- a/metadata/md5-cache/app-editors/nano-9999
+++ b/metadata/md5-cache/app-editors/nano-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ddf1451a84bb546d8fb27875fade4d62
+_md5_=913bd447e5598f78fa69264459dec295
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.9.2 b/metadata/md5-cache/app-editors/qxmledit-0.9.9.2
new file mode 100644
index 000000000000..c25b6f9556f9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.9.2-src.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1fa00380103498f1c5fd8407397e31c
diff --git a/metadata/md5-cache/app-editors/vim-8.0.0386 b/metadata/md5-cache/app-editors/vim-8.0.0386
index a39a6053a48d..bc4d70b8de83 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.0386
+++ b/metadata/md5-cache/app-editors/vim-8.0.0386
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) 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(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=0c403bc83cbbdba30f2e9def21b6b832
+_md5_=4bd571c8383dc47599832316e13d0fde
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1188 b/metadata/md5-cache/app-editors/vim-8.0.1188
index 71653cf6749b..eb52d4b74a8e 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.1188
+++ b/metadata/md5-cache/app-editors/vim-8.0.1188
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1188 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_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_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(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=20163048fc9ba4a4a01f686d7810fefa
+_md5_=0fa9515434cb324136229e0e2ab0ad3d
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1298 b/metadata/md5-cache/app-editors/vim-8.0.1298
index d0bfd7e939ba..f79bb16c134c 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.1298
+++ b/metadata/md5-cache/app-editors/vim-8.0.1298
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_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_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(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=152d8d6c4b5f7274734bca5f2ae5f943
+_md5_=2afcc699e72f86677a269536045c23eb
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1428 b/metadata/md5-cache/app-editors/vim-8.0.1428
index b7d57450e9b7..c3b40266e84a 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.1428
+++ b/metadata/md5-cache/app-editors/vim-8.0.1428
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1428 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_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_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(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=20163048fc9ba4a4a01f686d7810fefa
+_md5_=0fa9515434cb324136229e0e2ab0ad3d
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index fcd217e2ba52..95e584331fd0 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -9,4 +9,4 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=20163048fc9ba4a4a01f686d7810fefa
+_md5_=0fa9515434cb324136229e0e2ab0ad3d
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0386 b/metadata/md5-cache/app-editors/vim-core-8.0.0386
index b51d3692d1ad..2bafa0af45db 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0386
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.0386
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=90b1c059ff9f99f2e2c6c99bddf9dafd
+_md5_=5482d0b41f5c12656c160e59da9219e3
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1188 b/metadata/md5-cache/app-editors/vim-core-8.0.1188
index bb3ea4e022eb..51a620faa513 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1188
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1188
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=5e1e501f5020251ce1372135de1c4bb5
+_md5_=270757509200029d6bc809620769bf83
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1298 b/metadata/md5-cache/app-editors/vim-core-8.0.1298
index 99089d7495a3..5f82313f84db 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1298
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1298
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=de655b7c22966a439c608e90154576ca
+_md5_=55f98e51e7bcdfa346436abbdbbb60ce
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1428 b/metadata/md5-cache/app-editors/vim-core-8.0.1428
index 435694a5046d..049cc9ca94bf 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1428
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1428
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=5e1e501f5020251ce1372135de1c4bb5
+_md5_=270757509200029d6bc809620769bf83
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 3b7d9cf767cf..26b90c502737 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -8,4 +8,4 @@ LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=5e1e501f5020251ce1372135de1c4bb5
+_md5_=270757509200029d6bc809620769bf83
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e585ef3067a1..2a68aa61607b 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/ruby-mode-2.3.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
index dee1415dd9c1..308c4be5c214 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major mode for editing Ruby code
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.3.0.tar.xz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=30fc3e24daf59aea1224c81487e6ee30
+_md5_=2fd8c7089f80ff93d3e1473a83023fee
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 498049cf868a..bce9bd1e9b99 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/cadvisor-0.28.2 b/metadata/md5-cache/app-emulation/cadvisor-0.28.2
deleted file mode 100644
index 8dd668888063..000000000000
--- a/metadata/md5-cache/app-emulation/cadvisor-0.28.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
-EAPI=6
-HOMEPAGE=https://github.com/google/cadvisor
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/google/cadvisor/archive/v0.28.2.tar.gz -> cadvisor-0.28.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=de1fcdbe75d1618941d288c83e4fb54b
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.28.3 b/metadata/md5-cache/app-emulation/cadvisor-0.28.3
deleted file mode 100644
index 7ada33e840ea..000000000000
--- a/metadata/md5-cache/app-emulation/cadvisor-0.28.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
-EAPI=6
-HOMEPAGE=https://github.com/google/cadvisor
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/google/cadvisor/archive/v0.28.3.tar.gz -> cadvisor-0.28.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6c8929be38e96f179aa7164260c70d9d
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1 b/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
new file mode 100644
index 000000000000..0e5341e241c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
+EAPI=6
+HOMEPAGE=https://github.com/google/cadvisor
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/google/cadvisor/archive/v0.28.3.tar.gz -> cadvisor-0.28.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=cabc577a715d0df1064cd9bf5206f1f6
diff --git a/metadata/md5-cache/app-emulation/docker-17.12.0-r1 b/metadata/md5-cache/app-emulation/docker-17.12.0-r1
deleted file mode 100644
index fa5026b99229..000000000000
--- a/metadata/md5-cache/app-emulation/docker-17.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 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.0 ~app-emulation/docker-runc-1.0.0_rc4_p20171108[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.0-ce.tar.gz -> docker-17.12.0-r1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7e755c3527d606b1fdaa494ea953f36e
diff --git a/metadata/md5-cache/app-emulation/kompose-1.6.0 b/metadata/md5-cache/app-emulation/kompose-1.6.0
deleted file mode 100644
index 463af1c3e956..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.6.0.tar.gz -> kompose-1.6.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=0fe6cdcb8ec056f1cd56bc0a81531163
diff --git a/metadata/md5-cache/app-emulation/kompose-1.8.0 b/metadata/md5-cache/app-emulation/kompose-1.8.0
new file mode 100644
index 000000000000..5d487788d97c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/kompose-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Tool to move from docker-compose to Kubernetes
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kompose/archive/v1.8.0.tar.gz -> kompose-1.8.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=5cfc5575841f42d37e47264980c2e568
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.30 b/metadata/md5-cache/app-emulation/virtualbox-5.1.30
deleted file mode 100644
index 6532dd914a8d..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.30/VirtualBox-5.1.30.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41e570f8b0c893aafc7defeaedd7746b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-5.1.32
index 9d74e595e3c0..e1edbf432046 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.32
@@ -4,11 +4,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7544d1e62c4a61e2b7b8a96b37b3b60c
+_md5_=9d788423497e457a01914b00d6fed481
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.4 b/metadata/md5-cache/app-emulation/virtualbox-5.2.4
deleted file mode 100644
index f1b44c882f26..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.2.4/VirtualBox-5.2.4.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.0-patches-01.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d7c850fc0cb6046ebe2bbdcd57e6fd5d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.30 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.30
deleted file mode 100644
index c8b53ac0f3a7..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.30/VBoxGuestAdditions_5.1.30.iso
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=67b4422105f55f4b42f6765161de6025
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
index 89acad1338e3..cf1ee2a29c7c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VBoxGuestAdditions_5.1.32.iso
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=03f4c3b8cf1d5b6728ba382b65e98a8e
+_md5_=22c051e04d61f4ef11068257ba6096a1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.4 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.4
deleted file mode 100644
index 7657fe62ec87..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.2.4/VBoxGuestAdditions_5.2.4.iso
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e59213a487efc1038778b93cf66aa0f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.30.118389 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.30.118389
deleted file mode 100644
index 43c6b1ffd9e2..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.30.118389
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.30 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.1.30/VirtualBox-5.1.30-118389-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.1.30/VirtualBox-5.1.30-118389-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.1.30/Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.1.30/VirtualBoxSDK-5.1.30-118389.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6e54cee5dc0becdf68b5a41f98306f3
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
index 7df037a2b8ad..d988c844113e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
@@ -4,7 +4,7 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=5
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 PUEL
 RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.32 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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 )
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32-120294-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32-120294-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.32/Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.32/VirtualBoxSDK-5.1.32-120294.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc96d84cdc85a8b6219013877c94dad3
+_md5_=9a942423a24a9fd415df35c2da4a5530
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.4.119785 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.4.119785
deleted file mode 100644
index 6c95d8deea28..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.4.119785
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.4 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.2.4/VirtualBox-5.2.4-119785-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.2.4/VirtualBox-5.2.4-119785-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.2.4/Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.2.4/VirtualBoxSDK-5.2.4-119785.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=53fc9f5c029107c40f215d1e8d16357d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.30.118389 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.30.118389
deleted file mode 100644
index 167d83da6000..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.30.118389
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.30
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.30/Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=60d24a07a5cbf8316bccbb188efa1c4d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
index 2db49f18fba5..d7ef25987227 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PUEL
 RDEPEND=~app-emulation/virtualbox-5.1.32
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=535e3644a27cc1070b65092cc0d06a9e
+_md5_=56ac2b741b877335842940f5d0b0f2cc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.4.119785 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.4.119785
deleted file mode 100644
index 64e96591e439..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.4.119785
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.2.4
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.2.4/Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=39a814cbf6e7b4c0941e1122b7ef37ba
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.30 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.30
deleted file mode 100644
index 4aabadb157e6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.30 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.30/VirtualBox-5.1.30.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=187757fed0b3746cfe9bdd523cf0ab69
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
index 52dc50934fea..e1079e34f87d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
@@ -4,11 +4,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.32 )
 RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9d8e2f73df5c1e8b118d0c2b4fd83cbe
+_md5_=382385e761fe6635c54b60e39aaeddc8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.4 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.4
deleted file mode 100644
index d4b2934f70b2..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.2.4/VirtualBox-5.2.4.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=32919d3b3e06554bab421bd04b2a0410
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.30 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.30
deleted file mode 100644
index 2d92f53eef37..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.30.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6f688c2f4549eea2c3e5326cf569dec3
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32
index ad1151fb4ebf..0fed080dd528 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.32
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=6
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.32.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=79d9a9eaf16c1c2ae0efa37e3d83c33b
+_md5_=cf513b46d3449c4c2afe30ce17957560
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.4 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.4
deleted file mode 100644
index 302e38f78cf8..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2914f12c6bbc5a1f6b0529f4b163f1b8
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.0-r1 b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
index 553e2c67a385..5a30ce02c8cb 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.0
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf1629bb25031e090d19c4ab58137ecb
+_md5_=77fdf0fe05354f4a01b9257b276b0ac4
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.19 b/metadata/md5-cache/app-emulation/wine-any-2.19
index ae07ac187c52..a518c47e2035 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.19
+++ b/metadata/md5-cache/app-emulation/wine-any-2.19
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.19
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6aa25c976897dcfe13639e1e586d60c5
+_md5_=e3b902501b413bc4eede65dae9fdd844
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.20 b/metadata/md5-cache/app-emulation/wine-any-2.20
index b6012530e7f8..5b612a578120 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.20
+++ b/metadata/md5-cache/app-emulation/wine-any-2.20
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.20
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c78d0b43b0009ee9071cdc17d4c439b
+_md5_=8e20fd72563481c1bcd730c17eacba12
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.21 b/metadata/md5-cache/app-emulation/wine-any-2.21
index 2c1c275d54f5..b5a5913e856e 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.21
+++ b/metadata/md5-cache/app-emulation/wine-any-2.21
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.21
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c78d0b43b0009ee9071cdc17d4c439b
+_md5_=8e20fd72563481c1bcd730c17eacba12
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index 65c0061468a7..580c640332bc 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -9,6 +9,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c78d0b43b0009ee9071cdc17d4c439b
+_md5_=8e20fd72563481c1bcd730c17eacba12
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
index a7a4dd22616e..ad15baf1cea3 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aad8c297b9496bf50900925130a7251d
+_md5_=b935cc7debe43018940b624ba525d809
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.19 b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
index def3e4d1b308..9505c29a1fb3 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.19
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.19
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06b2bbe90787210e5447b360d8cedc95
+_md5_=3a4994ece3a10a2ffb3b2ee626a84fe3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.20 b/metadata/md5-cache/app-emulation/wine-d3d9-2.20
index 96965f0ec411..8f88345f3022 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.20
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.20
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.20
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=891e3ec6f8fb3db3e435c04823aa3fab
+_md5_=f99175b65a465fd0d8883abd2d6824e3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.21 b/metadata/md5-cache/app-emulation/wine-d3d9-2.21
index e9c89a5c3d23..d60595eaa67c 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.21
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.21
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.21
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=891e3ec6f8fb3db3e435c04823aa3fab
+_md5_=f99175b65a465fd0d8883abd2d6824e3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index bc8f34b875a9..73176b963a30 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -9,6 +9,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=891e3ec6f8fb3db3e435c04823aa3fab
+_md5_=f99175b65a465fd0d8883abd2d6824e3
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1 b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
index 831370b0b2ac..8d826a765c4c 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.0
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=932d6f66ab429884f881fa0581f0f58c
+_md5_=4c2871f818649487b16c397647e84e9b
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.19 b/metadata/md5-cache/app-emulation/wine-staging-2.19
index 2dfea8217818..f6a24c90d28d 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.19
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.19
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.19
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ca62466e09d7341ecf68c0d1ad0bb94
+_md5_=8365d5a0ff61aa28b75d031f7ed67ce4
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.20 b/metadata/md5-cache/app-emulation/wine-staging-2.20
index 7ea3d985438b..00856b9cddef 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.20
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.20
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.20
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fedb0efa0b98cf523701605366b4de97
+_md5_=44f0518e62e6c6964c0a0a20a819f367
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.21 b/metadata/md5-cache/app-emulation/wine-staging-2.21
index af67558130a9..9d9100d18bee 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.21
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.21
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=2.21
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz )
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fedb0efa0b98cf523701605366b4de97
+_md5_=44f0518e62e6c6964c0a0a20a819f367
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 9e60bc0631f9..0fd65f534e72 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -9,6 +9,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fedb0efa0b98cf523701605366b4de97
+_md5_=44f0518e62e6c6964c0a0a20a819f367
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
index bdc2701ce07f..cd0d1f375834 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c422adf688cb18ad8fac2319a3483104
+_md5_=434f7f27edff1f27cf1056cd244eb530
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
index a4ee72b23eab..919a58c1131b 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0.1
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd672924d816d00c4ba5cdd1d992f6bd
+_md5_=939ee08bf891fcd8dd993544d174868b
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
index 394f964ce331..a479ae1d1af8 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0.2
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd672924d816d00c4ba5cdd1d992f6bd
+_md5_=939ee08bf891fcd8dd993544d174868b
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
index 4f00ea1581e0..f9c4a4edb468 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0.3
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89f539e6f5f12fd822400b1c01ef2820
+_md5_=bd6d48b25db57eecf2b66428fc9e3902
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
index 093c92ca311e..5314f85eaecb 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.0.4
-SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.4.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.4.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f4c866aaf7e1338871f2a133e5ecccb
+_md5_=74a4f43d255c0183547cd2a1aa38bcbe
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.20 b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
index 31119ccdd598..b71b9dd67db0 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.20
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.20
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f761692976831906832903d9c2827ae2
+_md5_=9ec4a2398d9eed7bb0cd3ce1712386a3
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.21 b/metadata/md5-cache/app-emulation/wine-vanilla-2.21
index 3bd41467d259..9aaa882ac495 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.21
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.21
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.21
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f761692976831906832903d9c2827ae2
+_md5_=9ec4a2398d9eed7bb0cd3ce1712386a3
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.22 b/metadata/md5-cache/app-emulation/wine-vanilla-2.22
index 307c47d7fe42..74fc3d0b0f69 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.22
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.22
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=2.22
-SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f761692976831906832903d9c2827ae2
+_md5_=9ec4a2398d9eed7bb0cd3ce1712386a3
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.0 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0
index 51918f54b3f4..dc4f64a73b6c 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=3.0
-SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33f8e41641f3753ca865025dedb16d2b
+_md5_=06b146cbc8f466410722804d61ed9bc8
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 9a7e22719285..d71e2984ae22 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -9,6 +9,6 @@ RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180119.tar.xz
+SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f761692976831906832903d9c2827ae2
+_md5_=9ec4a2398d9eed7bb0cd3ce1712386a3
diff --git a/metadata/md5-cache/app-emulation/winetricks-20170823 b/metadata/md5-cache/app-emulation/winetricks-20170823
index 95faf92b1724..244671be6bee 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20170823
+++ b/metadata/md5-cache/app-emulation/winetricks-20170823
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetr
 IUSE=gtk kde rar
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget x11-misc/xdg-utils virtual/wine gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20170823.tar.gz -> winetricks-20170823.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b204f75e9420aa08314c14f95129fc9f
+_md5_=9a4cbca419ef1676ecd370dc4a5557e6
diff --git a/metadata/md5-cache/app-emulation/winetricks-20171222 b/metadata/md5-cache/app-emulation/winetricks-20171222
new file mode 100644
index 000000000000..4a22530cd49d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/winetricks-20171222
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst test unpack
+DEPEND=test? ( dev-python/bashate dev-util/checkbashisms dev-util/shellcheck ) >=sys-apps/sed-4
+DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
+EAPI=6
+HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
+IUSE=gtk kde rar test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+SLOT=0
+SRC_URI=https://github.com/Winetricks/winetricks/archive/20171222.tar.gz -> winetricks-20171222.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/winetricks-99999999 b/metadata/md5-cache/app-emulation/winetricks-99999999
index 138dcdd8dd01..d55ca4e420ef 100644
--- a/metadata/md5-cache/app-emulation/winetricks-99999999
+++ b/metadata/md5-cache/app-emulation/winetricks-99999999
@@ -1,13 +1,12 @@
-DEFINED_PHASES=install postinst postrm preinst unpack
-DEPEND=>=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=install postinst postrm preinst test unpack
+DEPEND=test? ( dev-python/bashate dev-util/checkbashisms dev-util/shellcheck ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
 EAPI=6
 HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
-IUSE=gtk kde rar
+IUSE=gtk kde rar test
 LICENSE=LGPL-2.1+
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget x11-misc/xdg-utils virtual/wine gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
-RESTRICT=test
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfd3df310459da1b81e1ed47bec86029
+_md5_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index f27dfabbe2ac..b9b369baba56 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-cdparanoia-0.1 b/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
index 014e6f17a2ae..892f6ecc9679 100644
--- a/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
@@ -3,8 +3,8 @@ DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10
 DESCRIPTION=Manage /usr/bin/cdparanoia symlink
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
 SLOT=0
-_md5_=da787d4a3828bbc8d1b3979b99e7ac89
+_md5_=8607cf06b18c20c2a49944610e85788d
diff --git a/metadata/md5-cache/app-eselect/eselect-electron-2.1 b/metadata/md5-cache/app-eselect/eselect-electron-2.1
index 8a81c189aae1..633e3d8b6dbb 100644
--- a/metadata/md5-cache/app-eselect/eselect-electron-2.1
+++ b/metadata/md5-cache/app-eselect/eselect-electron-2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default Electron slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/elprans/eselect-electron/archive/v2.1.tar.gz -> eselect-electron-2.1.tar.gz
-_md5_=0421155168c745f73ffe2f18b8648afd
+_md5_=a6b09cbbd6c00702845431d5d49f6b9f
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.0 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.0
index 91d6c2e88774..de8519ab8d2a 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.0
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=0
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect >=media-libs/fontconfig-2.4
 SLOT=0
-_md5_=b83d78f797c74b0b65f526b25b70a6e4
+_md5_=1e5063a345ac237d621bf54e84aa0bce
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1
index 3462a1c3dcf7..7d160033e933 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=0
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~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=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
 SLOT=0
 SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=6ec05fb4e007f98c1589dea35170ba30
+_md5_=fde3892444628680241aac0d87eafdd0
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
index 6c36c7efb99b..9032095c5249 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=5
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
 SLOT=0
 SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=0299d30b6efee55e77b2e07eee5acef8
+_md5_=5c6a2ed6a50b7aca8bec0945497cc9ef
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1 b/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1
index 85f5cf03be85..73fa1328ee97 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-1.2.1.tbz2
-_md5_=7d7fd2e805088ba7667033a8f4a047d4
+_md5_=4c51fbb78d8761e578f451f10377b888
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.2 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
index 8d798a51c07c..0db8ba8c9985 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.2.tbz2
-_md5_=2078cebd16817ab92fbd54598a37f4b0
+_md5_=89a5781dfd298fc5ea615a372e15a234
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
index c0699a90d1be..e6015502e8bd 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.3.tbz2
-_md5_=56c2672b70783f95b2d5a0c9bf518d45
+_md5_=5a9ba74529a10241c279ef678fc330e9
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20160516 b/metadata/md5-cache/app-eselect/eselect-python-20160516
index 9529e83984eb..aadc36023d5a 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20160516
+++ b/metadata/md5-cache/app-eselect/eselect-python-20160516
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/eselect-python-20160516.tar.bz2
-_md5_=aab2dba22e4b3f78a04bfef22709ee14
+_md5_=452b2c63268958d7bcfccd59b224a5b2
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20171204 b/metadata/md5-cache/app-eselect/eselect-python-20171204
index f2d323c9651e..d9b67cf8c0e0 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20171204
+++ b/metadata/md5-cache/app-eselect/eselect-python-20171204
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/eselect-python-20171204.tar.bz2
-_md5_=14b96199fade5650f6bd0418bd38c19a
+_md5_=da9328e714846aafa5acf2bc9c8980ed
diff --git a/metadata/md5-cache/app-eselect/eselect-python-99999999 b/metadata/md5-cache/app-eselect/eselect-python-99999999
index 6b1cafb23357..edb24da67254 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-99999999
+++ b/metadata/md5-cache/app-eselect/eselect-python-99999999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1916c5e7b96cf4367ed4bc315ceb9f39
+_md5_=994817049dd18ffbc9a1e9f115873f30
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-2 b/metadata/md5-cache/app-eselect/eselect-repository-2
index 4ac24ad8d357..cb2be40d382f 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-2
+++ b/metadata/md5-cache/app-eselect/eselect-repository-2
@@ -3,10 +3,10 @@ DESCRIPTION=Manage repos.conf via eselect
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 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
 LICENSE=BSD-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(+)?] app-admin/eselect dev-python/lxml[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(+)?] net-misc/wget
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v2.tar.gz -> eselect-repository-2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7c8713fea45817525b344c2edd7eb9a3
+_md5_=28a70ccdea53cd89c5813003b85be24e
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20161226 b/metadata/md5-cache/app-eselect/eselect-ruby-20161226
index 8d77c6b93d0f..bbf8b9d38fbd 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20161226
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20161226
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-20161226.xz
-_md5_=3c06d5c3b38b21fefd04e0aba9396910
+_md5_=1e2a51965e0618def9c81bdd53345b61
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20170723 b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
index 6037aca664cc..489c367fa060 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20170723
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20170723.xz
-_md5_=f7d5360856a8a82d614852cff1f76052
+_md5_=afe9db0e6b22b7b289600aa148c8b5ce
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20171225 b/metadata/md5-cache/app-eselect/eselect-ruby-20171225
index 02e33c80b0c8..e9856a6183ca 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20171225
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20171225
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20171225.xz
-_md5_=908081d6f0aa1b4d6b592de0e509f2eb
+_md5_=6af4a379eaef0f5442be6df1abddb96a
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9 b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
index ffdec10ccdf5..6e8cd1aaf318 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.6
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=5363b87b16588c085b6c872e5c6dc4a8
+_md5_=2211cb299a353d018f1464ff56a00b81
diff --git a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4 b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
index cf099fbc1333..3e05028238e4 100644
--- a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
+++ b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages XvMC implementations
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-_md5_=5769370a28f46b0194f41aefdbcb08b2
+_md5_=6dc796b466bd9d57676afbb5f3450818
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 6c8596a17284..92afadc97ac9 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.50 b/metadata/md5-cache/app-forensics/chkrootkit-0.50
deleted file mode 100644
index 90b329880b90..000000000000
--- a/metadata/md5-cache/app-forensics/chkrootkit-0.50
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Tool to locally check for signs of a rootkit
-EAPI=5
-HOMEPAGE=http://www.chkrootkit.org/
-IUSE=+cron
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD-2
-RDEPEND=cron? ( virtual/cron )
-SLOT=0
-SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz https://dev.gentoo.org/~xmw/chkrootkit-0.50-gentoo.diff.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7c08b89185d98a361ed842d95d56d25b
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.52 b/metadata/md5-cache/app-forensics/chkrootkit-0.52
new file mode 100644
index 000000000000..f61cee7734b9
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/chkrootkit-0.52
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Tool to locally check for signs of a rootkit
+EAPI=6
+HOMEPAGE=http://www.chkrootkit.org/
+IUSE=+cron
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=cron? ( virtual/cron )
+SLOT=0
+SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.52.tar.gz -> chkrootkit-0.52.tar https://dev.gentoo.org/~polynomial-c/chkrootkit-0.51-gentoo.diff.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f56ce7644b9233e1420205f81689c465
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 5f33e5d98208..35ff0aff1404 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/poedit-1.8.5 b/metadata/md5-cache/app-i18n/poedit-1.8.5
index 00c2afaa2f50..ab62069d1e74 100644
--- a/metadata/md5-cache/app-i18n/poedit-1.8.5
+++ b/metadata/md5-cache/app-i18n/poedit-1.8.5
@@ -3,10 +3,10 @@ DEPEND=app-text/gtkspell:2 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat
 DESCRIPTION=GUI editor for gettext translations files
 EAPI=5
 HOMEPAGE=https://poedit.net
-KEYWORDS=amd64 ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~hppa ~ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=app-text/gtkspell:2 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*:*[cxx] =sys-libs/db-4*:*[cxx] ) <sys-libs/db-6:=[cxx] x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v1.8.5-oss/poedit-1.8.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d95c431e5818b9d7d61c1ba1a59101f
+_md5_=5ffe08647da31e456c9e2bf76c6d5de7
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2 b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
new file mode 100644
index 000000000000..fb1afd462297
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=An encoding detector library
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
+IUSE=cpu_flags_x86_sse2 static-libs test
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86
+LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdaa5947f19d73f05e3080eb0cb6c2e5
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 365e32c3da37..16c8c076e2f4 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/beanstalkd-1.10 b/metadata/md5-cache/app-misc/beanstalkd-1.10
index 926e6a0cbb5e..0231b430427e 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.10
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.10
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A simple, fast work queue
 EAPI=5
 HOMEPAGE=http://kr.github.io/beanstalkd/
-KEYWORDS=amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~mips x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=687063d71b4d4b102e0c12c3ddc39a60
+_md5_=d159665a0a09de680b8784baab4bff24
diff --git a/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8 b/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
index 1827f6280d05..8c61604253a4 100644
--- a/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
+++ b/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
@@ -3,9 +3,9 @@ DESCRIPTION=c_rehash script written in POSIX shell for OpenSSL
 EAPI=5
 HOMEPAGE=https://www.openssl.org/ https://github.com/pld-linux/openssl/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )
 SLOT=0
 SRC_URI=https://github.com/pld-linux/openssl/archive/auto/th/openssl-1.0.2g-8.tar.gz
-_md5_=42d85cf07f8c90895163b8fbc0a57f15
+_md5_=ca1fcdd121759c81519d21c27987b910
diff --git a/metadata/md5-cache/app-misc/c_rehash-1.7-r1 b/metadata/md5-cache/app-misc/c_rehash-1.7-r1
index 4d962c1f885e..24c144e0ee01 100644
--- a/metadata/md5-cache/app-misc/c_rehash-1.7-r1
+++ b/metadata/md5-cache/app-misc/c_rehash-1.7-r1
@@ -3,9 +3,9 @@ DEPEND=!<dev-libs/openssl-1.0.2d-r1:0
 DESCRIPTION=c_rehash script from OpenSSL
 EAPI=5
 HOMEPAGE=http://www.openssl.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=openssl
 RDEPEND=!<dev-libs/openssl-1.0.2d-r1:0
 SLOT=0
 SRC_URI=http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_md5_=9af68d65855f43c59c540061525ea423
+_md5_=0a715ac43a36a07772edc984eebf3061
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30-r1 b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30-r1
index fd0594be60e6..82527e606d9b 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30-r1
+++ b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_30_RTM/src/nss-3.30.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f8aebb8fd2249802bd5e2dce3a8e1923
+_md5_=bdb55c251542b4c5aeea29b9d869ab64
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2 b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
index ccec43ffa160..58f961ac101e 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
+++ b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_30_2_RTM/src/nss-3.30.2.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cbf5ff985cc0d164ff9ecc9cf940a356
+_md5_=d3b5548dfd6039ea4bc9fcaa96120300
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20170717.3.34.1 b/metadata/md5-cache/app-misc/ca-certificates-20170717.3.34.1
index 77406cbb0799..8ac73996a6cb 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20170717.3.34.1
+++ b/metadata/md5-cache/app-misc/ca-certificates-20170717.3.34.1
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20170717.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_34_1_RTM/src/nss-3.34.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9c1afbdc6c35cdeed8f754e3dc7fb64b
+_md5_=cac1456ea073916f618090a815ed82a6
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20170717.3.35 b/metadata/md5-cache/app-misc/ca-certificates-20170717.3.35
index ff7312aeba27..4a6d91822a5e 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20170717.3.35
+++ b/metadata/md5-cache/app-misc/ca-certificates-20170717.3.35
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20170717.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_35_RTM/src/nss-3.35.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=311f93da36d3256644830cff99a84e3b
+_md5_=cac1456ea073916f618090a815ed82a6
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.6 b/metadata/md5-cache/app-misc/ddcutil-0.8.6
new file mode 100644
index 000000000000..3fdf817d7edf
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Program for querying and changing monitor settings
+EAPI=6
+HOMEPAGE=http://www.ddcutil.com/
+IUSE=drm usb-monitor user-permissions video_cards_nvidia X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 )
+REQUIRED_USE=drm? ( X )
+SLOT=0
+SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1db6c0c81e273f9e91b42a4acd7d6c30
diff --git a/metadata/md5-cache/app-misc/editor-wrapper-4 b/metadata/md5-cache/app-misc/editor-wrapper-4
index 4a6bfffef73e..dea55276b4f3 100644
--- a/metadata/md5-cache/app-misc/editor-wrapper-4
+++ b/metadata/md5-cache/app-misc/editor-wrapper-4
@@ -2,7 +2,7 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Wrapper scripts that will execute EDITOR or PAGER
 EAPI=4
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
-_md5_=7eab8f1133fb95deb201854d8d0b67ed
+_md5_=13ec8eacf49875505b69095caf1e23a2
diff --git a/metadata/md5-cache/app-misc/getopt-1.1.6 b/metadata/md5-cache/app-misc/getopt-1.1.6
index 45c316a6b421..68a489b89c12 100644
--- a/metadata/md5-cache/app-misc/getopt-1.1.6
+++ b/metadata/md5-cache/app-misc/getopt-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=getopt(1) replacement supporting GNU-style long options
 EAPI=4
 HOMEPAGE=http://software.frodo.looijaard.name/getopt/
 IUSE=nls
-KEYWORDS=~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b011eb51d0997a0f64117d4230810c2c
+_md5_=425ee8aba8425afe2eeaceb4d935f976
diff --git a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1 b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
index 8f170d8bceb1..dcc017868d85 100644
--- a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) qt4? ( dev-python/PyQt4[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/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Program to extract metadata using Hachoir library
 EAPI=5
 HOMEPAGE=https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata
-IUSE=gnome gtk qt4 python_targets_python2_7
+IUSE=gnome gtk python_targets_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-metadata/hachoir-metadata-1.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae81392afebd9e9161c7e34481a02266
+_md5_=c2739b13a2fe8b269f28cdf6dc2204f1
diff --git a/metadata/md5-cache/app-misc/hilite-1.5-r1 b/metadata/md5-cache/app-misc/hilite-1.5-r1
index 8a33d3e2e07a..2591908e2877 100644
--- a/metadata/md5-cache/app-misc/hilite-1.5-r1
+++ b/metadata/md5-cache/app-misc/hilite-1.5-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=A utility which highlights stderr text in red
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/hilite
-KEYWORDS=amd64 hppa ia64 mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/hilite-1.5.c
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fb5ffe16aa355d3e86d70c9d19f73527
+_md5_=392d57ad1812a71975d40c958039c0e5
diff --git a/metadata/md5-cache/app-misc/mime-types-9 b/metadata/md5-cache/app-misc/mime-types-9
index 1f3275afe9ff..594ae3237e52 100644
--- a/metadata/md5-cache/app-misc/mime-types-9
+++ b/metadata/md5-cache/app-misc/mime-types-9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Provides /etc/mime.types file
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
 SRC_URI=mirror://gentoo/mime-types-9.tar.bz2
-_md5_=4737c8d50b203ea00b92772aef839460
+_md5_=6f8b6f6a5798bac0a0b61fb93dd77509
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.1.7 b/metadata/md5-cache/app-misc/pax-utils-1.1.7
index bf219b76ab8f..5f5db694f11a 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.1.7
+++ b/metadata/md5-cache/app-misc/pax-utils-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=4
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug python seccomp
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.1.7.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.1.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=21752f5178c16d07f020a17aa15aeaa2
+_md5_=07cfe5442654667ba230df02bbd53fa4
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2 b/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
index 6908d9ebcf5b..4c563f82a595 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug python seccomp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.2.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.2.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=ed49544a4d3fc2706f631b005ee951f9
+_md5_=be76ad53dbb9f46245cab0b65abd760e
diff --git a/metadata/md5-cache/app-misc/pysmssend-1.48-r1 b/metadata/md5-cache/app-misc/pysmssend-1.48-r1
deleted file mode 100644
index d5e5a38df41f..000000000000
--- a/metadata/md5-cache/app-misc/pysmssend-1.48-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python Application for sending sms over multiple ISPs
-EAPI=5
-HOMEPAGE=http://pysmssend.silverarrow.org/
-IUSE=qt4 python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db50a5400d19f8dc52cc682b666cc6f3
diff --git a/metadata/md5-cache/app-misc/pysmssend-1.48-r2 b/metadata/md5-cache/app-misc/pysmssend-1.48-r2
new file mode 100644
index 000000000000..1e89792a6a0f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pysmssend-1.48-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python Application for sending sms over multiple ISPs
+EAPI=6
+HOMEPAGE=http://pysmssend.silverarrow.org/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b0db142ec966494cd4998de28db5f29
diff --git a/metadata/md5-cache/app-misc/recoll-1.23.6 b/metadata/md5-cache/app-misc/recoll-1.23.6
new file mode 100644
index 000000000000..751e0c30ae4e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/recoll-1.23.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] qt5? ( dev-qt/linguist-tools:5 )
+DESCRIPTION=A personal full text search package
+EAPI=6
+HOMEPAGE=http://www.lesbonscomptes.com/recoll/
+IUSE=camelcase doc +inotify qt5 session +spell python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-arch/unzip
+REQUIRED_USE=session? ( inotify ) python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.23.6.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c060c7080b3c1ce4d4c35d91693e8839
diff --git a/metadata/md5-cache/app-misc/rl-0.2.7-r1 b/metadata/md5-cache/app-misc/rl-0.2.7-r1
index b14bfe8aea69..f46245ae16d1 100644
--- a/metadata/md5-cache/app-misc/rl-0.2.7-r1
+++ b/metadata/md5-cache/app-misc/rl-0.2.7-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Randomize lines from text files or stdin
 EAPI=6
 HOMEPAGE=https://arthurdejong.org/rl
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ia64 mips ppc s390 sparc x86
+KEYWORDS=amd64 ia64 ~mips ppc s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://arthurdejong.org/rl/rl-0.2.7.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d1bb17ba7c17ca7e6eb040547a4a509f
+_md5_=3c07e7badb54f1e8f050e8a1f61688a1
diff --git a/metadata/md5-cache/app-misc/screen-4.4.0 b/metadata/md5-cache/app-misc/screen-4.4.0
index d9c6c4da490d..f0c03902609e 100644
--- a/metadata/md5-cache/app-misc/screen-4.4.0
+++ b/metadata/md5-cache/app-misc/screen-4.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.4.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7d17fc44c2b20b0cceacb560b711894f
+_md5_=4dcc19834ecddb40cfbff74f17a87712
diff --git a/metadata/md5-cache/app-misc/screen-4.5.1 b/metadata/md5-cache/app-misc/screen-4.5.1
index 9126ee75f49e..35bc10fef741 100644
--- a/metadata/md5-cache/app-misc/screen-4.5.1
+++ b/metadata/md5-cache/app-misc/screen-4.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.5.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cdd3f5a823d9528447ef43ed3c7b0eb4
+_md5_=21826e05dd612c96660cc92012037763
diff --git a/metadata/md5-cache/app-misc/screen-4.6.0 b/metadata/md5-cache/app-misc/screen-4.6.0
index 9f2464dd33f7..f1845234dd4b 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.0
+++ b/metadata/md5-cache/app-misc/screen-4.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7a0df15587a002538e47086eb0fd2a7f
+_md5_=b20e41eeb20509ef95731c6149c4e241
diff --git a/metadata/md5-cache/app-misc/screen-4.6.1 b/metadata/md5-cache/app-misc/screen-4.6.1
index a135312526f3..5aa5f23fb88c 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.1
+++ b/metadata/md5-cache/app-misc/screen-4.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7a0df15587a002538e47086eb0fd2a7f
+_md5_=b20e41eeb20509ef95731c6149c4e241
diff --git a/metadata/md5-cache/app-misc/screen-4.6.2 b/metadata/md5-cache/app-misc/screen-4.6.2
index 42feec1422ee..9d32a3bf5c3e 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.2
+++ b/metadata/md5-cache/app-misc/screen-4.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d3bf09b352c9efd895e2516dd953f3c7
+_md5_=e1f2108c68ae47868e73170bcd55ea8b
diff --git a/metadata/md5-cache/app-misc/yq-2.3.4 b/metadata/md5-cache/app-misc/yq-2.3.4
new file mode 100644
index 000000000000..d75a70f91e5a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/yq-2.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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=Command-line YAML processor - jq wrapper for YAML documents
+EAPI=6
+HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/y/yq/yq-2.3.4.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4acda33d5041848a5bf23967947b343a
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index d115a92bc3f8..aedf016aaa29 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1 b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
index 9e78ea1d83c5..d25eb4010a0d 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=File transfer over OBEX for mobile phones
 EAPI=5
 HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 IUSE=perl python ruby tcl python_targets_python2_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 hppa ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.24-Source.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34533b10299649ab9cb6f8e34e0ab993
+_md5_=e1137cdc414cc57479de9dbc3cc10288
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 994d5707ec51..3ad74f86f291 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/gnucash-2.7.3 b/metadata/md5-cache/app-office/gnucash-2.7.3
index b56ad4a65c40..9379a424fd9a 100644
--- a/metadata/md5-cache/app-office/gnucash-2.7.3
+++ b/metadata/md5-cache/app-office/gnucash-2.7.3
@@ -11,4 +11,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucash/gnucash-2.7.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef9390d284cc16a479a307712839a28f
+_md5_=592cd7d6468b0c827ef16b11bc49309c
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.1.1 b/metadata/md5-cache/app-office/kmymoney-4.8.1.1
deleted file mode 100644
index d0af862f4528..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-4.8.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Personal finance manager by KDE
-EAPI=6
-HOMEPAGE=https://kmymoney.org/
-IUSE=calendar debug doc hbci ofx quotes weboob test +handbook
-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 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://kde/stable/kmymoney/4.8.1.1/src/kmymoney-4.8.1.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45097bc03f0b6dc9b4a3fbb559618b91
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
new file mode 100644
index 000000000000..1b92675705f7
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install 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.7.2 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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7162093a2f60782be5c06e12cc82dbec
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index 581f3b12fabc..f64ce5244715 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a8778ac5c58db3467fdf54c2f005a20
+_md5_=009ce5fb4580869fa38c90c1e78dff12
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 55b54a0e747c..921aeae1a95f 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 kde-frameworks/kcoreaddons:5 ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.65.0:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 kde-frameworks/kcoreaddons:5 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) qt4? ( kde )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.65.0:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=540e7e883b6f2e48b1beeefa083b8f2c
+_md5_=16190f7ed00ae6f42a8c9177fd51e408
diff --git a/metadata/md5-cache/app-office/texmacs-1.99.6-r2 b/metadata/md5-cache/app-office/texmacs-1.99.6-r2
new file mode 100644
index 000000000000..463fc666ea4e
--- /dev/null
+++ b/metadata/md5-cache/app-office/texmacs-1.99.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Wysiwyg text processor with high-quality maths
+EAPI=6
+HOMEPAGE=http://www.texmacs.org/
+IUSE=jpeg netpbm sqlite svg spell
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+SLOT=0
+SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.99.6-src.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3983dd60cd9e13a41753b086a373640d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index dd0b8486c7f4..3773411d32ac 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/eclass-manpages-20170905 b/metadata/md5-cache/app-portage/eclass-manpages-20170905
index dfbad051128f..dc3f847d0d47 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170905
+++ b/metadata/md5-cache/app-portage/eclass-manpages-20170905
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=collection of Gentoo eclass manpages
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/dist/eclass-manpages-20170905.tar.xz
-_md5_=016a00389e7c45182bb67b6587458b47
+_md5_=79386932a32642c743ab426d75940101
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20180101 b/metadata/md5-cache/app-portage/eclass-manpages-20180101
index 2defd16dab99..181be2a5f265 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-20180101
+++ b/metadata/md5-cache/app-portage/eclass-manpages-20180101
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of Gentoo eclass manpages
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20180101.tar.xz
-_md5_=f7f5fa5f4ff07e5827f853a7e32f4b7f
+_md5_=59687aca17dec44b484d879a6506e89f
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20180119 b/metadata/md5-cache/app-portage/eclass-manpages-20180119
index 7ed8423fab17..ede9c04c1915 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-20180119
+++ b/metadata/md5-cache/app-portage/eclass-manpages-20180119
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of Gentoo eclass manpages
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eclass-manpages-20180119.tar.xz
-_md5_=79e87a39a3884871887897b199ce870e
+_md5_=7055515431463f8d06a98806326af95d
diff --git a/metadata/md5-cache/app-portage/eix-0.32.9 b/metadata/md5-cache/app-portage/eix-0.32.9
index 8d7efc530e1f..9839bf6c3712 100644
--- a/metadata/md5-cache/app-portage/eix-0.32.9
+++ b/metadata/md5-cache/app-portage/eix-0.32.9
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.32.9/eix-0.32.9.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=63b5d4c710d456ba1abd3e558d60d208
+_md5_=dc61ba2f28d81bdf2e91a4f87cb8d325
diff --git a/metadata/md5-cache/app-portage/eix-0.33.0-r1 b/metadata/md5-cache/app-portage/eix-0.33.0-r1
index eb1c300cffaf..50d3faa051c2 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.0-r1
+++ b/metadata/md5-cache/app-portage/eix-0.33.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.0/eix-0.33.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cbdb51cf1a10dd30400f351bc438c951
+_md5_=3738359504d38c8106174cd36b237863
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170826.1 b/metadata/md5-cache/app-portage/elt-patches-20170826.1
index 18bc8123c905..5130ee31f324 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170826.1
+++ b/metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
-_md5_=ada934a546b8dc457c1efb5efb7af6e7
+_md5_=453470093441c9b52fe24aab4ad1b0e0
diff --git a/metadata/md5-cache/app-portage/gemato-10.3 b/metadata/md5-cache/app-portage/gemato-10.3
new file mode 100644
index 000000000000..1c0399770b11
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-10.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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-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=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test 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
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-10.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b22c682fe5ddc82a8f5d798822fd5268
diff --git a/metadata/md5-cache/app-portage/gemato-9.2-r1 b/metadata/md5-cache/app-portage/gemato-9.2-r1
deleted file mode 100644
index 7cb67a3d8783..000000000000
--- a/metadata/md5-cache/app-portage/gemato-9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( !!dev-python/pyliblzma ) blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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-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=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma +portage-postsync sha3 test 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
-LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( !!dev-python/pyliblzma ) blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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(-)] ) ) 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(-)] portage-postsync? ( app-crypt/gentoo-keys ) 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/g/gemato/gemato-9.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eae21a8fb4825388273332e1adfef2c7
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index e04e5d758b99..91106ceeb1a7 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma +portage-postsync sha3 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+blake2 bzip2 +gpg lzma sha3 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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(-)] ) ) 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(-)] portage-postsync? ( app-crypt/gentoo-keys ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_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(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[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/pysha3[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/pysha3[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(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cc1df3f797ca3263c00eb60c9266ba8
+_md5_=3023044129d2d092719ad145158a01c0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
index 1bbd51f94d2a..4adb85f08789 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of developer scripts for Gentoo
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/perl sys-apps/diffutils
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-dev-0.2.8.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0d60f974003e4b785a6facb7a1d1e535
+_md5_=b63723c3dc0a25908cd2268a20ea662a
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.0 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.0
index 31a8ef33b2a3..dd09913ec8c3 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.0
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of developer scripts for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=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(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoolkit-dev-0.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=799ef16a6ab947c62ac9131804eb2039
+_md5_=73f7324d593cc878f654f6d957844266
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.1 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.1
index 4c76a553b2c8..f91a6f53b3a1 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.1
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of developer scripts for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=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(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoolkit-dev-0.3.1.tar.gz https://dev.gentoo.org/~vapier/dist/gentoolkit-dev-0.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=efbb48183c2af51c2f49ee9445d00ee3
+_md5_=0621554162792e9392b8bfa86e21ca91
diff --git a/metadata/md5-cache/app-portage/hackport-0.5.4 b/metadata/md5-cache/app-portage/hackport-0.5.4
new file mode 100644
index 000000000000..7e956c74cf31
--- /dev/null
+++ b/metadata/md5-cache/app-portage/hackport-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.4/hackport-0.5.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2afdb34370be2d2ca5d6883f04246404
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.62 b/metadata/md5-cache/app-portage/portage-utils-0.62
index 5972b50e98d6..b139e8b5f2ac 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=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.62.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.62.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6a7b97aae7d0437b79774bdfe2f272c
+_md5_=87ed689fe7d462f2c9fa3b193c727d1b
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.63 b/metadata/md5-cache/app-portage/portage-utils-0.63
index 8f54a844116f..02f6dda9a37b 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.63
+++ b/metadata/md5-cache/app-portage/portage-utils-0.63
@@ -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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.63.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.63.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=475ec8835aafdf089a8f7a90f5644458
+_md5_=a58f8f6427712219bdeba6f03a2f008c
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index 4a96c15804b1..6b36d681aa03 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b60f49e70a52a6ac6158c158c43bc4bc
+_md5_=604c1c907e228bcfa266390d066b9a98
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64-r1 b/metadata/md5-cache/app-portage/portage-utils-0.64-r1
index 5aceba3e2462..04e8cb331a28 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64-r1
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64-r1
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=226468ff9110f07b40fdf32f493f15cb
+_md5_=ba432571a15720a3eb3114fc836f23c8
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.65 b/metadata/md5-cache/app-portage/portage-utils-0.65
index 5a33057c4554..08cbd9d50f69 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.65
+++ b/metadata/md5-cache/app-portage/portage-utils-0.65
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.65.tar.xz https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.65.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=932a95bc49c381243681da13157d7342
+_md5_=fadeecb614e68a6cf84822a65403967f
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.0-r1 b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
index 7333f5dba700..b3ae3d850cd4 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.0-r1
+++ b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/python-exec:2 !<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.6.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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://gentoo/repoman-2.3.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0.tar.bz2 https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=592d2e2370b9366a59da42d6c673c6bb
+_md5_=af57b41fb7eb0b192ca445de1e0cb1d4
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.3 b/metadata/md5-cache/app-portage/repoman-2.3.3
index a3e81fb56b67..cf7485d5ccc4 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.3
+++ b/metadata/md5-cache/app-portage/repoman-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.3.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ec8e555a2231097e426131bc3c3bf2d
+_md5_=148dc2e3066f7eca6108ceda87600a80
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.4 b/metadata/md5-cache/app-portage/repoman-2.3.4
index c578453617cb..575410c2809e 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.4
+++ b/metadata/md5-cache/app-portage/repoman-2.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.4.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f386a96604df921e02559d5b79865f5
+_md5_=ae2faf5983bc86b42ef1cf88d7a3b996
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.6 b/metadata/md5-cache/app-portage/repoman-2.3.6
index 21b4c07d93e4..7e1bf9d63400 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.6
+++ b/metadata/md5-cache/app-portage/repoman-2.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.6.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df0a113e11700d464cbb5fb12e244b5d
+_md5_=6aaff1303fb33a0f6a9fb1e70d65512e
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index abe57ce8cc94..6900b506803c 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f386a96604df921e02559d5b79865f5
+_md5_=ae2faf5983bc86b42ef1cf88d7a3b996
diff --git a/metadata/md5-cache/app-portage/tatt-0.5 b/metadata/md5-cache/app-portage/tatt-0.5
index 4b1022d85498..38586649d273 100644
--- a/metadata/md5-cache/app-portage/tatt-0.5
+++ b/metadata/md5-cache/app-portage/tatt-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=arch testing tool
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/tatt
 IUSE=+templates python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] www-client/pybugz 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/gentoo/tatt/archive/v0.5.tar.gz -> tatt-0.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c352574815abf39c0456654081a85b64
+_md5_=928d77ca7585dea201635e9f191205ef
diff --git a/metadata/md5-cache/app-portage/ufed-0.91 b/metadata/md5-cache/app-portage/ufed-0.91
index 56850176b643..527d7b5c85df 100644
--- a/metadata/md5-cache/app-portage/ufed-0.91
+++ b/metadata/md5-cache/app-portage/ufed-0.91
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/ufed-0.91.tar.bz2 https://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.91.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=58fb43355ceb2bc074c1761bf47069ed
+_md5_=acd1a8bb16d4035924147e82b7067183
diff --git a/metadata/md5-cache/app-portage/ufed-0.92 b/metadata/md5-cache/app-portage/ufed-0.92
index e26368abcba8..2143f7cdacea 100644
--- a/metadata/md5-cache/app-portage/ufed-0.92
+++ b/metadata/md5-cache/app-portage/ufed-0.92
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure prepare
 DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/ufed-0.92.tar.bz2 https://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.92.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11441fe279fad2cd33928ea951915420
+_md5_=28f9ef3251eaab11a19f04e2b74ad821
diff --git a/metadata/md5-cache/app-portage/ufed-9999 b/metadata/md5-cache/app-portage/ufed-9999
index d015317792d9..05b52d817785 100644
--- a/metadata/md5-cache/app-portage/ufed-9999
+++ b/metadata/md5-cache/app-portage/ufed-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure prepare unpack
 DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=dev-vcs/git-1.8.2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= dev-lang/perl
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a87b1ac34d9f6fcea032766a739bee50
+_md5_=e9aa1efcaf448d8191046b497d22741a
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index bd0a7bdacbc2..ed31db8a4a77 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/bash-2.05b_p13 b/metadata/md5-cache/app-shells/bash-2.05b_p13
index 4118168aed6f..28ec0ecef6fd 100644
--- a/metadata/md5-cache/app-shells/bash-2.05b_p13
+++ b/metadata/md5-cache/app-shells/bash-2.05b_p13
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=2.05b
 SRC_URI=mirror://gnu/bash/bash-2.05b.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-001 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-002 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-003 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-004 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-005 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-006 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-007 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-008 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-009 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-010 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-011 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-012 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-013 mirror://gnu/bash/bash-2.05b-patches/bash205b-001 mirror://gnu/bash/bash-2.05b-patches/bash205b-002 mirror://gnu/bash/bash-2.05b-patches/bash205b-003 mirror://gnu/bash/bash-2.05b-patches/bash205b-004 mirror://gnu/bash/bash-2.05b-patches/bash205b-005 mirror://gnu/bash/bash-2.05b-patches/bash205b-006 mirror://gnu/bash/bash-2.05b-patches/bash205b-007 mirror://gnu/bash/bash-2.05b-patches/bash205b-008 mirror://gnu/bash/bash-2.05b-patches/bash205b-009 mirror://gnu/bash/bash-2.05b-patches/bash205b-010 mirror://gnu/bash/bash-2.05b-patches/bash205b-011 mirror://gnu/bash/bash-2.05b-patches/bash205b-012 mirror://gnu/bash/bash-2.05b-patches/bash205b-013
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=30803df0a43065372814d009875b3e59
+_md5_=5f99605477d4520163a0e5061b94944d
diff --git a/metadata/md5-cache/app-shells/bash-3.0_p22 b/metadata/md5-cache/app-shells/bash-3.0_p22
index 61848081de4a..91fd3cf0bda1 100644
--- a/metadata/md5-cache/app-shells/bash-3.0_p22
+++ b/metadata/md5-cache/app-shells/bash-3.0_p22
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.0
 SRC_URI=mirror://gnu/bash/bash-3.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-001 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-002 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-003 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-004 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-005 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-006 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-007 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-008 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-009 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-010 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-011 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-012 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-013 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-014 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-015 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-016 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-017 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-018 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-019 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-020 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-021 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-022 mirror://gnu/bash/bash-3.0-patches/bash30-001 mirror://gnu/bash/bash-3.0-patches/bash30-002 mirror://gnu/bash/bash-3.0-patches/bash30-003 mirror://gnu/bash/bash-3.0-patches/bash30-004 mirror://gnu/bash/bash-3.0-patches/bash30-005 mirror://gnu/bash/bash-3.0-patches/bash30-006 mirror://gnu/bash/bash-3.0-patches/bash30-007 mirror://gnu/bash/bash-3.0-patches/bash30-008 mirror://gnu/bash/bash-3.0-patches/bash30-009 mirror://gnu/bash/bash-3.0-patches/bash30-010 mirror://gnu/bash/bash-3.0-patches/bash30-011 mirror://gnu/bash/bash-3.0-patches/bash30-012 mirror://gnu/bash/bash-3.0-patches/bash30-013 mirror://gnu/bash/bash-3.0-patches/bash30-014 mirror://gnu/bash/bash-3.0-patches/bash30-015 mirror://gnu/bash/bash-3.0-patches/bash30-016 mirror://gnu/bash/bash-3.0-patches/bash30-017 mirror://gnu/bash/bash-3.0-patches/bash30-018 mirror://gnu/bash/bash-3.0-patches/bash30-019 mirror://gnu/bash/bash-3.0-patches/bash30-020 mirror://gnu/bash/bash-3.0-patches/bash30-021 mirror://gnu/bash/bash-3.0-patches/bash30-022
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=be999f60ca01747115fe9bc69df7f9bd
+_md5_=6b1fa80202901a064fa390cc8090bb62
diff --git a/metadata/md5-cache/app-shells/bash-3.1_p23 b/metadata/md5-cache/app-shells/bash-3.1_p23
index e37bc8d4db85..f8dfc902eab3 100644
--- a/metadata/md5-cache/app-shells/bash-3.1_p23
+++ b/metadata/md5-cache/app-shells/bash-3.1_p23
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.1
 SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-018 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-019 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-020 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-021 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-022 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-023 mirror://gnu/bash/bash-3.1-patches/bash31-001 mirror://gnu/bash/bash-3.1-patches/bash31-002 mirror://gnu/bash/bash-3.1-patches/bash31-003 mirror://gnu/bash/bash-3.1-patches/bash31-004 mirror://gnu/bash/bash-3.1-patches/bash31-005 mirror://gnu/bash/bash-3.1-patches/bash31-006 mirror://gnu/bash/bash-3.1-patches/bash31-007 mirror://gnu/bash/bash-3.1-patches/bash31-008 mirror://gnu/bash/bash-3.1-patches/bash31-009 mirror://gnu/bash/bash-3.1-patches/bash31-010 mirror://gnu/bash/bash-3.1-patches/bash31-011 mirror://gnu/bash/bash-3.1-patches/bash31-012 mirror://gnu/bash/bash-3.1-patches/bash31-013 mirror://gnu/bash/bash-3.1-patches/bash31-014 mirror://gnu/bash/bash-3.1-patches/bash31-015 mirror://gnu/bash/bash-3.1-patches/bash31-016 mirror://gnu/bash/bash-3.1-patches/bash31-017 mirror://gnu/bash/bash-3.1-patches/bash31-018 mirror://gnu/bash/bash-3.1-patches/bash31-019 mirror://gnu/bash/bash-3.1-patches/bash31-020 mirror://gnu/bash/bash-3.1-patches/bash31-021 mirror://gnu/bash/bash-3.1-patches/bash31-022 mirror://gnu/bash/bash-3.1-patches/bash31-023
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=43bf8b9ad7963bd1628619e96eb54fc4
+_md5_=51e7ff36d9e37cd9bdc3369f61d39f09
diff --git a/metadata/md5-cache/app-shells/bash-3.2_p57 b/metadata/md5-cache/app-shells/bash-3.2_p57
index c1ebe48a4875..ffc1191547b2 100644
--- a/metadata/md5-cache/app-shells/bash-3.2_p57
+++ b/metadata/md5-cache/app-shells/bash-3.2_p57
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.2
 SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-052 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-053 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-054 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-055 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-056 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-057 mirror://gnu/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-052 mirror://gnu/bash/bash-3.2-patches/bash32-053 mirror://gnu/bash/bash-3.2-patches/bash32-054 mirror://gnu/bash/bash-3.2-patches/bash32-055 mirror://gnu/bash/bash-3.2-patches/bash32-056 mirror://gnu/bash/bash-3.2-patches/bash32-057
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=db55725d8a2262abaf2e61ce71d71455
+_md5_=6f2387e9c65e68a4f1d8feb0006b684f
diff --git a/metadata/md5-cache/app-shells/bash-4.0_p44 b/metadata/md5-cache/app-shells/bash-4.0_p44
index 7a42b1ab85fb..578d71db0a35 100644
--- a/metadata/md5-cache/app-shells/bash-4.0_p44
+++ b/metadata/md5-cache/app-shells/bash-4.0_p44
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.0
 SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-039 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-040 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-041 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-042 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-043 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-044 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-039 mirror://gnu/bash/bash-4.0-patches/bash40-040 mirror://gnu/bash/bash-4.0-patches/bash40-041 mirror://gnu/bash/bash-4.0-patches/bash40-042 mirror://gnu/bash/bash-4.0-patches/bash40-043 mirror://gnu/bash/bash-4.0-patches/bash40-044
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cb5402588244c54958046f13d8136f8f
+_md5_=145baf372701f5baf0c231d405ff710d
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p17 b/metadata/md5-cache/app-shells/bash-4.1_p17
index 7d171daa8e3f..f94435b2a58a 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p17
+++ b/metadata/md5-cache/app-shells/bash-4.1_p17
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.1
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-012 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-013 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-014 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-015 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-016 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-017 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-012 mirror://gnu/bash/bash-4.1-patches/bash41-013 mirror://gnu/bash/bash-4.1-patches/bash41-014 mirror://gnu/bash/bash-4.1-patches/bash41-015 mirror://gnu/bash/bash-4.1-patches/bash41-016 mirror://gnu/bash/bash-4.1-patches/bash41-017
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=07f93996a848b62b27ab79ad6d6ac1ce
+_md5_=566bd160da4adce8137e13e88a192d6e
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p53 b/metadata/md5-cache/app-shells/bash-4.2_p53
index 30788f88898f..f58ae2183133 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p53
+++ b/metadata/md5-cache/app-shells/bash-4.2_p53
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.2
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9240966cb91436a3d076f395616e000b
+_md5_=0d5e99cd497d1964a5f436652e490a1d
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r1 b/metadata/md5-cache/app-shells/bash-4.3_p48-r1
index 6c7204efa663..40f3104ccf24 100644
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r1
+++ b/metadata/md5-cache/app-shells/bash-4.3_p48-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=5
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0ff53fb1f75579b28981d5f1f0dc2916
+_md5_=97d209374117051bf612c8b11ad5d693
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p12 b/metadata/md5-cache/app-shells/bash-4.4_p12
index 9f8251dc7d14..3f832a2d3d98 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p12
+++ b/metadata/md5-cache/app-shells/bash-4.4_p12
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=5
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a27bb6fe5daedf75c04c5ec2a2b2a92e
+_md5_=0aa4996d5de76ea8ab0f06ee125cb87b
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p12-r1 b/metadata/md5-cache/app-shells/bash-4.4_p12-r1
index 9abb7ef51a72..85fd83959f6a 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p12-r1
+++ b/metadata/md5-cache/app-shells/bash-4.4_p12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=6
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a100e72c6376a89685cd8fb31ce4963e
+_md5_=58c3d5aab87d164c7d519b6eb4fbeb16
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.4-r1 b/metadata/md5-cache/app-shells/bash-completion-2.4-r1
index d470ac6d7ccc..90d794afc117 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.4-r1
+++ b/metadata/md5-cache/app-shells/bash-completion-2.4-r1
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Programmable Completion for bash
 EAPI=6
 HOMEPAGE=https://github.com/scop/bash-completion
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+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
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e21494b4c669c55bbef0e5ee5e9d8645
+_md5_=157578ac0d328d1a0b4b30e5d2c28de0
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7-r2 b/metadata/md5-cache/app-shells/bash-completion-2.7-r2
index 52475109a69f..d745abbab11e 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.7-r2
+++ b/metadata/md5-cache/app-shells/bash-completion-2.7-r2
@@ -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 ~sparc-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_=b00002562d709be33039cbf4cd26c2f2
+_md5_=52fa281444f205e334c6b6679bea3ed3
diff --git a/metadata/md5-cache/app-shells/fish-2.7.1 b/metadata/md5-cache/app-shells/fish-2.7.1
index 87c02337fcb4..26ea00b1a742 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 ~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 ~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_=91d087656f384bad1eda29052e58b890
+_md5_=c974f9879a9569550c50b0cc924e51cf
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20101217-r1 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20101217-r1
index 53ee38cd35ed..f7f82ad73923 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20101217-r1
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20101217-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=4
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash-completion
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-bashcomp-20101217.tar.bz2 https://dev.gentoo.org/~darkside/tmp/gentoo-bashcomp-20101217.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cdd4a6fbe61a10ba35dabac49371fcdd
+_md5_=1738e8e03a8549cd249005dea491a936
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
index 5b56ef299f01..76103a480172 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=4
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+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
 RDEPEND=app-shells/bash-completion
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-bashcomp-20121024.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5039e6adbbd64e3e67f60f8dbfd92b39
+_md5_=ad13d728d7f57751ed689a9c0a2caaeb
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
index 2c729db1d0e2..c08fe043c1f5 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+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
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/gentoo-bashcomp-20140911.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=21881693e3219b318c334da4cd3bc74d
+_md5_=1104cf86f7019a051435612970f83704
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20141115 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20141115
index 6bf2879293e0..770cd26f3c90 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20141115
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20141115
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
 EAPI=5
 HOMEPAGE=https://github.com/radhermit/gentoo-zsh-completions
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/gentoo-zsh-completions-20141115.tar.xz
-_md5_=3690350601a4a76f5ad7fc5afb5c1ed5
+_md5_=7221cd370d64a7a569b6f3db12b6e6ed
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20150103 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20150103
index adf9bf83c418..57788d675760 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20150103
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20150103
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
 EAPI=5
 HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-zsh-completions/archive/20150103.tar.gz -> gentoo-zsh-completions-20150103.tar.gz
-_md5_=db92f391919d9842163f9d2b807de410
+_md5_=b42968a885e58c12903fb8edfe5cffae
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
index 079f8f4d5f4c..97f04cf0f5fa 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
@@ -7,4 +7,4 @@ LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
-_md5_=db92f391919d9842163f9d2b807de410
+_md5_=b42968a885e58c12903fb8edfe5cffae
diff --git a/metadata/md5-cache/app-shells/push-2.0-r1 b/metadata/md5-cache/app-shells/push-2.0-r1
index ed45e09a18f6..b02a995983fd 100644
--- a/metadata/md5-cache/app-shells/push-2.0-r1
+++ b/metadata/md5-cache/app-shells/push-2.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/push/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/vaeth/push/archive/v2.0.tar.gz -> push-2.0.tar.gz
 _eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=5fb22462e30addbbe2bcf79f0579ef57
+_md5_=b3e9b093ae3a7a36cc1a54eca5ba04e5
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
index 503e489c7b4f..387ce6e37a4e 100644
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/quoter/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
 _eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=e4aa6fef32025169aaf1a6bc413983c5
+_md5_=a57231d98d5132e1c870f40af44738ad
diff --git a/metadata/md5-cache/app-shells/zsh-5.2 b/metadata/md5-cache/app-shells/zsh-5.2
index 3981c8ab9768..017cb6e3eb14 100644
--- a/metadata/md5-cache/app-shells/zsh-5.2
+++ b/metadata/md5-cache/app-shells/zsh-5.2
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=5
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= )
 SLOT=0
 SRC_URI=http://www.zsh.org/pub/zsh-5.2.tar.xz doc? ( http://www.zsh.org/pub/zsh-5.2-doc.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=16897a3f97d4570b75cdb225ccc96ecf
+_md5_=49894a6c0cf21cf41d7b62cf66b319e9
diff --git a/metadata/md5-cache/app-shells/zsh-5.3.1 b/metadata/md5-cache/app-shells/zsh-5.3.1
index 11c004304274..c263605ca304 100644
--- a/metadata/md5-cache/app-shells/zsh-5.3.1
+++ b/metadata/md5-cache/app-shells/zsh-5.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= )
 SLOT=0
 SRC_URI=http://www.zsh.org/pub/zsh-5.3.1.tar.xz doc? ( http://www.zsh.org/pub/zsh-5.3.1-doc.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=604438d16331bf278f2e285bd4886bd8
+_md5_=166cadc4ca50b8b4124867b40402f681
diff --git a/metadata/md5-cache/app-shells/zsh-5.4.2-r1 b/metadata/md5-cache/app-shells/zsh-5.4.2-r1
index f6970ed4e576..6336522bc179 100644
--- a/metadata/md5-cache/app-shells/zsh-5.4.2-r1
+++ b/metadata/md5-cache/app-shells/zsh-5.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=https://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.4.2.tar.gz doc? ( https://www.zsh.org/pub/zsh-5.4.2-doc.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a2c7649e725d8b719213168a4e8dd20e
+_md5_=132eabed64c98a42282e332bdbbc1d66
diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999
index 85e2ba9237bd..10d5e1268938 100644
--- a/metadata/md5-cache/app-shells/zsh-9999
+++ b/metadata/md5-cache/app-shells/zsh-9999
@@ -9,4 +9,4 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89b83d00f2ab42a083412bfe1ed04c4b
+_md5_=b884a8f58e477da83ee84c9c53f58a0d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 39bdf594cf7b..6f94dfcffe6b 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/ansifilter-2.8.1 b/metadata/md5-cache/app-text/ansifilter-2.8.1
deleted file mode 100644
index ae3045a1be61..000000000000
--- a/metadata/md5-cache/app-text/ansifilter-2.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Handles text files containing ANSI terminal escape codes
-EAPI=6
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=qt5
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.8.1.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f656b7d0414c4a4c5940102333dc3a95
diff --git a/metadata/md5-cache/app-text/ansifilter-2.9 b/metadata/md5-cache/app-text/ansifilter-2.9
index c8be9c446672..60d53b476ca1 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.9
+++ b/metadata/md5-cache/app-text/ansifilter-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=Handles text files containing ANSI terminal escape codes
 EAPI=6
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=qt5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.9.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=194fa3c2d60d907a7ce00f4e2a29c1c4
+_md5_=c3edabe6751ea860f27d6b8eb4e7cbb4
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1-r3 b/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
index f69366729a2e..d08ffdf4091f 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=5
 HOMEPAGE=http://aspell.net/
 IUSE=nls l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm 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 ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=>=sys-libs/ncurses-5.2:0= nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c0992b48c004e4c4ff9930ccea7c3f42
+_md5_=b10ef737f2abc793fe634737f9e130ca
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1-r4 b/metadata/md5-cache/app-text/aspell-0.60.6.1-r4
index 206dd95a090d..dd987428c3f5 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1-r4
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=6
 HOMEPAGE=http://aspell.net/
 IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~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 ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fed7fb4dd54b9e789937567047c64ca1
+_md5_=de18f9fc75a466538aa76f8e33ad46ff
diff --git a/metadata/md5-cache/app-text/aspell-0.60.7_rc1 b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
index 6f3b0a1b9f5b..cddc8c3df577 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.7_rc1
+++ b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=6
 HOMEPAGE=http://aspell.net/
 IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=616ffb45a8cbc982ea8c1413ab54009e
+_md5_=e09e65cf06d92bd97dc708ebb109ef27
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.19.1 b/metadata/md5-cache/app-text/build-docbook-catalog-1.19.1
index aeeb796b07a0..35493f115e21 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.19.1
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-1.19.1
@@ -3,9 +3,9 @@ DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=4
 HOMEPAGE=https://sources.gentoo.org/gentoo-src/build-docbook-catalog/
 IUSE=userland_BSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1 userland_BSD? ( sys-apps/flock ) dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gentoo/build-docbook-catalog-1.19.1.tar.xz https://dev.gentoo.org/~floppym/distfiles/build-docbook-catalog-1.19.1.tar.xz https://dev.gentoo.org/~vapier/dist/build-docbook-catalog-1.19.1.tar.xz
-_md5_=fc89b6b78db95e71e7a27c842985cdc9
+_md5_=851a00627e59393ab53998a90ef12867
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.20 b/metadata/md5-cache/app-text/build-docbook-catalog-1.20
index de5bf6708307..76c922d39d0a 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.20
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-1.20
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare setup
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=5
 HOMEPAGE=https://sources.gentoo.org/gentoo-src/build-docbook-catalog/
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gentoo/build-docbook-catalog-1.20.tar.xz https://dev.gentoo.org/~floppym/distfiles/build-docbook-catalog-1.20.tar.xz https://dev.gentoo.org/~vapier/dist/build-docbook-catalog-1.20.tar.xz
-_md5_=0938ce8d07b1f9fa6940048eab6eb807
+_md5_=1c6692fe438b5beb11c6638c96223e28
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.21 b/metadata/md5-cache/app-text/build-docbook-catalog-1.21
index 831ab7b03f0e..851959c0367f 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.21
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare setup
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=5
 HOMEPAGE=https://sources.gentoo.org/gentoo-src/build-docbook-catalog/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gentoo/build-docbook-catalog-1.21.tar.xz https://dev.gentoo.org/~haubi/distfiles/build-docbook-catalog-1.21.tar.xz
-_md5_=f65c46bc77daffa6b8df689c7bf6fd58
+_md5_=4ad420e4db86e6d0f00f69c6ab6b2271
diff --git a/metadata/md5-cache/app-text/djview-4.10 b/metadata/md5-cache/app-text/djview-4.10
deleted file mode 100644
index a4010e723202..000000000000
--- a/metadata/md5-cache/app-text/djview-4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e971c6af73c1b17f7cb918155852aa6
diff --git a/metadata/md5-cache/app-text/djview-4.10.3 b/metadata/md5-cache/app-text/djview-4.10.3
deleted file mode 100644
index 00088807a869..000000000000
--- a/metadata/md5-cache/app-text/djview-4.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93088125167c31c165fd7f06efd921fd
diff --git a/metadata/md5-cache/app-text/djview-4.10.5 b/metadata/md5-cache/app-text/djview-4.10.5
deleted file mode 100644
index d2157bcd0351..000000000000
--- a/metadata/md5-cache/app-text/djview-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.5.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93088125167c31c165fd7f06efd921fd
diff --git a/metadata/md5-cache/app-text/djview-4.10.6 b/metadata/md5-cache/app-text/djview-4.10.6
deleted file mode 100644
index ccc7b92217e9..000000000000
--- a/metadata/md5-cache/app-text/djview-4.10.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2002f74512387f116a7d6d20ab1c3e35
diff --git a/metadata/md5-cache/app-text/djview-4.10.6-r1 b/metadata/md5-cache/app-text/djview-4.10.6-r1
index 9e2a932f6844..5bf354bfaa48 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6-r1
+++ b/metadata/md5-cache/app-text/djview-4.10.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Portable DjVu viewer using Qt
 EAPI=6
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
 IUSE=debug nsplugin
-KEYWORDS=~amd64 ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e88786b738d412e141ffdf2d854a887
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=664119cafc3942de09fc7fafbe341a37
diff --git a/metadata/md5-cache/app-text/djview-4.9 b/metadata/md5-cache/app-text/djview-4.9
deleted file mode 100644
index 8e0c75e0fa0f..000000000000
--- a/metadata/md5-cache/app-text/djview-4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.9.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f3cc0f9bc51749104fce7560d6fab9a
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
index 6f39302b2e45..3744d0c516f9 100644
--- a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=DSSSL Stylesheets for DocBook
 EAPI=5
 HOMEPAGE=https://github.com/docbook/wiki/wiki
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-text/sgml-common
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-dsssl-1.79.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=36f9057ae919070b5bf37c5d3e760243
+_md5_=62800a2ba9a2beefb069b0073ebb7bf5
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
index 146fb7d2bcc0..4765f377bcea 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 3.0
 EAPI=0
 HOMEPAGE=http://docbook.org/sgml/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=app-text/sgml-common
 SLOT=3.0
 SRC_URI=http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=199ee2636f06ef4a9a436bcc5560f2bc
+_md5_=22a50d869285989fb0cab83562dd30f6
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
index 13fd6ee6a8c6..921f47364241 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 3.1
 EAPI=0
 HOMEPAGE=http://docbook.org/sgml/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=app-text/sgml-common
 SLOT=3.1
 SRC_URI=http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf1e82a8c0d323ec27cfc836c245f951
+_md5_=f061b94f2af8daa99e9659260485306b
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r3
index ffc62ee9ae20..19e27f9d46f7 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 4.0
 EAPI=0
 HOMEPAGE=http://docbook.org/sgml/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=app-text/sgml-common
 SLOT=4.0
 SRC_URI=http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bedc344b151da55cc894dfd4f942f71c
+_md5_=a5af666d86cf0229ebcbb1a360e8ad17
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r3
index 1762410d8891..e0cb287e488a 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 4.1
 EAPI=0
 HOMEPAGE=http://docbook.org/sgml/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=app-text/sgml-common
 SLOT=4.1
 SRC_URI=http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=da4f2103fd80eaee523cd39a7870485c
+_md5_=4e76c2adf1b9d517a41085fc2b7c7e50
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
index f858711f2200..e425e05c0c07 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Shell scripts to manage DocBook documents
 EAPI=3
 HOMEPAGE=https://sourceware.org/docbook-tools/
 IUSE=jadetex
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa9f62d8999d544bf592083352f71d70
+_md5_=90d9bc55fcb60d84cad83635a9daf261
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
index 081cfa0a2a39..c770d0d952dd 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Shell scripts to manage DocBook documents
 EAPI=5
 HOMEPAGE=https://sourceware.org/docbook-tools/
 IUSE=jadetex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9edfc0a162693bed10ac3ab0bf3af51b
+_md5_=a03158a808f6b42ea139ae166aa9ff27
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
index a746029bfce5..860227e4a10a 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
 SLOT=4.1.2
 SRC_URI=http://www.docbook.org/xml/4.1.2/docbkx412.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ac31b9e4c18a72c2b5a0d621ea6ee47
+_md5_=32046cda1d599f98ee9d6cebfdf18124
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
index 6e874705f5e7..ba2a491bd414 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
 SLOT=4.2
 SRC_URI=http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d8ba72719d069817213b9ae8c3a5c5a
+_md5_=70846f590cbbfb87d6db2dd87012728e
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
index 9a634d38e75f..6c912b834776 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
 SLOT=4.4
 SRC_URI=http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bde5eb7e1989659172629f2df6ccf964
+_md5_=6d3d6d7cdb51fe055772417ea0919b21
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
index fa7fefe9d80a..97e3331ebe00 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-style
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=docbook
 SLOT=4.5
 SRC_URI=http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5fda8dc405e0c5e246421a60d57c07ef
+_md5_=f994a74faf8e0c05a7c6167b7488529e
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r1 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r1
index cd6c558b000c..d4d4fedd3dbe 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r1
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Simplified Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=docbook
 RDEPEND=dev-libs/libxml2
 SLOT=1.0
 SRC_URI=http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=772a3a1fb6217b5aff68090f4da923f2
+_md5_=895f44faa1898ea3835a0614b1fb75d3
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
index d74398bc8771..fd596fe0a57d 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Simplified Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6
 SLOT=1.0
 SRC_URI=http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fc5c4773aec9927463c4eebd9d462114
+_md5_=0359544f14eb5dc944c60ca93b6ddc71
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r2 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
index 0981b441970e..bb263c2aa5f7 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
@@ -3,9 +3,9 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=docbook
 SLOT=0
 SRC_URI=mirror://gentoo/sdb4124.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2067311ac825546135065beb4da85dbf
+_md5_=40ebf9784554283529ad0e9960d31c7c
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
index df0ccd549be0..f02b5af58fe5 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6
 SLOT=0
 SRC_URI=mirror://gentoo/sdb4124.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=809912fa6f7ef7ebdd6497ecce2efefa
+_md5_=3ead53342082b8fcf420740df663eb5a
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r2 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r2
index c0e65fe15d7c..26477a10208d 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Simplified Docbook DTD for XML
 EAPI=0
 HOMEPAGE=http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6
 SLOT=4.1.2.5
 SRC_URI=http://www.nwalsh.com/docbook/simple/4.1.2.5/simple4125.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d99f48b9c5a54ecad68bc5492e21304a
+_md5_=3f7200949bb0d555545abe3d916f3ea6
diff --git a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0 b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
index 9fb21716ddd5..0212dcf42494 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
+++ b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
@@ -3,10 +3,10 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=5
 HOMEPAGE=https://github.com/docbook/wiki/wiki
 IUSE=ruby
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( dev-lang/ruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.78.0.tar.bz2
-_md5_=5c20bd4ef1e32316d0abcf235f5a70f7
+_md5_=67dfed049de2d68162cb5ef42583a6fb
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
index d0d436ac8ad9..691d9be2ef1c 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
@@ -3,11 +3,11 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=6
 HOMEPAGE=https://github.com/docbook/wiki/wiki
 IUSE=ruby
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b
-_md5_=6db9e76e9870346cc40e232991b637b6
+_md5_=635ecc7e95bcbf73839349da39fe6fc7
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.21 b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
index f40c795136f9..0f663d482a43 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.21
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
@@ -4,10 +4,10 @@ DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PD
 EAPI=6
 HOMEPAGE=http://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !<net-print/cups-filters-1.0.36-r2
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/ghostscript-9.21.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.21-patchset-1.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=925bea454a6478f48c179d8eae3fd5f6
+_md5_=57693b14d595495e9cfa2a7f6149cf06
diff --git a/metadata/md5-cache/app-text/lesspipe-1.83 b/metadata/md5-cache/app-text/lesspipe-1.83
index 0461bf8c94c3..685cea9a052f 100644
--- a/metadata/md5-cache/app-text/lesspipe-1.83
+++ b/metadata/md5-cache/app-text/lesspipe-1.83
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=a preprocessor for less
 EAPI=5
 HOMEPAGE=https://github.com/wofr06/lesspipe
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~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_=a62dbd1cd69b68c253fbf74559e1e300
+_md5_=b1416f1c4a59010ef8b3b85f933b47ac
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.4 b/metadata/md5-cache/app-text/libexttextcat-3.4.4
deleted file mode 100644
index aa07ef6e501e..000000000000
--- a/metadata/md5-cache/app-text/libexttextcat-3.4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Library implementing N-gram-based text categorization
-EAPI=5
-HOMEPAGE=http://software.wise-guys.nl/libtextcat/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=61fd128d8cf711e6d2b429f70c3faa6c
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24-r2 b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
index 8061d036976b..e3d506d3d010 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24-r2
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e40afda40bc07c7de1a2065e2c8f2e2
+_md5_=0a15183aecf7f73382c791afb0e25a69
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24_p5 b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
index 6497a3f12a61..f9ff2cc3eac0 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24_p5
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=6
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24+nmu5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9688a8fa41e6adc8f9272ce6a5553736
+_md5_=71a9d215cbec6b07d96e3bfe8c96b29f
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r6 b/metadata/md5-cache/app-text/openjade-1.3.2-r6
index 1555b6d0a6b5..9eb637f99a65 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r6
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r6
@@ -4,10 +4,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0a3c6fa0294e357a82c09de93b665df0
+_md5_=ac0ac4f31b5cf9f8a18dff52abe9a0df
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r7 b/metadata/md5-cache/app-text/openjade-1.3.2-r7
index 1aedd91e4e46..70e675fb97be 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r7
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=940cc80b6f3c4a30da269d1405e79042
+_md5_=cab2a0c2e4c1c5b5c216a0b2bd57dc84
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index 359ff6eb51e9..5876d57f00ce 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity manageme
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net/
 IUSE=doc nls static-libs test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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=MIT
 RDEPEND=net-libs/libnsl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e2b8031ca47945318580be209ead70f4
+_md5_=9bb88f626da2ed09733edad4138073ef
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
index 376865897b8c..d4494ce6e7c0 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r6
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -4,10 +4,10 @@ DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity manageme
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net/
 IUSE=doc nls static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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=MIT
 RDEPEND=net-libs/libnsl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8dff065c52971a5ed9421f1aa431e821
+_md5_=d998f3e8f12664fbd611af579378fb1d
diff --git a/metadata/md5-cache/app-text/poppler-0.57.0-r1 b/metadata/md5-cache/app-text/poppler-0.57.0-r1
index 1836f968b917..253ebff82564 100644
--- a/metadata/md5-cache/app-text/poppler-0.57.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.57.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/68
 SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=176d22e4f4d015c14095184621d1c4d0
+_md5_=aacd2f30e5b095ab7829de34d821dfa0
diff --git a/metadata/md5-cache/app-text/poppler-0.61.1 b/metadata/md5-cache/app-text/poppler-0.61.1
index 29a476b909c5..8d733a2b804b 100644
--- a/metadata/md5-cache/app-text/poppler-0.61.1
+++ b/metadata/md5-cache/app-text/poppler-0.61.1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/72
 SRC_URI=https://poppler.freedesktop.org/poppler-0.61.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d60d683233450ba2746349630d572d0
+_md5_=2f246e7e5cd59292989fb3b3a4aa350c
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index 53db12478c69..e26ec7b77173 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/73
 SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c3f23c4dffde0da3b764ffda594f8ea
+_md5_=b776bac6cf9cb2743bf0af314f27afc7
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index bf96a5958063..09a118b1cf4f 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e498e219c72cd7e948b1882400056bb2
+_md5_=85617dbcf5b48bb9e5b18933a5bd0dbb
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.7 b/metadata/md5-cache/app-text/poppler-data-0.4.7
index adc68ea6202e..538556626080 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.7
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=5
 HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 MIT
 SLOT=0
 SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz
-_md5_=9f42f3b4d1a09a9c4c6ccc89e9ab4696
+_md5_=7854bb213d2bcd2e9c76544f6d6d1413
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.8 b/metadata/md5-cache/app-text/poppler-data-0.4.8
index 29459e4a792b..b36d5a8a0c33 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.8
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.8
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 MIT
 SLOT=0
 SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz
-_md5_=f731458d38a462fd4d4b9736814894f2
+_md5_=45f818afea0f6796a868d155dc0747d3
diff --git a/metadata/md5-cache/app-text/qpdf-7.0.0 b/metadata/md5-cache/app-text/qpdf-7.0.0
index 8f4a406be528..6f220445740b 100644
--- a/metadata/md5-cache/app-text/qpdf-7.0.0
+++ b/metadata/md5-cache/app-text/qpdf-7.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
 EAPI=6
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples perl static-libs test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
 SLOT=0/18
 SRC_URI=mirror://sourceforge/qpdf/qpdf-7.0.0.tar.gz
-_md5_=c65b2c706293c196bb4c43129ac20d89
+_md5_=e1674e15a005e7903363e159e6635a87
diff --git a/metadata/md5-cache/app-text/rarian-0.8.1-r3 b/metadata/md5-cache/app-text/rarian-0.8.1-r3
index cb133cea37b1..1c3b831d3b34 100644
--- a/metadata/md5-cache/app-text/rarian-0.8.1-r3
+++ b/metadata/md5-cache/app-text/rarian-0.8.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A documentation metadata library
 EAPI=6
 HOMEPAGE=https://rarian.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://rarian.freedesktop.org/Releases/rarian-0.8.1.tar.gz https://dev.gentoo.org/~eva/distfiles/rarian/rarian-0.8.1-r3-patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0aa23a26931d17fa242315cf304efbaa
+_md5_=b0c49075f2cb8ffe1f3d2af71ddbee52
diff --git a/metadata/md5-cache/app-text/scrollkeeper-9999-r1 b/metadata/md5-cache/app-text/scrollkeeper-9999-r1
index 71ff37912c09..7c0680c35a0d 100644
--- a/metadata/md5-cache/app-text/scrollkeeper-9999-r1
+++ b/metadata/md5-cache/app-text/scrollkeeper-9999-r1
@@ -3,8 +3,8 @@ DEPEND==app-text/scrollkeeper-dtd-1.0
 DESCRIPTION=Dummy scrollkeeper for testing rarian
 EAPI=0
 HOMEPAGE=https://gnome.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 PDEPEND=app-text/rarian
 SLOT=0
-_md5_=d256a1bd6f0afe790c01e5e17f654a84
+_md5_=d346ef86a8426184064ad6e6e18cb88f
diff --git a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0 b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
index 4cf98de96272..d6f1c051bf08 100644
--- a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
+++ b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libxml2-2.4.19 !<app-text/scrollkeeper-9999-r1
 DESCRIPTION=DTD from the Scrollkeeper package
 EAPI=3
 HOMEPAGE=http://scrollkeeper.sourceforge.net/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1
 RDEPEND=>=dev-libs/libxml2-2.4.19
 SLOT=1.0
 SRC_URI=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
-_md5_=b46eda1d6b879f786bd03df0a26f0395
+_md5_=067ce941055b2f727d10dfaf4d55d770
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r6 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
index 43f06d741c33..154fa7fbd9e2 100644
--- a/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst postrm prepare prerm
 DESCRIPTION=Base ISO character entities and utilities for SGML
 EAPI=6
 HOMEPAGE=http://www.iso.org/standard/16387.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=f16ecb19060d43336fc19a914a050029
+_md5_=423f40ef8b13c190fe6ee6da80750ddf
diff --git a/metadata/md5-cache/app-text/webgen-1.4.0 b/metadata/md5-cache/app-text/webgen-1.4.0
deleted file mode 100644
index 39b0fcd6cf49..000000000000
--- a/metadata/md5-cache/app-text/webgen-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] >=dev-ruby/sass-3.2:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A template-based static website generator
-EAPI=5
-HOMEPAGE=http://webgen.gettalong.org
-IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/webgen-1.4.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ae84a4d8488f690704a42c0ea288a5b9
diff --git a/metadata/md5-cache/app-text/webgen-1.4.1 b/metadata/md5-cache/app-text/webgen-1.4.1
new file mode 100644
index 000000000000..60146d0b71a6
--- /dev/null
+++ b/metadata/md5-cache/app-text/webgen-1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) test? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A template-based static website generator
+EAPI=6
+HOMEPAGE=https://webgen.gettalong.org
+IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/webgen-1.4.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0cb7ea35037e104188c5a6a2fec3d2ca
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r4 b/metadata/md5-cache/app-text/xhtml1-20020801-r4
deleted file mode 100644
index 8f82f1e0cff9..000000000000
--- a/metadata/md5-cache/app-text/xhtml1-20020801-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=app-text/sgml-common dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
-EAPI=3
-HOMEPAGE=http://www.w3.org/TR/xhtml1/
-KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=W3C
-SLOT=0
-SRC_URI=http://www.w3.org/TR/xhtml1/xhtml1.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d05f6bd4f32e2f68b3111335f730db11
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r5 b/metadata/md5-cache/app-text/xhtml1-20020801-r5
index f68f3dfa048a..8c734ced34e3 100644
--- a/metadata/md5-cache/app-text/xhtml1-20020801-r5
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r5
@@ -3,9 +3,9 @@ DEPEND=app-text/sgml-common dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
 EAPI=5
 HOMEPAGE=http://www.w3.org/TR/xhtml1/
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=W3C
 SLOT=0
 SRC_URI=http://www.w3.org/TR/xhtml1/xhtml1.tgz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=02c6efc161e1ee589fe31f99e1635697
+_md5_=bb2e44fdebb7d1a15f01bb71c79d6a92
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.26-r1 b/metadata/md5-cache/app-text/xmlto-0.0.26-r1
index 24b2f9380c41..c7d1b3244599 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.26-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.26-r1
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook documents to a variety of outp
 EAPI=5
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.26.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=856d4aadc7371bf720d9889a8b4e19d6
+_md5_=acb86d362b8236d52798b8f10b51f5dc
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r1 b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
index 9b87317c4b15..63ee1f899ed2 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook documents to a variety of outp
 EAPI=5
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=993e9462f8f94569b9c64a52e461ef60
+_md5_=b9eac9c7336387accf6ef2fdde22b9dc
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index a496f41be2fb..226f2d0aa25d 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506 b/metadata/md5-cache/app-vim/eselect-syntax-20070506
index 7e47424b9e8c..63e005f95be8 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506
@@ -3,10 +3,10 @@ DEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors
 DESCRIPTION=vim plugin: Eselect syntax highlighting, filetype and indent settings
 EAPI=0
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=vim
 RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d1e51400f3b0603292c3fd408a589ae5
+_md5_=6abae83eab025bc319ee154d36ae37f7
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20160530 b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
index 1f7a03cfd6ce..79bca94a09da 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20160530
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20160530.tar.gz -> gentoo-syntax-20160530.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d74bed9bb2a7043de346dea5e1ab3b5b
+_md5_=79c7dbb9cf5374a586a3fc292eb90e05
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20170225 b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
index 575bc9be761b..600ad0f1bddf 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20170225
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20170225.tar.gz -> gentoo-syntax-20170225.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7340c254a478cb4c6eda193b8c466247
+_md5_=3625be9fa6f7488d5165f6bb83fc286c
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-99999999 b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
index 2120370753fd..600cf1ed4fc8 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-99999999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
@@ -8,4 +8,4 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f8a6cd85ed215434d5c604e4a5ab2f7d
+_md5_=bce26f30f443f821f1c4b0683b2fa982
diff --git a/metadata/md5-cache/app-vim/pam-syntax-20060424 b/metadata/md5-cache/app-vim/pam-syntax-20060424
index d76074db76fb..bb00bb75180f 100644
--- a/metadata/md5-cache/app-vim/pam-syntax-20060424
+++ b/metadata/md5-cache/app-vim/pam-syntax-20060424
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: PAM configuration syntax highlighting
 EAPI=0
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=735
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pam-syntax-20060424.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pam-syntax-20060424.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e3f5cd546d0a03fc8b2ac3cefb497218
+_md5_=c35cae6ef1bddbe9d2ff35ea259711a2
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20160829 b/metadata/md5-cache/app-vim/rust-vim-1_pre20160829
deleted file mode 100644
index a597d33743a1..000000000000
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20160829
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim configuration for Rust
-EAPI=6
-HOMEPAGE=http://www.rust-lang.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/rust-lang/rust.vim/tarball/fc11d02fee330df7b30c83a80f09dd0c60ab43ce -> rust-vim-1_pre20160829.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b78e321336d8e513facb0e21465dd7e3
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20161204 b/metadata/md5-cache/app-vim/rust-vim-1_pre20161204
deleted file mode 100644
index 0da627966ed0..000000000000
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20161204
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim configuration for Rust
-EAPI=6
-HOMEPAGE=http://www.rust-lang.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/rust-lang/rust.vim/tarball/eed97e75117faaf210cb6103cf39a797fe21bfbe -> rust-vim-1_pre20161204.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=15794d380080cccc0456adc5d48f6aee
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20180125 b/metadata/md5-cache/app-vim/rust-vim-1_pre20180125
new file mode 100644
index 000000000000..c9610ae33f0b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/rust-vim-1_pre20180125
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Vim configuration for Rust
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/rust-lang/rust.vim/tarball/8e75da9834abb22f8d7ece3f4ca4324a14fa18a6 -> rust-vim-1_pre20180125.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=b43e98b85ddb6841d1520a8b5ec01746
diff --git a/metadata/md5-cache/app-vim/securemodelines-20140926 b/metadata/md5-cache/app-vim/securemodelines-20140926
index 202e051fe6ef..995cf0b6c6f7 100644
--- a/metadata/md5-cache/app-vim/securemodelines-20140926
+++ b/metadata/md5-cache/app-vim/securemodelines-20140926
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: secure, user-configurable modeline support
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d4a4b1520afe4a8a817341fde0783c4c
+_md5_=d18712b7893109fa355eab80c93dc37d
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index 6077194c1e07..4a308e3dd94d 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: tmux support for vim
 EAPI=6
 HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=vim.org
 RDEPEND=!<app-misc/tmux-2.5-r2 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.zip -> vim-tmux-3.0.0.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=bcb637d470510d1c0fa7a2770f1fc632
+_md5_=46c0fe01b5e044a998e08c0645f1a3b3
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index f4ae5de90bf5..e5fe47cfbf79 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/aws-2016 b/metadata/md5-cache/dev-ada/aws-2016
index 7f591c43e88f..e63728291833 100644
--- a/metadata/md5-cache/dev-ada/aws-2016
+++ b/metadata/md5-cache/dev-ada/aws-2016
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
 IUSE=+gnat_2016 gnat_2017
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static]
+RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> aws-gpl-2016-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=7e0844cdb9c635c0bea459c5a79e3bbf
+_md5_=32dd0d26ce05805874f2b3f57f2e224e
diff --git a/metadata/md5-cache/dev-ada/aws-2017 b/metadata/md5-cache/dev-ada/aws-2017
index 984a043b6a54..6788b197ae94 100644
--- a/metadata/md5-cache/dev-ada/aws-2017
+++ b/metadata/md5-cache/dev-ada/aws-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
 IUSE=gnat_2016 +gnat_2017
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static]
+RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 -> aws-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=f6b75bbdefd2cc427a126048f5cacf2b
+_md5_=f5ca6c499055d6c20f50768cea76ad4f
diff --git a/metadata/md5-cache/dev-ada/libgpr-2017 b/metadata/md5-cache/dev-ada/libgpr-2017
index c54c7be29a4d..17c5132878cf 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2017
+++ b/metadata/md5-cache/dev-ada/libgpr-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[static,gnat_2016=,gnat_2017=] gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild
+DEPEND=dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=] gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 +gnat_2017 +shared static static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[static,gnat_2016=,gnat_2017=] gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+RDEPEND=dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=] gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 REQUIRED_USE=|| ( shared static static-pic ) ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> gprbuild-gpl-2017-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=99c4032f0254e093becd60c5daec6797
+_md5_=2c20f729cb3547a9c9926ebcc1bbebe9
diff --git a/metadata/md5-cache/dev-ada/xmlada-2017 b/metadata/md5-cache/dev-ada/xmlada-2017
index 5e045cfa1ce9..a9916a430366 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2017
+++ b/metadata/md5-cache/dev-ada/xmlada-2017
@@ -3,12 +3,12 @@ DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 +gnat_2017 +shared static static-pic
+IUSE=gnat_2016 +gnat_2017 +shared static-libs static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=|| ( shared static static-pic ) ^^ ( gnat_2016 gnat_2017 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=4bd8fe5cc6a717abc1502f458ed20f22
+_md5_=549bdea6fae6979163c5fcb2a7c75f44
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 079fc78ff3b6..b67f5dc41d76 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/eigen-2.0.17 b/metadata/md5-cache/dev-cpp/eigen-2.0.17
deleted file mode 100644
index 0fa2d99c6f6b..000000000000
--- a/metadata/md5-cache/dev-cpp/eigen-2.0.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=examples? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !dev-cpp/eigen:0 doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=C++ template library for linear algebra
-EAPI=6
-HOMEPAGE=http://eigen.tuxfamily.org/
-IUSE=debug doc examples test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=examples? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !dev-cpp/eigen:0
-RESTRICT=test
-SLOT=2
-SRC_URI=https://bitbucket.org/eigen/eigen/get/2.0.17.tar.bz2 -> eigen-2.0.17.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60135d115d6e887fcf6c6d2277feef8a
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2 b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
index f5392bc05b74..317e7722a9fe 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
+++ b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu dev-qt/qtcore:4 virtual/opengl virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( virtual/fortran )
+DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu virtual/opengl virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( virtual/fortran )
 DESCRIPTION=C++ template library for linear algebra
 EAPI=6
 HOMEPAGE=http://eigen.tuxfamily.org/
@@ -10,4 +10,4 @@ RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.2.8.tar.bz2 -> eigen-3.2.8.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0108d756da145cbeaeae92bbae71f8a6
+_md5_=84d8b7bb4c26dbb1394252892a070d63
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.3 b/metadata/md5-cache/dev-cpp/eigen-3.3.3
index 61ea03c1d496..8008e4bd3ffb 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.3
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu dev-qt/qtcore:4 virtual/opengl virtual/pkgconfig cuda? ( dev-util/nvidia-cuda-toolkit ) ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( virtual/fortran )
+DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu virtual/opengl virtual/pkgconfig cuda? ( dev-util/nvidia-cuda-toolkit ) ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( virtual/fortran )
 DESCRIPTION=C++ template library for linear algebra
 EAPI=6
 HOMEPAGE=http://eigen.tuxfamily.org/
@@ -10,4 +10,4 @@ RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2 -> eigen-3.3.3.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22def90ad97b0a9491c9ff444828ac9d
+_md5_=26686e2bce12a0300735dead47123109
diff --git a/metadata/md5-cache/dev-cpp/gsl-0_pre20180108 b/metadata/md5-cache/dev-cpp/gsl-0_pre20180108
deleted file mode 100644
index 899bd556f77d..000000000000
--- a/metadata/md5-cache/dev-cpp/gsl-0_pre20180108
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-cpp/catch-1.11.0 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Guideline Support Library implementation by Microsoft
-EAPI=6
-HOMEPAGE=https://github.com/Microsoft/GSL
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/Microsoft/gsl/tarball/9d65e74400976b3509833f49b16d401600c7317d -> gsl-0_pre20180108.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e6cff74f6dd69321be1b2ec7eba15c0
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
index 801ff532d671..ac23ffde85fe 100644
--- a/metadata/md5-cache/dev-cpp/lucene++-3.0.7
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=C++ port of Lucene library, a high-performance, full-featured text s
 EAPI=5
 HOMEPAGE=https://github.com/luceneplusplus/LucenePlusPlus
 IUSE=debug
-KEYWORDS=amd64 hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 hppa ~ppc ppc64 sparc x86
 LICENSE=|| ( LGPL-3 Apache-2.0 )
 RDEPEND=dev-libs/boost:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.7.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=62387a26587943db2558195bdd989539
+_md5_=865ab89754f4a035238d63c133bc65ce
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-0_pre20180108 b/metadata/md5-cache/dev-cpp/ms-gsl-0_pre20180108
new file mode 100644
index 000000000000..70efcfe12a97
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-0_pre20180108
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( >=dev-cpp/catch-1.11.0 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Guideline Support Library implementation by Microsoft
+EAPI=6
+HOMEPAGE=https://github.com/Microsoft/GSL
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/Microsoft/gsl/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ms-gsl-0_pre20180108.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dae092e224a63b675a9243c2c21d4102
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 768e29656a05..bbfb08b92e57 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/etcd-3.2.15 b/metadata/md5-cache/dev-db/etcd-3.2.15
new file mode 100644
index 000000000000..72f8a088cdda
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.2.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.2.15.tar.gz -> etcd-3.2.15.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.0_rc4 b/metadata/md5-cache/dev-db/etcd-3.3.0_rc4
new file mode 100644
index 000000000000..06fe8c952592
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.0_rc4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.0-rc.4.tar.gz -> etcd-3.3.0_rc4.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9b68da08bd584eed044d331959fcf0c2
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.341 b/metadata/md5-cache/dev-db/freetds-1.00.341
new file mode 100644
index 000000000000..bfb5c6183808
--- /dev/null
+++ b/metadata/md5-cache/dev-db/freetds-1.00.341
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+DESCRIPTION=Tabular Datastream Library
+EAPI=6
+HOMEPAGE=http://www.freetds.org/
+IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-devel/binutils net-dns/bind-tools
+REQUIRED_USE=?? ( iodbc odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.1.00.341.tar.gz
+_md5_=d2cf458cc3211e7d9b8e5d28eb53c20e
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.18 b/metadata/md5-cache/dev-db/lmdb-0.9.18
index ed1ac7ce7af3..85018887c1d4 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.18
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.18
@@ -3,10 +3,10 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=5
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP
 RDEPEND=!=net-nds/openldap-2.4.40
 SLOT=0/0.9.18
 SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.18.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d3e431fd2bee05b089a9eabbda470150
+_md5_=843501e219613125273d24b78c7e4623
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.19 b/metadata/md5-cache/dev-db/lmdb-0.9.19
index 57dacfe47765..fd7a03577f89 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.19
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.19
@@ -3,10 +3,10 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=6
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=OPENLDAP
 RDEPEND=!=net-nds/openldap-2.4.40
 SLOT=0/0.9.19
 SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6a5040d4066dcfa38424a5cd139a445
+_md5_=455522c0f98f20d060d08883e1b99f78
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.30-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.30-r1
index 2061897e505d..860ddd3af95a 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.30-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.30-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.30/source/mariadb-10.0.30.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0cead00eac7b0d27000b2a71183518b
+_md5_=e316845f51c3c83ab1aabe6cce52a4d7
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.32-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
index 3f44d928057f..253ccfdc32ca 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.32/source/mariadb-10.0.32.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1af997d1fae5bc16059de5d5770f708f
+_md5_=a84844aa093cfc91918a8f2f7e34bcf8
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.33 b/metadata/md5-cache/dev-db/mariadb-10.0.33
index 5908591d56fc..1cc191a5e293 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.33
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.33
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.33/source/mariadb-10.0.33.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b781884547d22e512f9ca76742f0e7d5
+_md5_=1762591451abc58da9e61e8dd169e83e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.24-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
index e38435a70808..25a2c2498fb5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz mirror://gentoo/mysql-extras-20170316-1355Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170316-1355Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3b3fe0a461af8472314247270f9bd68
+_md5_=ae8f0bf53d50193ae4e7dacde82dd0ca
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.26-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
index c98daa5e2fd5..a1aff4170f38 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.26/source/mariadb-10.1.26.tar.gz mirror://gentoo/mysql-extras-20170830-1210Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170830-1210Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1ef9b21e9390e28d47a0d180bb538ef
+_md5_=8a869fd91be4e3e41cba1fa3efa40a27
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.29 b/metadata/md5-cache/dev-db/mariadb-10.1.29
index 2b8944604071..b3ce60843eca 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.29
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.29
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.29/source/mariadb-10.1.29.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d200a4a4318438425fa76ea32d639a7
+_md5_=e50c02aff352666f749425533fb219fc
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.30 b/metadata/md5-cache/dev-db/mariadb-10.1.30
index 1abd4323f35a..f0b0bb22ebbf 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.30
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.30
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.30/source/mariadb-10.1.30.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af55f7c6c3cda11fdd5e699c525b034b
+_md5_=a527789670c179a0174360e9b9b834f9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.10 b/metadata/md5-cache/dev-db/mariadb-10.2.10
index 7b4be28e745e..af7cbdf1159b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.10
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.10
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.10/source/mariadb-10.2.10.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47a0f11bba882d54525789e3297f1f6f
+_md5_=4d69f539f8da5ec6bc14cc4247a74aae
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.11 b/metadata/md5-cache/dev-db/mariadb-10.2.11
index b0539e9558d7..a86ebfb61d95 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.11
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.11
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.11/source/mariadb-10.2.11.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01dd765471554616345920097d731b3e
+_md5_=923162a419d0c505cac7265e78d534cd
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.12 b/metadata/md5-cache/dev-db/mariadb-10.2.12
index 990fc25707ce..98011d701074 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.12
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.12
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=http://mariadb.org/
 IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.12/source/mariadb-10.2.12.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01c28511439b0b60f6dc3e20260ce5a9
+_md5_=923162a419d0c505cac7265e78d534cd
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.58 b/metadata/md5-cache/dev-db/mariadb-5.5.58
index fed769ffd252..a77a7c4b1b7d 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.58
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.58
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam tokudb jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/source/mariadb-5.5.58.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aad9a4a2850cd6a321b0997dce0dbfe
+_md5_=572c80a22f908204245c3be6df9ec22f
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.59 b/metadata/md5-cache/dev-db/mariadb-5.5.59
index ee837ed12fec..57a31aee5ccd 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.59
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.59
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam tokudb jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.59/source/mariadb-5.5.59.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.59/kvm-tarbake-jaunty-x86/mariadb-5.5.59.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdfac5366f2842f64e0f1035483389b3
+_md5_=a829439e1a2ce7ff4bda23d4fa22b710
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.58 b/metadata/md5-cache/dev-db/mysql-5.5.58
index 197606c89457..4aee5a32dda9 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.58
+++ b/metadata/md5-cache/dev-db/mysql-5.5.58
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.58.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.58.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.58.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=331f1ac02afb273a051077905f8c569f
+_md5_=5b730bdda4fece6f00410e0825ef5fbf
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.59 b/metadata/md5-cache/dev-db/mysql-5.5.59
index aa19d8e04166..8715a1af3eba 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.59
+++ b/metadata/md5-cache/dev-db/mysql-5.5.59
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.59.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.59.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.59.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b96b7754e2b2dcf259dd2b0a366e057
+_md5_=fda36dc2f38bb76fa7a8a315d4c2edb0
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.36-r1 b/metadata/md5-cache/dev-db/mysql-5.6.36-r1
index b1dee39066ec..3f4332f1d3c0 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.36-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.6.36-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.36.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.36.tar.gz mirror://gentoo/mysql-extras-20170302-1359Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170302-1359Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52d337b9fcb6679f85e6bafeeb7c5b79
+_md5_=a8450f805b7d578280dd4d9f67293b4f
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.37-r1 b/metadata/md5-cache/dev-db/mysql-5.6.37-r1
index 1e0c9807155f..25e01f83e717 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.37-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.6.37-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.37.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.37.tar.gz mirror://gentoo/mysql-extras-20170719-1335Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170719-1335Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd09ac7c847a18d657c4fc6cd43b6900
+_md5_=a3ed2cf1c5af5a5535d542d6ba2e6e80
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.38 b/metadata/md5-cache/dev-db/mysql-5.6.38
index a8100dad3bf9..f875aeaa4f17 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.38
+++ b/metadata/md5-cache/dev-db/mysql-5.6.38
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=numa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=numa? ( sys-process/numactl:= ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.38.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.38.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d794023b5b2dfbda9878dfedfd578843
+_md5_=2f744da3036539745af1aa839736a90d
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.39 b/metadata/md5-cache/dev-db/mysql-5.6.39
index d3c41872d9e8..3bf3b4263ed9 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.39
+++ b/metadata/md5-cache/dev-db/mysql-5.6.39
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=numa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=numa? ( sys-process/numactl:= ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.39.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.39.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3534244726c1014dc356148fc492db42
+_md5_=fa3dd134b1945e4f9c96e952de1f239d
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.1-r1 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.1-r1
deleted file mode 100644
index b33c5878f050..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2
-SLOT=0
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	s6	9fd5ce6a54658cb380091f4c3acc544e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=190e52d532f8684cde607cd630abeb38
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r2 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r2
deleted file mode 100644
index 57463c992b2d..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2
-SLOT=0
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	s6	9fd5ce6a54658cb380091f4c3acc544e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=616605f4fa83bf389fade3b517062cd7
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3
new file mode 100644
index 000000000000..73df4d4082b7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gentoo MySQL init scripts.
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2
+SLOT=0
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	s6	9fd5ce6a54658cb380091f4c3acc544e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0f42058be87d462636100469d2024fb1
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2 b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2
index 41e6e1e25c41..c84fbba2b1bb 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
 EAPI=6
 HOMEPAGE=http://www.percona.com/software/percona-server
 IUSE=numa pam tokudb tokudb-backup-plugin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.37-82.2/source/tarball/percona-server-5.6.37-82.2.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=833309d39d9587ea5ce28640219c7a3d
+_md5_=146be181c5d63e377079035221b9bb36
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0 b/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0
index 9752f12b48e6..c96520d4232f 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
 EAPI=6
 HOMEPAGE=https://www.percona.com/software/percona-server
 IUSE=numa pam tokudb tokudb-backup-plugin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.38-83.0/source/tarball/percona-server-5.6.38-83.0.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59b4250810d2a0920f36354ae845a814
+_md5_=79c52cf93b0d1ea94be800fec7565f47
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.7.2 b/metadata/md5-cache/dev-db/pgbouncer-1.7.2
deleted file mode 100644
index 9d6209007c6b..000000000000
--- a/metadata/md5-cache/dev-db/pgbouncer-1.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-libs/glibc-2.10 libevent? ( >=dev-libs/libevent-2.0 ) udns? ( >=net-libs/udns-0.1 ) app-text/docbook-xml-dtd:4.5 app-text/xmlto >=app-text/asciidoc-8.4
-DESCRIPTION=Lightweight connection pooler for PostgreSQL
-EAPI=5
-HOMEPAGE=https://pgbouncer.github.io
-IUSE=debug doc libevent udns
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=sys-libs/glibc-2.10 libevent? ( >=dev-libs/libevent-2.0 ) udns? ( >=net-libs/udns-0.1 )
-REQUIRED_USE=libevent? ( !udns ) udns? ( !libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pgbouncer.github.io/downloads/files/1.7.2/pgbouncer-1.7.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bfe21c451322bbcf274887f3250e2017
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.8.1 b/metadata/md5-cache/dev-db/pgbouncer-1.8.1
index f79134cec670..259b39e5f4ce 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.8.1
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight connection pooler for PostgreSQL
 EAPI=6
 HOMEPAGE=https://pgbouncer.github.io
 IUSE=+c-ares debug doc pam ssl -udns
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.8.1/pgbouncer-1.8.1.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7f070d92936cb644b315bcd12817da15
+_md5_=82f64d37ddc8e13652b3089389c84c85
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.0 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.0
index c57425ceca4d..0d765392f23f 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.0
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.7.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[
 SLOT=4.7.0
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.0/phpMyAdmin-4.7.0-all-languages.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=80596bbf4641e09fa19b29d12cbe7991
+_md5_=ac91ecf20debe8f5da28f9a9b16b801e
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.1
deleted file mode 100644
index 2720b3ab7473..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.1
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.1/phpMyAdmin-4.7.1-all-languages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=df9318253ec701672643ef91ae43292a
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.2 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.2
deleted file mode 100644
index 8137da56dbf5..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.2
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.2/phpMyAdmin-4.7.2-all-languages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=df9318253ec701672643ef91ae43292a
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.5 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.5
deleted file mode 100644
index 49d916cc865b..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.5
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.5/phpMyAdmin-4.7.5-all-languages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=df9318253ec701672643ef91ae43292a
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.5-r1 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.5-r1
deleted file mode 100644
index 61fd61255e1f..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.5-r1
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.5/phpMyAdmin-4.7.5-all-languages.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=644c2736eeb815325156541cdd8949c0
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.7 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.7
new file mode 100644
index 000000000000..7a5aa3b7243b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.7.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=5
+HOMEPAGE=https://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+SLOT=4.7.7
+SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.7/phpMyAdmin-4.7.7-all-languages.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=cdbe221c06f6efd28d7958f7a85b98bd
diff --git a/metadata/md5-cache/dev-db/postgresql-10.0 b/metadata/md5-cache/dev-db/postgresql-10.0
index 5b051457bf94..3ec3eb765941 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.0
+++ b/metadata/md5-cache/dev-db/postgresql-10.0
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
 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=10
 SRC_URI=mirror://postgresql/source/v10.0/postgresql-10.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fe66c86c9d2a77f825e1b1ff5acd62c6
+_md5_=8c0a5b032810bdfde0df69d1c634b929
diff --git a/metadata/md5-cache/dev-db/postgresql-10.0-r1 b/metadata/md5-cache/dev-db/postgresql-10.0-r1
index 2420e0f46f11..6e6e9ef2f402 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.0-r1
+++ b/metadata/md5-cache/dev-db/postgresql-10.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
 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=10
 SRC_URI=mirror://postgresql/source/v10.0/postgresql-10.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1dcdd57bf98ade0f8db3f8d9908a16d9
+_md5_=47887186344220a6ef3f6467789993df
diff --git a/metadata/md5-cache/dev-db/postgresql-10.1 b/metadata/md5-cache/dev-db/postgresql-10.1
index 25d7771ccd02..f48baf63a00a 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.1
+++ b/metadata/md5-cache/dev-db/postgresql-10.1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
 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=10
 SRC_URI=mirror://postgresql/source/v10.1/postgresql-10.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b3f30d9d57a57f88592f67d84407cf06
+_md5_=b3eac2c3feb8260fdc4e79eeda6c4c77
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.19 b/metadata/md5-cache/dev-db/postgresql-9.2.19
index 5d5bab5ec21e..8a7a6b062cbd 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.19
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.19/postgresql-9.2.19.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a512e04bd3037ecc80a42eb8eeb7e815
+_md5_=127ce2b6233788a91c84914d353cc87b
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.22 b/metadata/md5-cache/dev-db/postgresql-9.2.22
index 03bde5d4be53..8caf930f0fd0 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.22
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 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=9.2
 SRC_URI=mirror://postgresql/source/v9.2.22/postgresql-9.2.22.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=314af7a7da7f2739fffb829f74dc361c
+_md5_=419e400fd03fc9fa6ba23a1470e041f9
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.23 b/metadata/md5-cache/dev-db/postgresql-9.2.23
index 6c5c77bbc786..7e51012187b2 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.23
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 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=9.2
 SRC_URI=mirror://postgresql/source/v9.2.23/postgresql-9.2.23.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17430d590281bbbb2378ea463b165aca
+_md5_=168058e5be61b7d81b7178403e727b88
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.23-r1 b/metadata/md5-cache/dev-db/postgresql-9.2.23-r1
index 2c7b7161b270..bd8150ff0a9d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.23-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 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=9.2
 SRC_URI=mirror://postgresql/source/v9.2.23/postgresql-9.2.23.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=100d142f3f8ad2038c09c58dc2060eab
+_md5_=fdc39954dd77afdff09e2752e8ee87d6
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.24 b/metadata/md5-cache/dev-db/postgresql-9.2.24
index 90b2b883ba1b..4f23e1f5240e 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.24
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.24
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 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=9.2
 SRC_URI=mirror://postgresql/source/v9.2.24/postgresql-9.2.24.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=37e14bd8de6ba641a92a6026aeb759ca
+_md5_=09df8bc69fbec9f9faf490a4fb38d207
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.15 b/metadata/md5-cache/dev-db/postgresql-9.3.15
index 48a2c7359414..cf4e00630a55 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.15
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.15/postgresql-9.3.15.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2b5aedaee8e72f8dbc566bb828a57a73
+_md5_=55094c3e2271d1fa9acfb1b12c3be0e1
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.18 b/metadata/md5-cache/dev-db/postgresql-9.3.18
index 1ac2b528b65f..76cd249c22c9 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.18
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 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=9.3
 SRC_URI=mirror://postgresql/source/v9.3.18/postgresql-9.3.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b3186c7d0dbd76d767c86bfc91aff151
+_md5_=1bcb35157215779722308fd9462bc1d9
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.19 b/metadata/md5-cache/dev-db/postgresql-9.3.19
index 8dc32a706a64..2d51bb6abc7a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.19
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 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=9.3
 SRC_URI=mirror://postgresql/source/v9.3.19/postgresql-9.3.19.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4ed0c31811f66a72be20d539985b655f
+_md5_=aa2f847f79a96e67f22944e248468152
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.19-r1 b/metadata/md5-cache/dev-db/postgresql-9.3.19-r1
index 35c8dd49f44b..a2001cbc9b61 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.19-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.19-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 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=9.3
 SRC_URI=mirror://postgresql/source/v9.3.19/postgresql-9.3.19.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=670e128ecf17505c7c8f29cf9e404c0a
+_md5_=a4d018e9ad44a8a315a13c970a9116ae
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.20 b/metadata/md5-cache/dev-db/postgresql-9.3.20
index 2a0855f66d88..e4ea3ae2fdbb 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.20
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.20
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 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=9.3
 SRC_URI=mirror://postgresql/source/v9.3.20/postgresql-9.3.20.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4bdb5e6baee53da3b3cf975e657f026d
+_md5_=b63921f55cf0640f6e1b14f5920eb415
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.10 b/metadata/md5-cache/dev-db/postgresql-9.4.10
index a325a6bbf13d..a3bae0cdfba1 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.10
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.10/postgresql-9.4.10.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5dfa2c3f4cd8e75b669ed87eb08024d5
+_md5_=f5d4083c13511e3e59543f74805ea37a
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.13 b/metadata/md5-cache/dev-db/postgresql-9.4.13
index 0b1b8b7d99c6..cd98c1fc0660 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.13
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 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=9.4
 SRC_URI=mirror://postgresql/source/v9.4.13/postgresql-9.4.13.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b5d2f1932015597a52fb4432d2740a1f
+_md5_=0fe93287d96c4ad9429d6bf08620c84d
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.14 b/metadata/md5-cache/dev-db/postgresql-9.4.14
index fbc9484d50e8..7c22a551d60a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.14
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 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=9.4
 SRC_URI=mirror://postgresql/source/v9.4.14/postgresql-9.4.14.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=da01da39572443c97b223c60f49adfda
+_md5_=285c0204455c3eed9f550ed549af7068
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.14-r1 b/metadata/md5-cache/dev-db/postgresql-9.4.14-r1
index ca55e5816238..bf2525991804 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.14-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 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=9.4
 SRC_URI=mirror://postgresql/source/v9.4.14/postgresql-9.4.14.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bd174353fb6cc54f17119a041fef713f
+_md5_=b0f4e9040eefad58e401c8b974b80d24
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.15 b/metadata/md5-cache/dev-db/postgresql-9.4.15
index 885022c3d231..cb724fbc48fe 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.15
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 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=9.4
 SRC_URI=mirror://postgresql/source/v9.4.15/postgresql-9.4.15.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e96d65244c2631c6575c391a37ba6799
+_md5_=77e5bdd69134a3ae537958e285315a36
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.10 b/metadata/md5-cache/dev-db/postgresql-9.5.10
index 71ac5bb496da..0e89d8884df4 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.10
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.10
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 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=9.5
 SRC_URI=mirror://postgresql/source/v9.5.10/postgresql-9.5.10.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f2dcf1dc8623667e830256dcc847d732
+_md5_=d83ffdd9322d39afb37db766399f19b3
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.5 b/metadata/md5-cache/dev-db/postgresql-9.5.5
index d561f3c46a1c..3323867fd941 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.5
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 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=9.5
 SRC_URI=mirror://postgresql/source/v9.5.5/postgresql-9.5.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4f62a9b7e29dd79f779541575dce41e2
+_md5_=0098ffd27597a5f15c22e1110ac497b9
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.8 b/metadata/md5-cache/dev-db/postgresql-9.5.8
index b587d1f2c576..f1daa0205801 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.8
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.8
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 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=9.5
 SRC_URI=mirror://postgresql/source/v9.5.8/postgresql-9.5.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=db12bd93561e57545d47c178b4c7fcf5
+_md5_=6a65b00d8b81a3637a0a5742ab2c53e8
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.9 b/metadata/md5-cache/dev-db/postgresql-9.5.9
index 067f022f3abe..e2ce371f020c 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.9
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.9
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 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=9.5
 SRC_URI=mirror://postgresql/source/v9.5.9/postgresql-9.5.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=59ddee28f87036691eb9dbba4521c377
+_md5_=bb14d6d9fa0a15ea9f0bd2a4743081dc
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.9-r1 b/metadata/md5-cache/dev-db/postgresql-9.5.9-r1
index 770c3ba1c42f..9205c3831e6a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.9-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 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=9.5
 SRC_URI=mirror://postgresql/source/v9.5.9/postgresql-9.5.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ebaefaf8cd6d051aa06bc5fcd0de164e
+_md5_=f514610e9418fe50b6ca6b4118607b5d
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.4 b/metadata/md5-cache/dev-db/postgresql-9.6.4
index 28396d44f577..66a45e074d0a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.4
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 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=9.6
 SRC_URI=mirror://postgresql/source/v9.6.4/postgresql-9.6.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ce588a8409098c02bdba92a5fac8805b
+_md5_=9514a1746452a82e80aa68d79c941fa4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.5 b/metadata/md5-cache/dev-db/postgresql-9.6.5
index 4bd1dbef80d0..97bfd0117c8d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.5
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 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=9.6
 SRC_URI=mirror://postgresql/source/v9.6.5/postgresql-9.6.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=108b6b163d21904624524ae02acc22cd
+_md5_=c7eb0cac2fb79e3e5d641d4f054488c5
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.5-r1 b/metadata/md5-cache/dev-db/postgresql-9.6.5-r1
index 1d6001d1d0ea..5d6b84c248c7 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.5-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 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=9.6
 SRC_URI=mirror://postgresql/source/v9.6.5/postgresql-9.6.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c4fd1a3fb0da7c16c1d980973bf8a269
+_md5_=ec15587ac0be7f42f3fe99d8b364dd35
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.6 b/metadata/md5-cache/dev-db/postgresql-9.6.6
index f7ca0216db3f..0dfa77ffd278 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.6
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 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=9.6
 SRC_URI=mirror://postgresql/source/v9.6.6/postgresql-9.6.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2558c402a0cd4e6d24a0aeb41c3a47f8
+_md5_=f7724fd178fc8be898a5254cceea3ab0
diff --git a/metadata/md5-cache/dev-db/pspg-0.8.0 b/metadata/md5-cache/dev-db/pspg-0.8.0
index 80777394dddb..d32b84372316 100644
--- a/metadata/md5-cache/dev-db/pspg-0.8.0
+++ b/metadata/md5-cache/dev-db/pspg-0.8.0
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:*
 DESCRIPTION=A better pager for psql and mysql
 EAPI=6
 HOMEPAGE=https://github.com/okbob/pspg
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/0.8.0.tar.gz -> pspg-0.8.0.tar.gz
-_md5_=b10e378b4aa3261a94d6a9a3c0c5bdbe
+_md5_=f2f74bea8fa504eaf4860e89e683e1ee
diff --git a/metadata/md5-cache/dev-db/psqlodbc-10.00.0000 b/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
index 84b7a60be809..1c5d4b1ec8c9 100644
--- a/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
@@ -4,9 +4,9 @@ DESCRIPTION=Official ODBC driver for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc iodbc ssl threads
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
 SLOT=0
 SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.00.0000.tar.gz
-_md5_=9ddd3c05cac84fb59f03ff2132ed38ff
+_md5_=0f116a4fd5e103bdf01297da2d1f3792
diff --git a/metadata/md5-cache/dev-db/sqlite-3.19.3 b/metadata/md5-cache/dev-db/sqlite-3.19.3
index 3f59750758f3..53b88a50a625 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.19.3
+++ b/metadata/md5-cache/dev-db/sqlite-3.19.3
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test 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=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3190300.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3190300.zip ) test? ( https://sqlite.org/2017/sqlite-src-3190300.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3190300.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3190300.tar.gz ) ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b842293f39611e4202e79a238fd6b28
+_md5_=ce395fef73b285e604d323732d4d8163
diff --git a/metadata/md5-cache/dev-db/sqlite-3.20.0 b/metadata/md5-cache/dev-db/sqlite-3.20.0
index 07c8488a02d3..a6bf3cd8c580 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.20.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3200000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3200000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3200000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3200000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz ) ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f4266d722d8148da16d9c968837583b2
+_md5_=d7833d8112974d88659bcd65fe093225
diff --git a/metadata/md5-cache/dev-db/sqlite-3.20.1-r1 b/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
index b57835f922ab..680be0299515 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
+++ b/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test 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=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3200100.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) test? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz ) ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f5060ae7ebbbc161ae5e8fb630644c11
+_md5_=fc64a40954f10c4fb6c31bf272947fed
diff --git a/metadata/md5-cache/dev-db/sqlite-3.21.0 b/metadata/md5-cache/dev-db/sqlite-3.21.0
index 79ef02cbb993..271065676121 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.21.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.21.0
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3210000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz ) ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a01de904b69d9fd8768040d7a8a53428
+_md5_=65dc4230325d2c21afbe52eb01ba68e8
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 3f647dccd4bd..e870066c1c66 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/gitrev-1.3.1 b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
new file mode 100644
index 000000000000..a902e042e9b8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compile git revision info into Haskell projects
+EAPI=6
+HOMEPAGE=https://github.com/acfoltzer/gitrev
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/gitrev/1.3.1/gitrev-1.3.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=8a129b825a62d7fc9f9b8695b9dfd070
diff --git a/metadata/md5-cache/dev-haskell/language-docker-2.0.1 b/metadata/md5-cache/dev-haskell/language-docker-2.0.1
new file mode 100644
index 000000000000..5b36c983e8b2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-docker-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/free:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/th-lift-instances:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/language-docker#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/free:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/th-lift-instances:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/2.0.1
+SRC_URI=mirror://hackage/packages/archive/language-docker/2.0.1/language-docker-2.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1c451a30f6ec354c00297f68c4835c66
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 79516452e802..fe71d1d9c3ca 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1
deleted file mode 100644
index 27cc93d8900e..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
-DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jdk-8u152-linux-x64.tar.gz examples? ( jdk-8u152-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u152-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u152-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u152-linux-i586.tar.gz examples? ( jdk-8u152-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-8u152-solaris-x64.tar.gz examples? ( jdk-8u152-solaris-x64-demos.tar.gz ) ) sparc64-solaris? ( jdk-8u152-solaris-sparcv9.tar.gz examples? ( jdk-8u152-solaris-sparcv9-demos.tar.gz ) ) x64-macos? ( jdk-8u152-macosx-x64.dmg examples? ( jdk-8u152-macosx-x86_64-demos.zip ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bfeb2e5d01c1c31e24d249e9abeb21be
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162
index a28821605775..839c7295e3b4 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162
@@ -4,7 +4,7 @@ DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=6
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
 REQUIRED_USE=javafx? ( alsa fontconfig )
@@ -12,4 +12,4 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u162-linux-x64.tar.gz examples? ( jdk-8u162-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u162-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u162-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u162-linux-i586.tar.gz examples? ( jdk-8u162-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u162-macosx-x64.dmg examples? ( jdk-8u162-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u162-solaris-sparcv9.tar.gz examples? ( jdk-8u162-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u162-solaris-x64.tar.gz examples? ( jdk-8u162-solaris-x64-demos.tar.gz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59896844910e6871493df0de0983d524
+_md5_=3b6119f95b2ad86fe2c38383ae8311cb
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4 b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4
index e17cce03dc22..ae96ccd3864c 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4
@@ -12,4 +12,4 @@ RESTRICT=fetch preserve-libs strip
 SLOT=9
 SRC_URI=amd64? ( jdk-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jdk-9.0.4_osx-x64_bin.dmg ) sparc64-solaris? ( jdk-9.0.4_solaris-sparcv9_bin.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=160eff78715510662b3eb071cdca72f8
+_md5_=689d1e5013b4e4b7996bdf199f7cdc26
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1
deleted file mode 100644
index 1605c3d4fae9..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
-DEPEND=app-arch/zip >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jre-8u152-linux-x64.tar.gz ) x86? ( jre-8u152-linux-i586.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a55c92a8cd24a07b25e84a8d23035c08
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162
index b78359b97328..b16a673864cc 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=6
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u162-linux-x64.tar.gz ) x86? ( jre-8u162-linux-i586.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c6ad888b8cffd26c2240f452221806b
+_md5_=898c07c9b6cc8f5bd2a775c2f18cec9e
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
deleted file mode 100644
index e2fc456c8b33..000000000000
--- a/metadata/md5-cache/dev-java/swt-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) x11-proto/inputproto virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=2
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
-SLOT=3.5
-SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-ppc.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b8a6955dfe24f2c21d59b68456709ccc
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r2 b/metadata/md5-cache/dev-java/swt-3.7.2-r2
new file mode 100644
index 000000000000..bf3eeedac90c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=GTK based SWT Library
+EAPI=4
+HOMEPAGE=http://www.eclipse.org/
+IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
+SLOT=3.7
+SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e220b1e4a200130a18e2508812411db4
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r2 b/metadata/md5-cache/dev-java/swt-3.8.2-r2
new file mode 100644
index 000000000000..b0d0523a1e1f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=GTK based SWT Library
+EAPI=5
+HOMEPAGE=http://www.eclipse.org/
+IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
+SLOT=3.8
+SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b5af815b3c3d800b1718c09fbca33ff5
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r2 b/metadata/md5-cache/dev-java/swt-4.2-r2
deleted file mode 100644
index 9d8d3551824d..000000000000
--- a/metadata/md5-cache/dev-java/swt-4.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f0fb989686b431a32bdd3aae6534c1b3
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r3 b/metadata/md5-cache/dev-java/swt-4.2-r3
new file mode 100644
index 000000000000..c2799bcd8bd6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-4.2-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=GTK based SWT Library
+EAPI=5
+HOMEPAGE=http://www.eclipse.org/
+IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
+SLOT=4.2
+SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=bf735aa703b2454878c0c17c83cdd4ec
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.2_beta b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.2_beta
deleted file mode 100644
index 0608a91e29ae..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.2_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.2/src/apache-tomcat-9.0.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17be765d5c333f611cf672c0f6b507dc
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
new file mode 100644
index 000000000000..23673847945a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f0c82578764bdd338c9b64240bde8b20
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f704f18a6ed4..5fc42cb991db 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index 3ef2112941a9..403261d54b0a 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -10,6 +10,6 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
-SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-8.0.2-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-8.0.2-ia64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-8.0.2-x86.tbz2 ) )
+SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-8.0.2-ia64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ghc-package	f9cf05643e20f03876bb4807f008c80f	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=411b8b3d19fbaade5fbd04c33e369bb3
+_md5_=c7c7bbd2124f0c41dc3721fd6735db31
diff --git a/metadata/md5-cache/dev-lang/go-1.9.3 b/metadata/md5-cache/dev-lang/go-1.9.3
new file mode 100644
index 000000000000..5ca4d8102351
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install pretend test unpack
+DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=6
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.9.3
+SRC_URI=https://storage.googleapis.com/golang/go1.9.3.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e4dfdfc200b14f9a1bec33f3f347c0a7
diff --git a/metadata/md5-cache/dev-lang/python-2.7.14-r1 b/metadata/md5-cache/dev-lang/python-2.7.14-r1
index 44a5d57e9881..9bc79721f1a3 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=64aee40235445abf03a507f3aef61754
+_md5_=8155f0b434f07ad48c8904bbab8aa472
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5-r1 b/metadata/md5-cache/dev-lang/python-3.4.5-r1
index 93634938d987..d6ce1d5817bd 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7f798562ae7daaed2f546fa8ef4196c7
+_md5_=ec9ffabfab8822df8599a5f1b863cbbc
diff --git a/metadata/md5-cache/dev-lang/python-3.4.6-r1 b/metadata/md5-cache/dev-lang/python-3.4.6-r1
index da539a8a8d64..d052bd4ba881 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e2bc56e15b1b805669f3282f8b5aea3b
+_md5_=f5753dc75a288fb973d4ed6550b7e92b
diff --git a/metadata/md5-cache/dev-lang/python-3.5.4-r1 b/metadata/md5-cache/dev-lang/python-3.5.4-r1
index 2f0eb57f0995..5cdebd605bf7 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0ad269c049a78e628fc6b90c2b6a4406
+_md5_=9ee1cecf927554b44b850ddd7a55a95d
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index b8d56d9dff54..3d66ea599841 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0b07c8076a669a1464bf30f81a6d7bdf
+_md5_=f4096522b0cfda2ecba0f6e442896db8
diff --git a/metadata/md5-cache/dev-lang/python-3.6.4 b/metadata/md5-cache/dev-lang/python-3.6.4
index 9f1907229dbb..173c0d20c6cb 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.4
+++ b/metadata/md5-cache/dev-lang/python-3.6.4
@@ -4,7 +4,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
 IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=75b766857452df88a5bb6777763f6bbe
+_md5_=bb0570fb82b5d282733aa41327ce32c5
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.6 b/metadata/md5-cache/dev-lang/ruby-2.3.6
index 9daa73a5619a..fd109d5bb6c9 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.3.6
+++ b/metadata/md5-cache/dev-lang/ruby-2.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-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=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.3
 SRC_URI=mirror://ruby/2.3/ruby-2.3.6.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.6.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f1c5553b429e0ff127e975239fa12b6f
+_md5_=10485a1e2f98f83d8aa3f5ada3839e96
diff --git a/metadata/md5-cache/dev-lang/rust-1.23.0 b/metadata/md5-cache/dev-lang/rust-1.23.0
new file mode 100644
index 000000000000..9c84ecf8b53d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.23.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=debug doc +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=>=dev-util/cargo-0.24.0
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+SLOT=stable/1.23
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.gz -> rustc-1.23.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.22.0-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=66190b98a61687c08db96c21c3346e56
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.23.0 b/metadata/md5-cache/dev-lang/rust-bin-1.23.0
new file mode 100644
index 000000000000..6456d9b7e227
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.23.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=5
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+SLOT=stable
+SRC_URI=amd64? ( http://static.rust-lang.org/dist/rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( http://static.rust-lang.org/dist/rust-1.23.0-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=44da764fc475dcdcbd6c3d6677400e61
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17 b/metadata/md5-cache/dev-lang/tcl-8.5.17
index 9fb36649311b..7738d9e72558 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b012443b030b867c508a44ab229b8c05
+_md5_=2fff39486d3ea9c1fdf8da6ca5c90b94
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r100 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
index a7eafa1012ed..741ff5b87c4f 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=dev-lang/tcl-8.5*:0
 SLOT=8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=47d7e78b2813dc3a0540620dcddb13c9
+_md5_=23c7ca01d21bd84f27a434d5f9944f92
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.5 b/metadata/md5-cache/dev-lang/tcl-8.6.5
index 799f41fd6be1..57d172c883bd 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.5
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.5-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e69befdf884485c19a0c937d478e9ad9
+_md5_=82a62050d56861e8670aeebf48c293c2
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.6 b/metadata/md5-cache/dev-lang/tcl-8.6.6
index 1f11a72d5c13..a600a371e082 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.6
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.6-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=019f95447deece34d6a057c84ecedca9
+_md5_=a052d099dcbb7b219cc4e8942a7506eb
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.7 b/metadata/md5-cache/dev-lang/tcl-8.6.7
index de87d157d679..6414cda20d99 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.7
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-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 ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.7-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e69befdf884485c19a0c937d478e9ad9
+_md5_=82a62050d56861e8670aeebf48c293c2
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4521bd8d5517..a0c531e631a4 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/apr-1.5.2 b/metadata/md5-cache/dev-libs/apr-1.5.2
index 0496b0bb0d05..ee56c4af6c35 100644
--- a/metadata/md5-cache/dev-libs/apr-1.5.2
+++ b/metadata/md5-cache/dev-libs/apr-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Library
 EAPI=5
 HOMEPAGE=http://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.5.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b4b990a6a5fd268f5fc548f7b2413de0
+_md5_=bc09e13f3507988c8752fe633ac7f595
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.2 b/metadata/md5-cache/dev-libs/apr-1.6.2
index 0d4dcb91693e..f4960e98f6cc 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.2
+++ b/metadata/md5-cache/dev-libs/apr-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.6.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9c149007d25918575f3dad41b5bd6eef
+_md5_=f8415fd612d9cc175087f16066d39cea
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3 b/metadata/md5-cache/dev-libs/apr-1.6.3
index 804eaacb20cc..2b9001ea5301 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.3
+++ b/metadata/md5-cache/dev-libs/apr-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9c149007d25918575f3dad41b5bd6eef
+_md5_=f8415fd612d9cc175087f16066d39cea
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.4 b/metadata/md5-cache/dev-libs/apr-util-1.5.4
index 2715a73f09d1..d24f1ee5d0ee 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.5.4
+++ b/metadata/md5-cache/dev-libs/apr-util-1.5.4
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
 IUSE=berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~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=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.6:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.5.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bf7f5e7f7c74d03fcb52e14b68d2011b
+_md5_=8dcbedd250487595a9a4c31564a29c1c
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.4-r3 b/metadata/md5-cache/dev-libs/apr-util-1.5.4-r3
index 1bfe80212c10..55cb5f1cef2e 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.5.4-r3
+++ b/metadata/md5-cache/dev-libs/apr-util-1.5.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=6
 HOMEPAGE=http://apr.apache.org/
 IUSE=berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.5.2:1 berkdb? ( >=sys-libs/db-4:= ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.5.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d4f788e9bdab78c8b7e4272a2f36b8ad
+_md5_=5923b8c52d591d6a20b8cc6e9fd75762
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1 b/metadata/md5-cache/dev-libs/apr-util-1.6.1
index 411903fb4c20..52ff8b755076 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=6
 HOMEPAGE=http://apr.apache.org/
 IUSE=berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1 berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c25cd27d0dbe1ad6e5d9d1dfed93504f
+_md5_=85d69a939cc26515d4c1b19a7395b048
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
new file mode 100644
index 000000000000..1a5995829a65
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtserialport-5.7.1:5 gui? ( >=dev-qt/qtcharts-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) >=kde-frameworks/extra-cmake-modules-5.40.0 >=dev-qt/linguist-tools-5.7.1:5 doc? ( app-doc/doxygen[dot] ) test? ( >=dev-qt/qttest-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=API to manage the serial connection between the computer and 3D Printers
+EAPI=6
+HOMEPAGE=https://atelier.kde.org/
+IUSE=doc gui test
+KEYWORDS=~amd64
+LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )
+RDEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtserialport-5.7.1:5 gui? ( >=dev-qt/qtcharts-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 )
+SLOT=0
+SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0421301772e3d1e0621937ae8a9493b2
diff --git a/metadata/md5-cache/dev-libs/check-0.10.0-r1 b/metadata/md5-cache/dev-libs/check-0.10.0-r1
index b2296003a695..65c5fd1f6b69 100644
--- a/metadata/md5-cache/dev-libs/check-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/check-0.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.10.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6d5067a7aed35bce500b208ffb22819
+_md5_=6878cb785aa6ec612d6bc24d97f34b6f
diff --git a/metadata/md5-cache/dev-libs/check-0.12.0 b/metadata/md5-cache/dev-libs/check-0.12.0
index 603d6a80080a..0ee6ca0adac7 100644
--- a/metadata/md5-cache/dev-libs/check-0.12.0
+++ b/metadata/md5-cache/dev-libs/check-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=6
 HOMEPAGE=https://libcheck.github.io/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.12.0.tar.gz -> check-0.12.0-github.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=eaba20e7b93e3382c992293b7c793d60
+_md5_=7ce52c146c0458b1174420f0d6c5d515
diff --git a/metadata/md5-cache/dev-libs/confuse-3.0 b/metadata/md5-cache/dev-libs/confuse-3.0
index 45dd0d47dcd2..2502dc0d09b6 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.0
+++ b/metadata/md5-cache/dev-libs/confuse-3.0
@@ -4,10 +4,10 @@ DESCRIPTION=a configuration file parser library
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/confuse/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.0/confuse-3.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ecef5c5ac2162585a590b6d55f05d3e4
+_md5_=81efed50157b9bcb76693ba2fc05a4d8
diff --git a/metadata/md5-cache/dev-libs/confuse-3.2.1 b/metadata/md5-cache/dev-libs/confuse-3.2.1
index 93e98079ab26..2888c91d5e88 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.2.1
+++ b/metadata/md5-cache/dev-libs/confuse-3.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=a configuration file parser library
 EAPI=6
 HOMEPAGE=https://github.com/martinh/libconfuse
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2.0.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.2.1/confuse-3.2.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8905f0bd77d02cfb09d666eb7c97cd7f
+_md5_=bed93f354f5a9827a5808278c1e0f0d0
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
index 402c460d869b..c38cf8b0b2fe 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
@@ -4,10 +4,10 @@ DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=01ce7d7e8aa8aa65283629a6a81f0e39
+_md5_=cf00c078c3cdc00012f4fe1012b19e50
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
index 8d1affcd5df7..3ecc2d17e6c3 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
@@ -4,10 +4,10 @@ DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6909cd68411004bd928a2488cbb64a5c
+_md5_=83c110ec44fe0d4bb3b1882db0a3b322
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
index ae7baebd7be7..641d0895ae65 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -4,10 +4,10 @@ DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=63964fb2ae51f3562dd21f2d57a05f69
+_md5_=c37b219d6aadea6f05ad7306d3223cd4
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1
deleted file mode 100644
index 8b457626c0a4..000000000000
--- a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=app-arch/unzip dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,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/make >=dev-util/cmake-3.7.2
-DESCRIPTION=API to detect devices based on the User-Agent HTTP header
-EAPI=6
-HOMEPAGE=https://deviceatlas.com
-IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ppc x86
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=fetch mirror bindist
-SLOT=0
-SRC_URI=deviceatlas-enterprise-c-2.1.zip
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=594207c6bca1aadc9ef33dcb34948521
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p1 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p1
deleted file mode 100644
index 956f24fa063f..000000000000
--- a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare test
-DEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,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/make >=dev-util/cmake-3.7.2
-DESCRIPTION=API to detect devices based on the User-Agent HTTP header
-EAPI=6
-HOMEPAGE=https://deviceatlas.com
-IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=fetch mirror bindist
-SLOT=0
-SRC_URI=deviceatlas-enterprise-c-2.1.2_1.tgz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb8f6920e19b74e0e8f8138f2e946779
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p2 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p2
deleted file mode 100644
index 7e8105e07d63..000000000000
--- a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.2_p2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare test
-DEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,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/make >=dev-util/cmake-3.7.2
-DESCRIPTION=API to detect devices based on the User-Agent HTTP header
-EAPI=6
-HOMEPAGE=https://deviceatlas.com
-IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=fetch mirror bindist
-SLOT=0
-SRC_URI=deviceatlas-enterprise-c-2.1.2_2.tgz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=275952dfdd39adac2539750537d32c74
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3
new file mode 100644
index 000000000000..34f5e6346e84
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch prepare test
+DEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,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/make >=dev-util/cmake-3.7.2
+DESCRIPTION=API to detect devices based on the User-Agent HTTP header
+EAPI=6
+HOMEPAGE=https://deviceatlas.com
+IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=all-rights-reserved
+RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=fetch mirror bindist
+SLOT=0
+SRC_URI=deviceatlas-enterprise-c-2.1.3.tgz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=213f9c18c1eed9dd8dd58e052c22b565
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.1 b/metadata/md5-cache/dev-libs/expat-2.2.1
index d04557392446..8d88b71ac178 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.1
+++ b/metadata/md5-cache/dev-libs/expat-2.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=6
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/expat/expat-2.2.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1aaa733e3a2800c558018ad4d041039e
+_md5_=12d9d0663f8c553c66835e315545b5dc
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.4 b/metadata/md5-cache/dev-libs/expat-2.2.4
index 69aa97788e4b..34417557ae83 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.4
+++ b/metadata/md5-cache/dev-libs/expat-2.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=6
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/expat/expat-2.2.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b659223db8ebeb6fc0f1bca52dee0306
+_md5_=d76ccad5c500e18c3083d879fd706eae
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.5 b/metadata/md5-cache/dev-libs/expat-2.2.5
index 2d9f4e68f611..307812ae4389 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.5
+++ b/metadata/md5-cache/dev-libs/expat-2.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=6
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd467992beea61890a55709920eb08b4
+_md5_=79eb9910f7bdf1a48ebf40330baba688
diff --git a/metadata/md5-cache/dev-libs/glib-2.50.3-r1 b/metadata/md5-cache/dev-libs/glib-2.50.3-r1
index 5ec0ed263c94..99b4c19074a7 100644
--- a/metadata/md5-cache/dev-libs/glib-2.50.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.50.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=LGPL-2+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.50.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-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(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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/gdbus-codegen-2.50.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.50/glib-2.50.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e6ddc8abb908f0049609e17d3b99482
+_md5_=6f6186e561876930514f69440dbf6452
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index ec906627e0cd..9b2c447218ec 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-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(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6798ee37ca0dcdfd153de4af155b0b8
+_md5_=40f5af02ef76cbafa95393cc71dacadf
diff --git a/metadata/md5-cache/dev-libs/gmp-4.3.2-r1 b/metadata/md5-cache/dev-libs/gmp-4.3.2-r1
index 20daba1e775b..ec9fd955faec 100644
--- a/metadata/md5-cache/dev-libs/gmp-4.3.2-r1
+++ b/metadata/md5-cache/dev-libs/gmp-4.3.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=LGPL-3
 SLOT=3
 SRC_URI=mirror://gnu/gmp/gmp-4.3.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=721760a773fe1c756a2d688dbbd988d8
+_md5_=34f296c6c0a4a64014c9ab4fc7bace35
diff --git a/metadata/md5-cache/dev-libs/gmp-6.0.0a b/metadata/md5-cache/dev-libs/gmp-6.0.0a
index 5b2a3e676aaa..f9dfd20d207f 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.0.0a
+++ b/metadata/md5-cache/dev-libs/gmp-6.0.0a
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=4
 HOMEPAGE=http://gmplib.org/
 IUSE=doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-6.0.0a.tar.xz ftp://ftp.gmplib.org/pub/gmp-6.0.0a/gmp-6.0.0a.tar.xz doc? ( http://gmplib.org/gmp-man-6.0.0a.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f004acd1424a74507c9153b2928f0532
+_md5_=ee1ea1838724ffb39a9c5eeacd3a91b4
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.0 b/metadata/md5-cache/dev-libs/gmp-6.1.0
index 97861a3e564c..3720a39877f9 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.0
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=+asm doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.0/gmp-6.1.0.tar.xz mirror://gnu/gmp/gmp-6.1.0.tar.xz doc? ( http://gmplib.org/gmp-man-6.1.0.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c65f1c9f2160b07a459c6775d4dab78
+_md5_=ef51e71472aaa145ac4a40172aaa7667
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.1 b/metadata/md5-cache/dev-libs/gmp-6.1.1
index a93bfbed899b..ea9193e0b6e1 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.1
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=+asm doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.1/gmp-6.1.1.tar.xz mirror://gnu/gmp/gmp-6.1.1.tar.xz doc? ( http://gmplib.org/gmp-man-6.1.1.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e1593f80f16f3459fe30e1e87a6368c1
+_md5_=43ced8adfc36fde79a4f656954205ae5
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.2 b/metadata/md5-cache/dev-libs/gmp-6.1.2
index 73d129e62307..af055d9e36d9 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.2
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=+asm doc cxx pgo 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.2/gmp-6.1.2.tar.xz mirror://gnu/gmp/gmp-6.1.2.tar.xz doc? ( http://gmplib.org/gmp-man-6.1.2.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=09edde7bfdd19b80ad612afb8fff7fa4
+_md5_=498f8c534dad188017ce1b92c8f0e090
diff --git a/metadata/md5-cache/dev-libs/leatherman-0.10.1 b/metadata/md5-cache/dev-libs/leatherman-0.10.1
index 73b08c36c5b5..ca74a73283a5 100644
--- a/metadata/md5-cache/dev-libs/leatherman-0.10.1
+++ b/metadata/md5-cache/dev-libs/leatherman-0.10.1
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.10.1.tar.gz -> leatherman-0.10.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d13e37d5a36bb924652a8691549c416b
+_md5_=1cfa361d04ca0704015f73598c57c076
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.2.1 b/metadata/md5-cache/dev-libs/leatherman-1.2.1
index d0a00631a421..95427cdfda10 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.2.1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.2.1
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.2.1.tar.gz -> leatherman-1.2.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a06ac3559e6c133f0bd028f34ef3f384
+_md5_=4367737a34637f033ad9fc893103d103
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.2.2 b/metadata/md5-cache/dev-libs/leatherman-1.2.2
index bd3ef654af0d..40903e8d3861 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.2.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.2.2
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.2.2.tar.gz -> leatherman-1.2.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f16a7278bf875e780a85ac7ad5e3ecb
+_md5_=643c4b82e075349bdc427a65dc585919
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0 b/metadata/md5-cache/dev-libs/leatherman-1.3.0
index 8df5e6094e59..3094988b55ae 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.3.0
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.3.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d416acd7bbf4b67f688408cbc03870c9
+_md5_=636b314d1eab4c935a88bce6c55c4615
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1 b/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1
index e17401ea4f8f..5f94afa44d0a 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.3.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82e28bcb63ed5500e2fecc30aa272655
+_md5_=62d2febfab34fbc5074b25c4c2c4d37a
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.8-r1 b/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
index d4740f0cc903..6b32210ba2e0 100644
--- a/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
+++ b/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
@@ -4,8 +4,8 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=6
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=debug static-libs track-src-odirect
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
-_md5_=73ba5946c64f7d2e898df483345045e1
+_md5_=242d292b5d8b57d11ef26189f96ce744
diff --git a/metadata/md5-cache/dev-libs/libbytesize-1.2-r1 b/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
index 439ff3be3e85..a2dc781f928e 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
+++ b/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big si
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/libbytesize
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/libbytesize/archive/1.2.tar.gz -> libbytesize-1.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4d31e7c1c0b92b4711afa5f7a43f7a82
+_md5_=7d3f43cba4acac6944ebecf107fec2e6
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.93 b/metadata/md5-cache/dev-libs/libcdio-0.93
index 682e2d9f93ac..6aaeb668c867 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.93
+++ b/metadata/md5-cache/dev-libs/libcdio-0.93
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.93.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6c7473caf93a1838c008d5a99754b6e6
+_md5_=53b0178b645898a78d6f1c5f7848a447
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.94-r1 b/metadata/md5-cache/dev-libs/libcdio-0.94-r1
index 47675d4b6718..35891383ce20 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.94-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-0.94-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://gnu/libcdio/libcdio-0.94.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a44eccce3b53d4a00a63c46c261c1337
+_md5_=b9973f09da1a54a0de567cc2304f184b
diff --git a/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
index 020ba4de2958..780a2d2e2931 100644
--- a/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/17
 SRC_URI=mirror://gnu/libcdio/libcdio-1.0.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0fe13fdedad584ef1b1d423bdc1ff9ca
+_md5_=0853801f3afe19951ac6e060bf45d38e
diff --git a/metadata/md5-cache/dev-libs/libcdio-1.1.0 b/metadata/md5-cache/dev-libs/libcdio-1.1.0
index 8090f41f965d..8b694e480566 100644
--- a/metadata/md5-cache/dev-libs/libcdio-1.1.0
+++ b/metadata/md5-cache/dev-libs/libcdio-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/17
 SRC_URI=mirror://gnu/libcdio/libcdio-1.1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=52a1c1a396b438d67588c1854751ce4a
+_md5_=e84a009872f04f01c438ec9bd3b0f8ff
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0 b/metadata/md5-cache/dev-libs/libcdio-2.0.0
index ddd84bb266a6..17e49e3c7833 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=99e6ba479e2acd2f9a226853c40775da
+_md5_=98924f91b652cf7239091212322cfb0d
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
index 81036e45c51b..43f9a0135ea3 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.90-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.90+1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=14dbd90e33980867bf818519d48ac775
+_md5_=204a0637297fccb8d3cd60fbbd89aec2
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
index f1fc7377da35..be98451527e0 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8cf68372ecc47bb4345b7c0b5a0348a1
+_md5_=ba103e01d4a429c98d4b673762d39801
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
index 94f61f5ea906..bb9e885334ec 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=64cfd06c6daa4593f4ae193cc300a6ba
+_md5_=5c0bf0cc76ca12f92eb7c9d1a6caeb48
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p1-r1
index ec3b6b61d373..942407a76dea 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p1-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=85d3843a442944bc444adc5b0ae1297a
+_md5_=8dfdb705f5bde1b4916289db15b03552
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
index a406b53892a4..743318633605 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=85d3843a442944bc444adc5b0ae1297a
+_md5_=8dfdb705f5bde1b4916289db15b03552
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1 b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
index 8ab7218e60cb..82ea9559cf1e 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libcroco/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abe5cf75ff1bd8511c189cc17484f118
+_md5_=e6a93afab4884400514e0823ff46a4d2
diff --git a/metadata/md5-cache/dev-libs/libedit-20130712.3.1 b/metadata/md5-cache/dev-libs/libedit-20130712.3.1
index 6ea11f4f24b4..a34b1a1827dd 100644
--- a/metadata/md5-cache/dev-libs/libedit-20130712.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20130712.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=BSD replacement for libreadline
 EAPI=5
 HOMEPAGE=http://www.thrysoee.dk/editline/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<=sys-freebsd/freebsd-lib-6.2_rc1
 SLOT=0
 SRC_URI=http://www.thrysoee.dk/editline/libedit-20130712-3.1.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9a946c1e44b1e9ec5f99b5986bb501bc
+_md5_=2a56d4e8056e12146977083d96e0547e
diff --git a/metadata/md5-cache/dev-libs/libedit-20170329.3.1 b/metadata/md5-cache/dev-libs/libedit-20170329.3.1
index c456e4a3e9d7..c0c0dff2d4ae 100644
--- a/metadata/md5-cache/dev-libs/libedit-20170329.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20170329.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=BSD replacement for libreadline
 EAPI=6
 HOMEPAGE=http://thrysoee.dk/editline/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<=sys-freebsd/freebsd-lib-6.2_rc1
 SLOT=0
 SRC_URI=http://thrysoee.dk/editline/libedit-20170329-3.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c9d39fcca994ee8a81bdd24c1b7260eb
+_md5_=002ce83e5e8e90c50efa1d1c5b17a356
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index d05e02d9fb24..4e1955cdf3a9 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A ELF object file access library
 EAPI=5
 HOMEPAGE=http://www.mr511.de/software/
 IUSE=debug nls elibc_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e888741917ce63f449852c25b0d11282
+_md5_=d824f2abde9dbacf32c915d101fc7b4c
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.8 b/metadata/md5-cache/dev-libs/libevent-2.1.8
index 4649a1c7a8db..20f683cf9e7c 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.8
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=Library to execute a function when a specific event occurs on a file
 EAPI=6
 HOMEPAGE=http://libevent.org/ https://github.com/libevent/libevent/
 IUSE=debug libressl +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
 SLOT=0/2.1-6
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz -> libevent-2.1.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3469b54758c40c31761bdd950b49e433
+_md5_=01c94401b523e9ec875fd8c0d4761e87
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2.1 b/metadata/md5-cache/dev-libs/libffi-3.2.1
index c03d66d913ff..89e998532241 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2.1
+++ b/metadata/md5-cache/dev-libs/libffi-3.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=5
 HOMEPAGE=https://sourceware.org/libffi/
 IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d86db3cc31b49ca2e040fd7d03faaa8
+_md5_=282fb49b8a86ebe9194aac92aea028c3
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2.1-r1 b/metadata/md5-cache/dev-libs/libffi-3.2.1-r1
index 608754f16e5d..41723585b284 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2.1-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=6
 HOMEPAGE=https://sourceware.org/libffi/
 IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8a0517c8d17d56e89070da28c69dcaba
+_md5_=7c2caf59f137490c24a5539cecf88d8b
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
index f5a3ab68bcc3..49a793237702 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux python static-libs python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=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(-)] ) !app-admin/fam !<app-admin/gamin-0.1.10
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=747abd686cf8d0d7466f6a662bb64f4c
+_md5_=4e38770b0e9b985c2e5e18e9fa306a75
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101
index 9aa010718d38..b208e34fbcb2 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=11/11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b6c4bdfb80a1024cdb39b3c00c5fa14f
+_md5_=a8a43ba512bb7f7facf9888aa8747836
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.1 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
index b5adab476463..7b67b75f02f7 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3ba84c0ad7e615173600c5c6302b1fa6
+_md5_=ff50706ce2fdd2e039a88134ddece5a9
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.2 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2
index 52a28704201f..091c0ea44551 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b0712539f549fcffdae983a18b17f181
+_md5_=01c5151d9e65d688df3470eac5d6ee1b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1
index cc7023e55434..832ef2678c16 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=doc o-flag-munging 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bda969ec8dd65b007cae187636628c23
+_md5_=7ff3be301cbfb8cabc88f428eba5b199
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.27-r1 b/metadata/md5-cache/dev-libs/libgpg-error-1.27-r1
index c0185f56a2c4..28e0a99ca8c0 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.27-r1
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Contains error handling functions used by GnuPG software
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error
 IUSE=common-lisp nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r12 )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.27.tar.bz2
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0c80b05ff2ea7087a63e396c495b1753
+_md5_=5f6a44ecd71c482c59398a9140538c74
diff --git a/metadata/md5-cache/dev-libs/libical-2.0.0-r3 b/metadata/md5-cache/dev-libs/libical-2.0.0-r3
index 9b7dcb8b236f..ad5a65fcfe03 100644
--- a/metadata/md5-cache/dev-libs/libical-2.0.0-r3
+++ b/metadata/md5-cache/dev-libs/libical-2.0.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of basic iCAL protocols
 EAPI=6
 HOMEPAGE=https://github.com/libical/libical
 IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( MPL-1.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:=
 SLOT=0/2
 SRC_URI=https://github.com/libical/libical/archive/v2.0.0.tar.gz -> libical-2.0.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65e01039a4a47c9bff22ae35caa7d2dd
+_md5_=6898a55c89c8cefa114998b483a7529b
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.14 b/metadata/md5-cache/dev-libs/libiconv-1.14
index f820dfdbc279..773cf4bd3b80 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.14
+++ b/metadata/md5-cache/dev-libs/libiconv-1.14
@@ -3,10 +3,10 @@ DEPEND=!sys-libs/glibc !sys-apps/man-pages >=app-portage/elt-patches-20170422
 DESCRIPTION=GNU charset conversion library for libc which doesn't implement it
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libiconv/
-KEYWORDS=amd64 arm ~mips ppc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !sys-apps/man-pages
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.14.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ad6f04400bf4b46441c82612cd8f386d
+_md5_=d835e94abea11e64dec90d37dd171a3c
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.14-r1 b/metadata/md5-cache/dev-libs/libiconv-1.14-r1
index eaa667391dc2..f2222f304871 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.14-r1
+++ b/metadata/md5-cache/dev-libs/libiconv-1.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU charset conversion library for libc which doesn't implement it
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libiconv/
 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=amd64 arm ~mips ppc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b4c73d6197bbee8b1a10efdcf81ff5ff
+_md5_=89de0ae1351325db8decc28959d7e895
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.14-r2 b/metadata/md5-cache/dev-libs/libiconv-1.14-r2
index ef4bba8ba80f..b3631a180831 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.14-r2
+++ b/metadata/md5-cache/dev-libs/libiconv-1.14-r2
@@ -4,10 +4,10 @@ DESCRIPTION=GNU charset conversion library for libc which doesn't implement it
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libiconv/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.14.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ad66bbc075f2f624a85bd480728ad80c
+_md5_=7ed63b09af0049ee1f5e3639b3c73dc4
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.15 b/metadata/md5-cache/dev-libs/libiconv-1.15
index 6c2fa668c92a..66abaa80f679 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.15
+++ b/metadata/md5-cache/dev-libs/libiconv-1.15
@@ -4,10 +4,10 @@ DESCRIPTION=GNU charset conversion library for libc which doesn't implement it
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libiconv/
 IUSE=prefix static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.15.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=099870da60734dc5dec6b9de1a215b17
+_md5_=f71b559e5ed461e3259c352d315592fe
diff --git a/metadata/md5-cache/dev-libs/libintl-0.19.6 b/metadata/md5-cache/dev-libs/libintl-0.19.6
index 440c6a58a38a..1c0038432112 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.19.6
+++ b/metadata/md5-cache/dev-libs/libintl-0.19.6
@@ -4,10 +4,10 @@ DESCRIPTION=the GNU international library (split out of gettext)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d9c1c48af89e243900e329f2a627369
+_md5_=359fb8dbc7e66fa599d7da21c2cf7847
diff --git a/metadata/md5-cache/dev-libs/libintl-0.19.7 b/metadata/md5-cache/dev-libs/libintl-0.19.7
index f3a67fa2927b..a8d4ed3e47d1 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.19.7
+++ b/metadata/md5-cache/dev-libs/libintl-0.19.7
@@ -4,10 +4,10 @@ DESCRIPTION=the GNU international library (split out of gettext)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0276d66f8e9f71d93ccf711091fede06
+_md5_=87c72408ced066118f89f0f7cf01bcc8
diff --git a/metadata/md5-cache/dev-libs/libintl-0.19.8.1 b/metadata/md5-cache/dev-libs/libintl-0.19.8.1
index 019e759df19c..1bb03b7a544d 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.19.8.1
+++ b/metadata/md5-cache/dev-libs/libintl-0.19.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=the GNU international library (split out of gettext)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=53cd86c3a8f707b34243f6aa7fb0fed1
+_md5_=543d08191e9b4709d6791a3cd91071ff
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1 b/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1
index 23db1251f4af..576a8f20739e 100644
--- a/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported
 EAPI=6
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=>=dev-libs/libburn-1.4.8 >=dev-libs/libisofs-1.4.8 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.4.8.tar.gz
-_md5_=6f0c068541cf0184e54416c4af4f2dc2
+_md5_=37e71fca6a335403f9c977fbeb5a90fa
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.4.8 b/metadata/md5-cache/dev-libs/libisofs-1.4.8
index 3f629684b739..0dd067eb7fc4 100644
--- a/metadata/md5-cache/dev-libs/libisofs-1.4.8
+++ b/metadata/md5-cache/dev-libs/libisofs-1.4.8
@@ -4,9 +4,9 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=6
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=acl debug static-libs verbose-debug xattr zlib
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.4.8.tar.gz
-_md5_=339bd716ed09f5cf14e4ea263e30caa4
+_md5_=f667f9bbb477f6e005c54c97bc06306c
diff --git a/metadata/md5-cache/dev-libs/libltdl-1.5.26 b/metadata/md5-cache/dev-libs/libltdl-1.5.26
index 135a28346f51..f56a62de733f 100644
--- a/metadata/md5-cache/dev-libs/libltdl-1.5.26
+++ b/metadata/md5-cache/dev-libs/libltdl-1.5.26
@@ -3,11 +3,11 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!sys-devel/libtool:1.5
 RESTRICT=test
 SLOT=1.5
 SRC_URI=mirror://gnu/libtool/libtool-1.5.26.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=db5d70a76e04f5b340867c0255057d9c
+_md5_=cf78c78d5dda37b39e6e3f8de21b0978
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.6 b/metadata/md5-cache/dev-libs/libltdl-2.4.6
index 6077866b74ae..1b2f2563f8a8 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.6
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8e169dc656f2309aae7a9c4a549f595
+_md5_=9e2636f933702ee96db68d29cd32042f
diff --git a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1 b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
index 3c65e722e1f5..700685564674 100644
--- a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
+++ b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=C API for memcached
 EAPI=3
 HOMEPAGE=http://people.freebsd.org/~seanc/libmemcache/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.rc2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3e385fc6367c58bca161093b8840313b
+_md5_=1f72783c2290fde678309bd583e10b79
diff --git a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2 b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2
index 302e9af661ce..d4731e5b556e 100644
--- a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2
+++ b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=C API for memcached
 EAPI=6
 HOMEPAGE=http://people.freebsd.org/~seanc/libmemcache/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.rc2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=638a55b3487e022dd443d736e42abb3c
+_md5_=f2664f03601a7db96e44c05582a54874
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.14 b/metadata/md5-cache/dev-libs/libmemcached-1.0.14
index 4321f2b8b7ed..fff6aaea3b6b 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.14
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=4
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached dev-libs/cyrus-sasl libevent? ( dev-libs/libevent )
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.14/+download/libmemcached-1.0.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=10930f233abcfe3b975e2e6e5aa8dc60
+_md5_=f6a4cec29770404302e0f9eb8727e648
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18
index 7b5e36d636a3..7ae08039c174 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=acb3067c2b1982661faa41e77b0a6e6d
+_md5_=5cb3f9b0369ff435742a4758f02bc2b7
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1
index fcea6068cbb5..5f0206b77542 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c1bf99a2607f2935d1b23d87a454974a
+_md5_=e9961a67fa71b0924c39eda6653d40d4
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2
index bd6c1b804a78..eba432a92e81 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2
@@ -4,11 +4,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=20d84c867c8a689a80fdbcffb63c5574
+_md5_=083dc1d0502afde078035f72d5d06974
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
index 4e039df93ff0..ec89ceeb2182 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
@@ -4,11 +4,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=00b0fe323693bbf9a8b3cbaa284fb06c
+_md5_=c3b93f0a74b458a9604b94802b4c4d85
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.40-r1 b/metadata/md5-cache/dev-libs/libpcre-8.40-r1
index 711dffa8f121..e20b0257cc18 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.40-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.40-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=5
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.40.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8fa5a2e376df0b50998868f4899fe96b
+_md5_=f5bc73f923142a0e9de9a4fcc1dde94f
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.41 b/metadata/md5-cache/dev-libs/libpcre-8.41
index 49796afc5539..42d357c1ba85 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.41
+++ b/metadata/md5-cache/dev-libs/libpcre-8.41
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=5
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.41.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.41.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8837f1a33f192ea943a5b00ec666a8e9
+_md5_=ce59221cc5f2873acbff58787c626766
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.41-r1 b/metadata/md5-cache/dev-libs/libpcre-8.41-r1
index dc3cb8823d31..f6df022921de 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.41-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.41-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=5
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.41.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.41.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2fb7d89ea529cf0bf336e07dfe9a74aa
+_md5_=90b48cfc3eda20326ea9e44e524f6a4d
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.22 b/metadata/md5-cache/dev-libs/libpcre2-10.22
index 1d6a6dd38550..02b48883d901 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.22
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.22
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.22.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.22.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bcb68865ae19295208d5eeccae7487b3
+_md5_=80d729e8bbbca9ddfbb1eccc33430931
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.23 b/metadata/md5-cache/dev-libs/libpcre2-10.23
index 67a9aea8561f..fe3279e6a4c6 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.23
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.23
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.23.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.23.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f9697462dc2d05125d5eeb1ef9e680d9
+_md5_=294453764367af58b9a629b82f071a24
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.30 b/metadata/md5-cache/dev-libs/libpcre2-10.30
index b9eed718be44..e9571ce1579a 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.30
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.30
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.30.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a10b5e01a247d18173442db6bfb3dd6d
+_md5_=7f3c7aa111e55374df12b3c80427b2f6
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.2 b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
index 14e15053fcdf..7ee1b941bec3 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.4.2
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=5
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-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
+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=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af40088df9021978b7d01ff34df614ba
+_md5_=2db627711a8b92b716b6bcbc557685b0
diff --git a/metadata/md5-cache/dev-libs/libreport-2.0.13-r1 b/metadata/md5-cache/dev-libs/libreport-2.0.13-r1
index 7d9b7924ac76..2f145b34df22 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.0.13-r1
+++ b/metadata/md5-cache/dev-libs/libreport-2.0.13-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://fedorahosted.org/abrt/
 IUSE=debug python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/btparser-0.18:= >=dev-libs/glib-2.21:2 dev-libs/json-c:= dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt:= dev-libs/nss:= dev-libs/xmlrpc-c:=[curl] net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus >=x11-libs/gtk+-3.3.12:3 x11-misc/xdg-utils 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-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1 >=kde-apps/kwalletd-4.8 )
+RDEPEND=>=dev-libs/btparser-0.18:= >=dev-libs/glib-2.21:2 dev-libs/json-c:= dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt:= dev-libs/nss:= dev-libs/xmlrpc-c:=[curl] net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus >=x11-libs/gtk+-3.3.12:3 x11-misc/xdg-utils 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-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/libreport-2.0.13.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cbd8d3fe551509785989c080104b9b72
+_md5_=d685c3fc97ad865e2c7eb164c6da5a67
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.11 b/metadata/md5-cache/dev-libs/libsigsegv-2.11
index 31e06aeebb0d..a9140e5e9872 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.11
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install test
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.11.tar.gz
-_md5_=d89435b21fd6940eb71e81fed2ecd4bb
+_md5_=8d391cbd3c686887952d18520a65845d
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.15 b/metadata/md5-cache/dev-libs/libsodium-1.0.15
index 853f997ec4b5..87ade30d0bdc 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.15
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.15
@@ -4,9 +4,9 @@ DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
 EAPI=6
 HOMEPAGE=https://github.com/jedisct1/libsodium
 IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 SLOT=0/23
 SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.15.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3472bd808e67fd0024877d37eae9ab9a
+_md5_=a57bbbc8f3b81f59814703aeef44a12b
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.12-r1 b/metadata/md5-cache/dev-libs/libtasn1-4.12-r1
index ebb2493a9ae8..9d31de4b86c0 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.12-r1
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.12.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=618868abfb6eb28efdb114d8df3d85b8
+_md5_=5921c716ccdc885e0b6c128f069e045e
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.13 b/metadata/md5-cache/dev-libs/libtasn1-4.13
index 015095bd3574..8d7e7f4e4f55 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.13
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.13
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.13.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5406aaa20dcef383098caa952eebfca1
+_md5_=86d5aaa657704af886de4a4107e2c3fc
diff --git a/metadata/md5-cache/dev-libs/libuv-1.19.0 b/metadata/md5-cache/dev-libs/libuv-1.19.0
deleted file mode 100644
index 041fd3fba38d..000000000000
--- a/metadata/md5-cache/dev-libs/libuv-1.19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Cross-platform asychronous I/O
-EAPI=6
-HOMEPAGE=https://github.com/libuv/libuv
-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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2 ISC MIT
-RESTRICT=test
-SLOT=0/1
-SRC_URI=https://github.com/libuv/libuv/archive/v1.19.0.tar.gz -> libuv-1.19.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8cfa3b5c69c7d6a18b7b3c80b498561f
diff --git a/metadata/md5-cache/dev-libs/libuv-1.19.1 b/metadata/md5-cache/dev-libs/libuv-1.19.1
new file mode 100644
index 000000000000..b940ab67cd6a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.19.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.19.1.tar.gz -> libuv-1.19.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8cfa3b5c69c7d6a18b7b3c80b498561f
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.6 b/metadata/md5-cache/dev-libs/libxml2-2.9.6
index 67086541362e..976f10e29990 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.6
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.6.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a682650cf3727d681063b951229d71a6
+_md5_=5b8a175deffe6bf2888738eebeea2d8e
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.7 b/metadata/md5-cache/dev-libs/libxml2-2.9.7
index 52d842066d61..32e0ba9deba4 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.7
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4f681c720b8807a14da2d5cb6584e88d
+_md5_=a1ed4c02a2cb520a71193fe37f70dcdb
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
index 68a6e2cbb951..b30c0be2849d 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs elibc_Darwin python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d38184f145a4141c501f07020a51957b
+_md5_=dc7f01dff25b60d2aee58b43e047385e
diff --git a/metadata/md5-cache/dev-libs/lzo-2.09 b/metadata/md5-cache/dev-libs/lzo-2.09
index 3ad344fa3f41..15b85c5bb8fb 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.09
+++ b/metadata/md5-cache/dev-libs/lzo-2.09
@@ -3,10 +3,10 @@ DESCRIPTION=An extremely fast compression and decompression library
 EAPI=5
 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=2
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c69709ad2e61b4fc7e944240b6a21ce1
+_md5_=3eb1584bc292df90c8dad3042d4eb3ee
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index cdd5c2033666..05f4c5a0fc10 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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_=c8de98a0539f58e1775396bb8f3d89a1
+_md5_=30351a6e2621241dad7e3a28147b0c1a
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.2-r1 b/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
index 0ecf4faec231..ceeba01eed20 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=4
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.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(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cd4a68fe9115eae72238d414e56b7949
+_md5_=722a2829b1b795181e8dd35a54a91969
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3 b/metadata/md5-cache/dev-libs/mpc-1.0.3
index 426ee2743ee6..e4f66ebe89ed 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=4
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.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(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=885a11d9552817f1d786314be529fb9a
+_md5_=e07f73126cf2414448b5484ddbedd850
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3-r2 b/metadata/md5-cache/dev-libs/mpc-1.0.3-r2
index 5c6846dfc41c..81ce7e5fb3fe 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3-r2
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=6
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.3.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/3
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5e49b26c1b630679f1afd791d4451668
+_md5_=62a4f555388fb7be30831d346433abd7
diff --git a/metadata/md5-cache/dev-libs/mpc-1.1.0-r1 b/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
index 689bffda59d8..a8e616524386 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=6
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/3
 SRC_URI=https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=542b749a8fba05dc31af2996c6dc45ed
+_md5_=7319a2a4f63c51deb38d27698ddb185e
diff --git a/metadata/md5-cache/dev-libs/mpfr-2.4.2_p3-r1 b/metadata/md5-cache/dev-libs/mpfr-2.4.2_p3-r1
index 593229169437..52bff3266ee6 100644
--- a/metadata/md5-cache/dev-libs/mpfr-2.4.2_p3-r1
+++ b/metadata/md5-cache/dev-libs/mpfr-2.4.2_p3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=5
 HOMEPAGE=http://www.mpfr.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1
 SRC_URI=http://www.mpfr.org/mpfr-2.4.2/mpfr-2.4.2.tar.bz2 https://dev.gentoo.org/~mgorny/dist/mpfr-2.4.2-patchset.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13e4d1fb71453d5fe7ae8e58dd628149
+_md5_=8eb775c767e4807f8f09b3f00475b7e7
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4 b/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
index cb0764610910..7fad25154ff3 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=4
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.mpfr.org/mpfr-3.1.3/mpfr-3.1.3.tar.xz https://dev.gentoo.org/~mgorny/dist/mpfr-3.1.3-patchset.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=199ac9f68361869e4dbfd85d429bc2d2
+_md5_=af23f7861ad15961a93168ec4c3ff55a
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.4 b/metadata/md5-cache/dev-libs/mpfr-3.1.4
index 9b834b28b038..9ba8d60f2eb5 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.4
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=4
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.mpfr.org/mpfr-3.1.4/mpfr-3.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1c5ea522477b56c435fc98f48794fb0d
+_md5_=0aa0aae3e51b96ca72a2db7fc1cefd37
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.5_p2 b/metadata/md5-cache/dev-libs/mpfr-3.1.5_p2
index 7110270188df..cb7ef696a540 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.5_p2
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.5_p2
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=5
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/4
 SRC_URI=http://www.mpfr.org/mpfr-3.1.5/mpfr-3.1.5.tar.xz https://dev.gentoo.org/~mgorny/dist/mpfr-3.1.5-patchset.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7406d7469d45a92c550b5b7134fd0241
+_md5_=d6d2829ad4ed0ee892d797d610ff91fd
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.6 b/metadata/md5-cache/dev-libs/mpfr-3.1.6
index 72b174142e70..1ae25e38a63a 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.6
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=5
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/4
 SRC_URI=http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=104f393beadb76e93819f28c1d447e45
+_md5_=8f54dd0aa2a7b927843780b1e0e96477
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1 b/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
index aa534bdeb96c..6e67888620ee 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
+++ b/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=6
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=http://www.mpfr.org/mpfr-4.0.0/mpfr-4.0.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=669adefb014f064e2306e2a876491dc5
+_md5_=9095dfeddc4f275d9ebc44217b8ce597
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.5 b/metadata/md5-cache/dev-libs/oniguruma-5.9.5
index a6a261c7b211..a7d00dc75855 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.5
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.5
@@ -4,9 +4,9 @@ DESCRIPTION=a regular expression library for different character encodings
 EAPI=4
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=mirror://gentoo/onig-5.9.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4c2bea6be09baccef552c0f1b7fbafa
+_md5_=5cd713d361f8ec295a159ab618cd4b49
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.6_p1-r1 b/metadata/md5-cache/dev-libs/oniguruma-5.9.6_p1-r1
index d1de6b940abd..77cfc70bf23d 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.6_p1-r1
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.6_p1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=a regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/2
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v5.9.6_p1/onig-5.9.6_p1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5092dd0c6fe38606b0f0618ea4447781
+_md5_=e48f63cca646cdabd9ee2f89f515f9aa
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.4.0 b/metadata/md5-cache/dev-libs/oniguruma-6.4.0
index 0a9883922c9a..83f199cc3ee0 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.4.0
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=a regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.4.0/onig-6.4.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15bdcdec7c34172b808050f0748e2949
+_md5_=3bb29679be2361a794b5d3def7da4748
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.6.1 b/metadata/md5-cache/dev-libs/oniguruma-6.6.1
index 32ad18131a2d..b754d601da45 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.6.1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.6.1
@@ -4,9 +4,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.6.1/onig-6.6.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=26e9e212685592b988d67e71cc31aeab
+_md5_=e599c4223762e5042b105659d037d734
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.7.0 b/metadata/md5-cache/dev-libs/oniguruma-6.7.0
index d434e3c85628..29edf2890995 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.7.0
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.7.0
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.7.0/onig-6.7.0.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=463d63e8ef29111794fd848d238db9a3
+_md5_=ece6d18aa0dfbc1cb1f401359818dc5d
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
index 969b8c9e15fd..c026e8195faa 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=5
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=21caab742bcf91d37d31789e2b0f30c7
+_md5_=bc873a44180f79a09393bb1a74d0f7fd
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
index 09e46fdc9376..0b48de99aa97 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5af24dc60cedef35b2db3bbe43d63016
+_md5_=f018874e3b10bb7bff9bb78280e2e4af
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2n b/metadata/md5-cache/dev-libs/openssl-1.0.2n
index 05aae76a6889..2469541e02ed 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2n
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2n
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2n.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f6ecf5f13e698b94ae23e57df9875f90
+_md5_=9279df49b4c9c762c97def521b82ec41
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2 b/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
index 54450ed8bb1e..90636f12f44e 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=6
 HOMEPAGE=http://www.openssl.org/
 IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.0g.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f27 -> openssl-1.1.0g_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f27 -> openssl-1.1.0g_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f27 -> openssl-1.1.0g_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f27 -> openssl-1.1.0-build.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f27 -> openssl-1.1.0-ec-curves.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e08e0636858a16adce5fb5649e2865fb
+_md5_=de1cc1ccbdbe4e3426c0f2e290059038
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
index 6151f5007478..4d9316d7e3d2 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
@@ -4,11 +4,11 @@ DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.
 EAPI=5
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
 IUSE=+cxx perl php static-libs php_targets_php5-5 php_targets_php5-4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-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 ~x86-macos
 LICENSE=ISC
 RDEPEND=perl? ( dev-lang/perl:= ) php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
 REQUIRED_USE=php? ( || ( php_targets_php5-5 php_targets_php5-4 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=3edef36cda342ef026c2606aef3b68d0
+_md5_=7886ad93f72cbeb3f1a7a57594c67964
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 d8729be93689..dffd02eef3af 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 ~sparc-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 ~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	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1a3941e920b36fd0c425f989693c8f15
+_md5_=a796a3652b254109c15186a879664889
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.0.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.0.0
deleted file mode 100644
index d5bd1782324b..000000000000
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=pcc compiler support libs
-EAPI=2
-HOMEPAGE=http://pcc.ludd.ltu.se
-KEYWORDS=~x86 ~amd64 ~amd64-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.0.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=77057c63e72f5cb3b91f1d71fa7e6ec7
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112 b/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
deleted file mode 100644
index cbcba58b9286..000000000000
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=pcc compiler support libs
-EAPI=2
-HOMEPAGE=http://pcc.ludd.ltu.se
-KEYWORDS=~x86 ~amd64 ~amd64-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-libs/pcc-libs-20121112.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17d32cb1dd24342bc44c9555af140ac3
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20131013 b/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20131013
deleted file mode 100644
index 7ff8bbd2296d..000000000000
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20131013
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=pcc compiler support libs
-EAPI=2
-HOMEPAGE=http://pcc.ludd.ltu.se
-KEYWORDS=~x86 ~amd64 ~amd64-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-libs/pcc-libs-20131013.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17d32cb1dd24342bc44c9555af140ac3
diff --git a/metadata/md5-cache/dev-libs/popt-1.16-r2 b/metadata/md5-cache/dev-libs/popt-1.16-r2
index 510ff8f06c4b..fa29ba6ec6d4 100644
--- a/metadata/md5-cache/dev-libs/popt-1.16-r2
+++ b/metadata/md5-cache/dev-libs/popt-1.16-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=5
 HOMEPAGE=http://rpm5.org/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://rpm5.org/files/popt/popt-1.16.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=74e68c7572ef03026b25fe0c3e3d0f51
+_md5_=93bcf711aa57d8c5801a7e033ec33627
diff --git a/metadata/md5-cache/dev-libs/ppl-1.1 b/metadata/md5-cache/dev-libs/ppl-1.1
index 23c0965a464f..f27b510aace1 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.1
+++ b/metadata/md5-cache/dev-libs/ppl-1.1
@@ -4,9 +4,9 @@ DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex system
 EAPI=5
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=+cxx doc lpsol pch static-libs test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) !dev-libs/cloog-ppl
 SLOT=0/4.13
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.1/ppl-1.1.tar.xz
-_md5_=c03c3d40dea732b68fef0df74c788848
+_md5_=8f4b673fba06fec6f988e74a2b6a2d18
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2 b/metadata/md5-cache/dev-libs/ppl-1.2
index 92baf9fcdc05..e81353dc325c 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2
+++ b/metadata/md5-cache/dev-libs/ppl-1.2
@@ -4,9 +4,9 @@ DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex system
 EAPI=5
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=+cxx doc lpsol pch static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) !dev-libs/cloog-ppl
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz
-_md5_=85022013d0a451bfb35de167d408aacf
+_md5_=12af6ef2f81d9aafd6f05019c3482378
diff --git a/metadata/md5-cache/dev-libs/quazip-0.7.3-r1 b/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
index bc125e838064..906887fb1e6b 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
+++ b/metadata/md5-cache/dev-libs/quazip-0.7.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=6
 HOMEPAGE=http://quazip.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=mirror://sourceforge/quazip/quazip-0.7.3.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7fc1934f6ab82177aba00e6921c1bc4
+_md5_=89ce4f4a46de0e18f26bef3fa16072b7
diff --git a/metadata/md5-cache/dev-libs/starpu-1.1.5 b/metadata/md5-cache/dev-libs/starpu-1.1.5
index 3aff141b9534..3d706e2ae4bf 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.1.5
+++ b/metadata/md5-cache/dev-libs/starpu-1.1.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt:5 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
+DEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=5
 HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
-IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4 static-libs test
+IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl static-libs test
 KEYWORDS=~alpha amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt:5 ) virtual/fortran
+RDEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) virtual/fortran
 SLOT=0
 SRC_URI=http://runtime.bordeaux.inria.fr/StarPU//files/starpu-1.1.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f9dbcdc18782bb5b1aba2b1fc0f1e38f
+_md5_=e5c5aab9549008e43116e348493f4bc0
diff --git a/metadata/md5-cache/dev-libs/starpu-1.1.5-r1 b/metadata/md5-cache/dev-libs/starpu-1.1.5-r1
index 6a7f7dd39b70..62ae58b2b375 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.1.5-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.1.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt:5 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
+DEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=6
 HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
-IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4 static-libs test
+IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt:5 ) virtual/fortran
+RDEPEND=sys-apps/hwloc:0= sci-mathematics/glpk:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers blas? ( sci-libs/magma ) ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) virtual/fortran
 SLOT=0/8
 SRC_URI=http://runtime.bordeaux.inria.fr/StarPU//files/starpu-1.1.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c7e593aeee913f6c53a633fd41871685
+_md5_=20f3bad12aacc5559c6e70c86dcad636
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.8.4 b/metadata/md5-cache/dev-libs/uriparser-0.8.4
index ba291bf9ec3f..85e1d52d653a 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.8.4
+++ b/metadata/md5-cache/dev-libs/uriparser-0.8.4
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( dev-qt/qthelp:4 ) ) test? ( >=dev-util/cpptest-1.1.1 )
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( dev-qt/qthelp:4 ) ) test? ( >=dev-util/cpptest-1.1.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=5
 HOMEPAGE=http://uriparser.sourceforge.net/
@@ -9,4 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=test? ( unicode )
 SLOT=0
 SRC_URI=mirror://sourceforge/uriparser/uriparser-0.8.4.tar.bz2
-_md5_=19e923823c6907fb8c8a5c7095df376f
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3234bbf895dcd9d73ed9ecc1438836eb
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.8.4-r1 b/metadata/md5-cache/dev-libs/uriparser-0.8.4-r1
new file mode 100644
index 000000000000..0e767d89c24d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uriparser-0.8.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt5? ( dev-qt/qthelp:5 ) ) test? ( >=dev-util/cpptest-1.1.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
+EAPI=6
+HOMEPAGE=http://uriparser.sourceforge.net/
+IUSE=doc qt5 test unicode
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+REQUIRED_USE=test? ( unicode )
+SLOT=0
+SRC_URI=mirror://sourceforge/uriparser/uriparser-0.8.4.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=08e28e149056827d8d03f09093566c93
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.9 b/metadata/md5-cache/dev-libs/volume_key-0.3.9
index adf07c76c81c..073acc48c1b0 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.9
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.9
@@ -4,7 +4,7 @@ DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=6
 HOMEPAGE=https://pagure.io/volume_key
 IUSE=test 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=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.9.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=658ad9b99710a0f886b1f1cb5fc127be
+_md5_=5bddb16f464188d393360f3c09b66ab6
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300
index 7f058f5f3296..6b672d5bdc33 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300
@@ -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=amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=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.0233.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=4b7d7a9d55f351ad917b5fd1a9641d1d
+_md5_=b1242f96fc64533d88c4a0fd098c41ab
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 8b2ed278ad1c..8b7f9a5326ed 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
+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_=1cf1481ec29b77ed550f66ab7c381b37
+_md5_=b913daa5dd5d7e6693c16b7650b75b36
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
new file mode 100644
index 000000000000..5d22f3745adb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl:=
+DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DBD-mysql/
+IUSE=test +ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=44410295b7e9605967bd2494aeaec27a
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
index ff7d85c57fdf..5ab7d23aad26 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
@@ -4,10 +4,10 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IPC-Run/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1c318e22afdb47df5bd6535d45ff9be8
+_md5_=ad2764c024b8b9230761cd52d7eb6ff8
diff --git a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9 b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
index cd822c2776e1..adc90bbce781 100644
--- a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
+++ b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/JSON-MaybeXS/
 IUSE=test +xs
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-JSON-PP-2.273.0 virtual/perl-Scalar-List-Utils xs? ( || ( >=dev-perl/Cpanel-JSON-XS-2.331.0 >=dev-perl/JSON-XS-3.0.0 ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.003009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c75af9e8df7425b82535951133e34a63
+_md5_=a0038bf3c683967493064efe48db148a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index ce3b82bd1c7a..a33a7ca1d7cc 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/Quota-1.7.2 b/metadata/md5-cache/dev-perl/Quota-1.7.2
deleted file mode 100644
index d8df3bf2f9d2..000000000000
--- a/metadata/md5-cache/dev-perl/Quota-1.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-fs/quota[rpc] virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Perl interface to file system quotas
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Quota/
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=sys-fs/quota[rpc] dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOMZO/Quota-1.7.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c9b19e267366db1d21ac080de76024c5
diff --git a/metadata/md5-cache/dev-perl/Quota-1.7.2-r1 b/metadata/md5-cache/dev-perl/Quota-1.7.2-r1
new file mode 100644
index 000000000000..e6176e9d0c7e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Quota-1.7.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-fs/quota[rpc] net-libs/libtirpc virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perl interface to file system quotas
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Quota/
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-fs/quota[rpc] net-libs/libtirpc dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOMZO/Quota-1.7.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=54845b4c134458b528a97dced9bab558
diff --git a/metadata/md5-cache/dev-perl/Test-Exception-0.430.0 b/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
index c764cd75c306..d7ac80917346 100644
--- a/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
+++ b/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Sub-Uplevel-0.180.0 vi
 DESCRIPTION=Test functions for exception based code
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Exception/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Sub-Uplevel-0.180.0 virtual/perl-Test-Simple >=virtual/perl-Test-Harness-2.30.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9dd18f40aa013956097e4ed17e99c68c
+_md5_=a5d5c53ccb057f1e81ec50aaf52da3e4
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 3a33cb5301cd..35d87c9c7275 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/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index 9c94f0298987..9b2fd32b9481 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=The PEAR Exception base class
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR_Exception
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=5d239d3033980e619460c3f5bc187ba1
+_md5_=58676a7ffa1347d3544558c0c0ab98cd
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
index 61d7d21bc02b..7853739f70f5 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=config install postinst prepare prerm setup
 DESCRIPTION=PEAR Base System
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=http://pear.php.net/get/PEAR-1.10.5.tgz
-_md5_=b30ca5305b6af7a224e824e49b3978b7
+_md5_=5ed69bdc308e016da61aab2990ec7594
diff --git a/metadata/md5-cache/dev-php/composer-1.5.5 b/metadata/md5-cache/dev-php/composer-1.5.5
deleted file mode 100644
index 0fe7362fe9f4..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.5.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=6
-HOMEPAGE=https://github.com/composer/composer
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-3.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.0.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.5.5.tar.gz -> composer-1.5.5.tar.gz
-_md5_=4aedb58adb91ff12648cdf83ab39ddce
diff --git a/metadata/md5-cache/dev-php/composer-1.6.2 b/metadata/md5-cache/dev-php/composer-1.6.2
new file mode 100644
index 000000000000..d5f5bb329f05
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-1.6.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Dependency Manager for PHP
+EAPI=6
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-3.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.2.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/1.6.2.tar.gz -> composer-1.6.2.tar.gz
+_md5_=9a949cfa4559d7c91dd49e6d5cfac2b4
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1
deleted file mode 100644
index 67e24881437a..000000000000
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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.8.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13d15dc9970370311c87710caa060cce
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.9 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.9
new file mode 100644
index 000000000000..8c8d20a444e0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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.9.tgz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c2f10da02582163b7b88c19ac5464d3a
diff --git a/metadata/md5-cache/dev-php/semver-1.0.0 b/metadata/md5-cache/dev-php/semver-1.0.0
deleted file mode 100644
index 1ee251d14b63..000000000000
--- a/metadata/md5-cache/dev-php/semver-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Semantic versioning utilities, constraint parsing, and checking
-EAPI=6
-HOMEPAGE=https://github.com/composer/semver
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/semver/archive/1.0.0.tar.gz -> semver-1.0.0.tar.gz
-_md5_=1ad12246e2bd2722b55aa2045d14ba9a
diff --git a/metadata/md5-cache/dev-php/semver-1.4.2 b/metadata/md5-cache/dev-php/semver-1.4.2
new file mode 100644
index 000000000000..29e03c9e4cca
--- /dev/null
+++ b/metadata/md5-cache/dev-php/semver-1.4.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Semantic versioning utilities, constraint parsing, and checking
+EAPI=6
+HOMEPAGE=https://github.com/composer/semver
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/semver/archive/1.4.2.tar.gz -> semver-1.4.2.tar.gz
+_md5_=ab83c487e750f8f4b3b40bc250ba200d
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.0.0 b/metadata/md5-cache/dev-php/spdx-licenses-1.0.0
deleted file mode 100644
index ce9dad6a8b15..000000000000
--- a/metadata/md5-cache/dev-php/spdx-licenses-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=6
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.0.0.tar.gz -> spdx-licenses-1.0.0.tar.gz
-_md5_=968e1ca2d9ccc88344c039ace5802330
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.2.0 b/metadata/md5-cache/dev-php/spdx-licenses-1.2.0
new file mode 100644
index 000000000000..aaf725e15c7d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/spdx-licenses-1.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tools for working with and validating SPDX licenses
+EAPI=6
+HOMEPAGE=https://github.com/composer/spdx-licenses
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/spdx-licenses/archive/1.2.0.tar.gz -> spdx-licenses-1.2.0.tar.gz
+_md5_=0a5ffcecb6fcdad3cbdf7d71f1501751
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0ec3f3fc0b82..3544bb380841 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/PyQt4-4.12 b/metadata/md5-cache/dev-python/PyQt4-4.12
deleted file mode 100644
index 2e76c2380cf9..000000000000
--- a/metadata/md5-cache/dev-python/PyQt4-4.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 ) dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=X compat dbus debug declarative designer doc examples help multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=23c1e7b0ed9443f5807ade22ab39cb71
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.12.1 b/metadata/md5-cache/dev-python/PyQt4-4.12.1
index 130d921ad5f1..66e8634a7303 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.12.1
+++ b/metadata/md5-cache/dev-python/PyQt4-4.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=X compat dbus debug declarative designer doc examples help multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 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.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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cec61077265943cd395816245277ee84
+_md5_=a3c6c7dcd71cffdfd6e81e82ebd9e790
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.22.0 b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
index 0b43e33fc40a..19a8c05bd77d 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.22.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.22.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=amd64 arm arm64 hppa ia64 mips ppc ppc64 x86 ~x64-solaris
+KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~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=mirror://pypi/a/asn1crypto/asn1crypto-0.22.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c0a8e74295fefe2764397283789ecf7
+_md5_=6dac010e0fb092728d6fa3f879c82485
diff --git a/metadata/md5-cache/dev-python/bottleneck-0.8.0 b/metadata/md5-cache/dev-python/bottleneck-0.8.0
index fd070b55803a..a99058c500a5 100644
--- a/metadata/md5-cache/dev-python/bottleneck-0.8.0
+++ b/metadata/md5-cache/dev-python/bottleneck-0.8.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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=Fast NumPy array functions written in Cython
 EAPI=5
-HOMEPAGE=http://berkeleyanalytics.com/bottleneck
+HOMEPAGE=https://pypi.python.org/pypi/Bottleneck
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/Bottleneck/Bottleneck-0.8.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f58ae104c12bc4d962c256ab8e86f5d
+_md5_=076b947b04374d64ee19b6f7a7a511ad
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.0.0 b/metadata/md5-cache/dev-python/bottleneck-1.0.0
index 11b7c177b888..c1c50cf102a5 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.0.0
+++ b/metadata/md5-cache/dev-python/bottleneck-1.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/numpy-1.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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=Fast NumPy array functions written in Cython
 EAPI=5
-HOMEPAGE=http://berkeleyanalytics.com/bottleneck
+HOMEPAGE=https://pypi.python.org/pypi/Bottleneck
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/Bottleneck/Bottleneck-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98dd4dcf772b98e083c14338adc8a4d4
+_md5_=958ad4c176e5597da524f2758b323c68
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0 b/metadata/md5-cache/dev-python/cheroot-6.0.0
index 01332015cd10..2c001e149b51 100644
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0
+++ b/metadata/md5-cache/dev-python/cheroot-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=6
 HOMEPAGE=http://www.cherrypy.org/ https://pypi.python.org/pypi/Cheroot https://github.com/cherrypy/cheroot
 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 ~ppc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.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/more-itertools-2.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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd42610176c56bc4a09591c5118b2655
+_md5_=5701601c9d870e51899c90ee06c0e93c
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0 b/metadata/md5-cache/dev-python/cherrypy-13.1.0
index 079bf4052f79..82f76d635f6a 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
 EAPI=6
 HOMEPAGE=http://www.cherrypy.org/ https://pypi.python.org/pypi/CherryPy
 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 ~ppc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cheroot-5.9.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/portend-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.11.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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6352b8291d90fe1bb8c441cacdab6c35
+_md5_=3700e3e8a9d56d3324f6d282439f26eb
diff --git a/metadata/md5-cache/dev-python/construct-2.8.21 b/metadata/md5-cache/dev-python/construct-2.8.21
new file mode 100644
index 000000000000..5e3cbefce035
--- /dev/null
+++ b/metadata/md5-cache/dev-python/construct-2.8.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A powerful declarative parser for binary data
+EAPI=6
+HOMEPAGE=http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/construct/construct/archive/v2.8.21.tar.gz -> construct-2.8.21.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5bae14e3c32faec1846f0471fe675db4
diff --git a/metadata/md5-cache/dev-python/cryptography-2.0.2-r1 b/metadata/md5-cache/dev-python/cryptography-2.0.2-r1
index 42ce754c96ab..306eb82aa38c 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.0.2-r1
@@ -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=amd64 arm arm64 hppa ia64 mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65b0fbf17bb70ee71f3d36cab31444c2
+_md5_=c27196c24cb882ba17e68701e69a4c26
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.0.2 b/metadata/md5-cache/dev-python/cryptography-vectors-2.0.2
index deecef4f689b..86414a2a4d64 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.0.2
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7569525029022eb04fe0c54c3c601040
+_md5_=52eb0ae9aeb26f7890de24c837b71e67
diff --git a/metadata/md5-cache/dev-python/docutils-0.11 b/metadata/md5-cache/dev-python/docutils-0.11
index 51d2d85c8df6..4c25751bcea2 100644
--- a/metadata/md5-cache/dev-python/docutils-0.11
+++ b/metadata/md5-cache/dev-python/docutils-0.11
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=5
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.11.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89b4d8d4057c119ed1b0d8ada9c66ea5
+_md5_=7bdc24eaa30daaa545db75b925dbb708
diff --git a/metadata/md5-cache/dev-python/docutils-0.12 b/metadata/md5-cache/dev-python/docutils-0.12
index 3ec7a431dd8a..28152a1570a6 100644
--- a/metadata/md5-cache/dev-python/docutils-0.12
+++ b/metadata/md5-cache/dev-python/docutils-0.12
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=5
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils
 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bda1cf0610fc87cdf98e63f45d4ea57b
+_md5_=2a2e61d1bce106f4df7558e965f1a514
diff --git a/metadata/md5-cache/dev-python/docutils-0.13.1 b/metadata/md5-cache/dev-python/docutils-0.13.1
index 52685272760c..9932e505c31b 100644
--- a/metadata/md5-cache/dev-python/docutils-0.13.1
+++ b/metadata/md5-cache/dev-python/docutils-0.13.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=6
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils
 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.13.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f331ebed0254b4e0821352076549829
+_md5_=05ae49de8228fcb64144884502b778c1
diff --git a/metadata/md5-cache/dev-python/docutils-0.14 b/metadata/md5-cache/dev-python/docutils-0.14
index 2c074790cfdd..54e3307878e0 100644
--- a/metadata/md5-cache/dev-python/docutils-0.14
+++ b/metadata/md5-cache/dev-python/docutils-0.14
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=6
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils
 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.14.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44079ccf2050d39c1b66b66e3cbcb0d6
+_md5_=9456799d511d4fa1959b817ada439dd0
diff --git a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1 b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
index 76a53360ed7c..368e05640c68 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
+++ b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Gentoo GLEP support for docutils
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/glep/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 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(-)] >=dev-python/docutils-0.10[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://gentoo/glep-0.4-r1.tbz2
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8c0c10e57afd9f8a887885d59f399a18
+_md5_=d283aa365d02638f14f091f9c2abeaca
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.1 b/metadata/md5-cache/dev-python/docutils-glep-1.1
index 59696ce1d6fb..b1246ccbd31a 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.1
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo GLEP support for docutils
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/docutils-glep/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=>=dev-python/docutils-0.10[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/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/d/docutils_glep/docutils_glep-1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32de5048651cd184f6a2427947736567
+_md5_=99d7c4f0cfc7f0a90d9fb61aea9ad06f
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
index 7e8b9e7a8fbd..ac873318008f 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=eGenix utils for Python
 EAPI=5
 HOMEPAGE=http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=eGenixPublic-1.1
 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=http://downloads.egenix.com/python/egenix-mx-base-3.2.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dec137d5b505f24d829f62f0145c8425
+_md5_=19bfefa38f03ed0f3e986ea8d82c2162
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
index fda77670e4b6..ad21046b3c59 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=eGenix utils for Python
 EAPI=5
 HOMEPAGE=http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=eGenixPublic-1.1
 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=http://downloads.egenix.com/python/egenix-mx-base-3.2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab77e80eddc300f8b3f300365a5c9eb1
+_md5_=a5cef16d409c5a272f8d2c725cf57b1c
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
index c6b75bd7256e..1417bef94b40 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=eGenix utils for Python
 EAPI=5
 HOMEPAGE=http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=eGenixPublic-1.1
 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=http://downloads.egenix.com/python/egenix-mx-base-3.2.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5116686895892c0b455adb71e30ba58c
+_md5_=c2241168cf75a8481df079927ca71e8b
diff --git a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2 b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
index c9e5fdf980f0..1c1861a7ac06 100644
--- a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
+++ b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for generating API documentation for Python modules from docstr
 EAPI=5
 HOMEPAGE=http://epydoc.sourceforge.net/
 IUSE=doc latex tk python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/epydoc/epydoc-3.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e50ca86e95542e2aea57551aa52a03c
+_md5_=30bb39291e1765358a04a248e3656d8f
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0 b/metadata/md5-cache/dev-python/fields-5.0.0
index 2dbde256dcfb..134f6305eeb1 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0
+++ b/metadata/md5-cache/dev-python/fields-5.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Container class boilerplate killer
 EAPI=6
 HOMEPAGE=https://github.com/ionelmc/python-fields
 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 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/f/fields/fields-5.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56cf8d3faeca62c68c5a9be9ad003430
+_md5_=d5266cf5f1f5aaf01f4ea9a5d4f9bf20
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999999999 b/metadata/md5-cache/dev-python/html5lib-0.999999999
index 66ebb772c86c..c9c4dc8b35bb 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 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	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa007da85c74661aa8c817a75cb152da
+_md5_=8ab8d0ff084259b15d4146a91164f4b9
diff --git a/metadata/md5-cache/dev-python/josepy-1.0.1 b/metadata/md5-cache/dev-python/josepy-1.0.1
index a97df2f0b49d..760ea8bdf117 100644
--- a/metadata/md5-cache/dev-python/josepy-1.0.1
+++ b/metadata/md5-cache/dev-python/josepy-1.0.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/jezdez/josepy
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-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/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/setuptools-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/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<=app-crypt/acme-0.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b94d88fa97a7778c1f013217c5e21d20
+_md5_=dc15b3755b457660fe65bf8c4b870eea
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.1.0-r2 b/metadata/md5-cache/dev-python/matplotlib-2.1.0-r2
new file mode 100644
index 000000000000..297b96dd24bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-2.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=6
+HOMEPAGE=http://matplotlib.org/
+IUSE=cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.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(-)] excel? ( 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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[gui,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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/matplotlib-2.1.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c348c957be5f4cca9dcc8ebfc6a6992
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1
new file mode 100644
index 000000000000..3799be53cdbe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=6
+HOMEPAGE=http://matplotlib.org/
+IUSE=cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.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(-)] excel? ( 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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[gui,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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/matplotlib-2.1.2.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d77ba95b14c64c7bfb63649fb97b9a0
diff --git a/metadata/md5-cache/dev-python/mimeparse-1.6.0 b/metadata/md5-cache/dev-python/mimeparse-1.6.0
index 187064682dc3..b42ac9257c09 100644
--- a/metadata/md5-cache/dev-python/mimeparse-1.6.0
+++ b/metadata/md5-cache/dev-python/mimeparse-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Basic functions for handling mime-types in python
 EAPI=6
 HOMEPAGE=https://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse
 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 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/python-mimeparse/python-mimeparse-1.6.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80bc9efcf208f36ef197c0606fa27190
+_md5_=a5c06b43e405c2a4218b883c9fe2dfdd
diff --git a/metadata/md5-cache/dev-python/more-itertools-3.0.0 b/metadata/md5-cache/dev-python/more-itertools-3.0.0
index e9e4b39abcb5..61d57908ca88 100644
--- a/metadata/md5-cache/dev-python/more-itertools-3.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/more-itertools
 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=amd64 ~ppc x86
+KEYWORDS=amd64 ~ia64 ~ppc x86
 LICENSE=MIT
 RDEPEND=<dev-python/six-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(-)] 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/more-itertools/more-itertools-3.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8df3470ecfb8224f3d6cc599967c95f2
+_md5_=40414da9bdaae5e3ca1be668dafa09eb
diff --git a/metadata/md5-cache/dev-python/packaging-16.8 b/metadata/md5-cache/dev-python/packaging-16.8
index 06ba067ebdf6..c95eb08ce659 100644
--- a/metadata/md5-cache/dev-python/packaging-16.8
+++ b/metadata/md5-cache/dev-python/packaging-16.8
@@ -4,11 +4,11 @@ DESCRIPTION=Core utilities for Python packages
 EAPI=6
 HOMEPAGE=https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 BSD-2 )
 RDEPEND=>=dev-python/pyparsing-2.1.10[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[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-16.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f140424e09ae7f2d25f833cd55120c54
+_md5_=f646ef30c7d5a41c46a1d27b59eda562
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.15 b/metadata/md5-cache/dev-python/pocketlint-0.15
index 5cb3fb8dc168..2733c2d8aa27 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.15
+++ b/metadata/md5-cache/dev-python/pocketlint-0.15
@@ -4,11 +4,11 @@ DESCRIPTION=Shared code for running pylint against rhinstaller projects
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/pocketlint
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.15.tar.gz -> pocketlint-0.15.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a94b1eb89e7cbefb3a551f0582866b5b
+_md5_=3ffdd0e153499a15405da1138d96a704
diff --git a/metadata/md5-cache/dev-python/polib-1.0.7 b/metadata/md5-cache/dev-python/polib-1.0.7
index 0abd1cb5f6b1..95f5e38b5f53 100644
--- a/metadata/md5-cache/dev-python/polib-1.0.7
+++ b/metadata/md5-cache/dev-python/polib-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A library to manipulate gettext files (.po and .mo files)
 EAPI=6
 HOMEPAGE=https://bitbucket.org/izi/polib/wiki/Home
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.0.7.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d8f1f8eeb0d8c868bd302aaa7b3c85c
+_md5_=345779435b8555261a15fbf2131b29a3
diff --git a/metadata/md5-cache/dev-python/portend-2.2 b/metadata/md5-cache/dev-python/portend-2.2
index a73375f91bff..e5fa4f71c78b 100644
--- a/metadata/md5-cache/dev-python/portend-2.2
+++ b/metadata/md5-cache/dev-python/portend-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=TCP port monitoring utilities
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/portend https://github.com/jaraco/portend
 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 ~ppc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/portend/portend-2.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=494439bdeb0772121e0f612e8718ef9c
+_md5_=7c496c6bd9caebdb2492a45b7380fab7
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.1.0 b/metadata/md5-cache/dev-python/pyblake2-1.1.0
index 434c361a9583..dba7817b46b4 100644
--- a/metadata/md5-cache/dev-python/pyblake2-1.1.0
+++ b/metadata/md5-cache/dev-python/pyblake2-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=BLAKE2 hash function extension module
 EAPI=6
 HOMEPAGE=https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( CC0-1.0 openssl Apache-2.0 )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyblake2/pyblake2-1.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c71d6680a41e8c87beb9155992515030
+_md5_=57d448127493a12e093f73d7420679e0
diff --git a/metadata/md5-cache/dev-python/pycairo-1.10.0-r5 b/metadata/md5-cache/dev-python/pycairo-1.10.0-r5
deleted file mode 100644
index 538b22e4f702..000000000000
--- a/metadata/md5-cache/dev-python/pycairo-1.10.0-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] >=x11-libs/cairo-1.10.0[svg?,xcb?] xcb? ( x11-libs/xpyb ) virtual/pkgconfig test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Python bindings for the cairo library
-EAPI=5
-HOMEPAGE=http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo
-IUSE=doc examples +svg test xcb python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-3 || ( LGPL-2.1 MPL-1.1 )
-RDEPEND=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(-)] >=x11-libs/cairo-1.10.0[svg?,xcb?] xcb? ( x11-libs/xpyb )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2 http://cairographics.org/releases/pycairo-1.10.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pycairo-1.10.0-gentoo-patchset.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=6c4b3ad283de524f5d4752940dec2216
diff --git a/metadata/md5-cache/dev-python/pycairo-1.15.3 b/metadata/md5-cache/dev-python/pycairo-1.15.3
index d4c4e8e599d5..ae05fa4b86a5 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.15.3
+++ b/metadata/md5-cache/dev-python/pycairo-1.15.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=6
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=doc examples test xcb python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg,xcb?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.15.3/pycairo-1.15.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd3ffff09081b3a19f114ce7e4823f0f
+_md5_=31aa704402fd17e059d71fb45c4b9fbe
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2 b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
index 543284272025..281c752a68e3 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python Cryptography Toolkit
 EAPI=6
 HOMEPAGE=http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto
 IUSE=doc +gmp test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=PSF-2 public-domain
 RDEPEND=gmp? ( dev-libs/gmp:0= ) 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=test? ( gmp ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25b9793a8021f1a25616e19d8552482f
+_md5_=c2a8bec2afdca4f32d218a2f1caf7a7d
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.24 b/metadata/md5-cache/dev-python/pyelftools-0.24
index 978694faa32c..2e4dccb45e0b 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.24
+++ b/metadata/md5-cache/dev-python/pyelftools-0.24
@@ -4,11 +4,11 @@ DESCRIPTION=pure-Python library for analyzing ELF files and DWARF debugging info
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pyelftools https://github.com/eliben/pyelftools
 IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 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/p/pyelftools/pyelftools-0.24.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4352de0ffb6cc1a78db8c7767b2f73a5
+_md5_=35eca1a1a4742327ac923eec897149ee
diff --git a/metadata/md5-cache/dev-python/pyopenssl-17.2.0 b/metadata/md5-cache/dev-python/pyopenssl-17.2.0
index 042546abcbc5..f90d385ac34a 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-17.2.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-17.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the OpenSSL library
 EAPI=6
 HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL
 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=amd64 arm arm64 hppa ia64 mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-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(-)] 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/p/pyOpenSSL/pyOpenSSL-17.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a912d630ce0c09870e59359b1bd9e329
+_md5_=e8ad6805184f6b555b3d614d5c7e35e9
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1 b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
new file mode 100644
index 000000000000..f755ae664139
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
+EAPI=6
+HOMEPAGE=http://www.pyqtgraph.org/ https://pypi.python.org/pypi/pyqtgraph/
+IUSE=doc examples opengl svg python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.pyqtgraph.org/downloads/0.10.0/pyqtgraph-0.10.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f12ac636182d4118df2b92a6699e9e4e
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.13.0 b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
index 9fff0f6e9658..373b17a28e27 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.13.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=6
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=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(-)] 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/pyrsistent/pyrsistent-0.13.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebbb39d021cb73b2b21662a3b54279db
+_md5_=dfc06586858b3d8f67146a49e16b90b5
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1 b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
index 78f63ff22203..0b05c1809ca6 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin for coverage reporting
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov
 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=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.3[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/cov-core-1.14.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/coverage-3.7.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(-)] 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(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.5.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=548372991a63309f2eaf18c5d1f62935
+_md5_=2fb0ddc0e152a11a84d5a8513b059b18
diff --git a/metadata/md5-cache/dev-python/python-docs-2.7.14 b/metadata/md5-cache/dev-python/python-docs-2.7.14
index 517ed2f0d0ea..a5ad0cafbb37 100644
--- a/metadata/md5-cache/dev-python/python-docs-2.7.14
+++ b/metadata/md5-cache/dev-python/python-docs-2.7.14
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/doc/2.7.14/python-2.7.14-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=8e1c91c6752bb2f9607fdd9ef1c4672c
+_md5_=d71098d938f764ffa0ba3f4b1aa29cce
diff --git a/metadata/md5-cache/dev-python/python-docs-3.4.5 b/metadata/md5-cache/dev-python/python-docs-3.4.5
index 475728dc08d7..d7fc01789551 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.4.5
+++ b/metadata/md5-cache/dev-python/python-docs-3.4.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=3.4
 SRC_URI=https://www.python.org/ftp/python/doc/3.4.5/python-3.4.5-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=8e1c91c6752bb2f9607fdd9ef1c4672c
+_md5_=d71098d938f764ffa0ba3f4b1aa29cce
diff --git a/metadata/md5-cache/dev-python/python-docs-3.4.6 b/metadata/md5-cache/dev-python/python-docs-3.4.6
index 69a4a3611b29..2671aa512cbc 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.4.6
+++ b/metadata/md5-cache/dev-python/python-docs-3.4.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=3.4
 SRC_URI=https://www.python.org/ftp/python/doc/3.4.6/python-3.4.6-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=ab7a275656521c4d7e28de544113e632
+_md5_=56fef02d38c75a73ea9ed2244a937f5d
diff --git a/metadata/md5-cache/dev-python/python-docs-3.5.4 b/metadata/md5-cache/dev-python/python-docs-3.5.4
index 33b55d6565b5..0fd5f083a605 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.5.4
+++ b/metadata/md5-cache/dev-python/python-docs-3.5.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=3.5
 SRC_URI=https://www.python.org/ftp/python/doc/3.5.4/python-3.5.4-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=062450d42e94fad6aee0b24088fc845f
+_md5_=67f6f0512896401e0809bb3f311a7b62
diff --git a/metadata/md5-cache/dev-python/python-docs-3.6.3 b/metadata/md5-cache/dev-python/python-docs-3.6.3
index 600fcbf26ded..87408d773c50 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.6.3
+++ b/metadata/md5-cache/dev-python/python-docs-3.6.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=3.6
 SRC_URI=https://www.python.org/ftp/python/doc/3.6.3/python-3.6.3-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=079f376884f9a2bba884be9e44417939
+_md5_=c47ba765d9a857eef40cfb00419bd686
diff --git a/metadata/md5-cache/dev-python/python-docs-3.6.4 b/metadata/md5-cache/dev-python/python-docs-3.6.4
index 2f8d529fb3b3..58ddd00a040c 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.6.4
+++ b/metadata/md5-cache/dev-python/python-docs-3.6.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=6
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 SLOT=3.6
 SRC_URI=https://www.python.org/ftp/python/doc/3.6.4/python-3.6.4-docs-html.tar.bz2
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc
-_md5_=ab7a275656521c4d7e28de544113e632
+_md5_=56fef02d38c75a73ea9ed2244a937f5d
diff --git a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1 b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
index fb9a1269454b..1316f4137190 100644
--- a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to find the checksum of files
 EAPI=5
 HOMEPAGE=http://code.fluffytapeworm.com/projects
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.fluffytapeworm.com/projects/python-fchksum-1.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee8bbb1527aaf66e8172af5c6519278c
+_md5_=e50932d228cb061f5010016bb559fd47
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index 83055d5fcad8..35ef3f4681cc 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to libudev
 EAPI=6
 HOMEPAGE=http://pyudev.readthedocs.org https://github.com/pyudev/pyudev
 IUSE=pygobject qt5 pyside test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/udev 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(-)] pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyside? ( 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(-)] ) 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=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7bd54970a069a56d8d5a2e3cb26caee
+_md5_=f6145234118b9e9fac146727fbe9c38b
diff --git a/metadata/md5-cache/dev-python/reportlab-3.3.0-r1 b/metadata/md5-cache/dev-python/reportlab-3.3.0-r1
deleted file mode 100644
index 7948c39f6e5c..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=5
-HOMEPAGE=http://www.reportlab.com/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/reportlab/reportlab-3.3.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf8fdb993927d51a4deb8a70663fed8d
diff --git a/metadata/md5-cache/dev-python/reportlab-3.3.0-r2 b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
new file mode 100644
index 000000000000..529c24c8955e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=5
+HOMEPAGE=http://www.reportlab.com/
+IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.3.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=113cf2959141c3f4b65ab9482b720cf9
diff --git a/metadata/md5-cache/dev-python/reportlab-3.4.0 b/metadata/md5-cache/dev-python/reportlab-3.4.0
deleted file mode 100644
index 7e6e00a0324c..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=6
-HOMEPAGE=http://www.reportlab.com/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/reportlab/reportlab-3.4.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0eb69a774db45d1c36242f62caa6d33
diff --git a/metadata/md5-cache/dev-python/reportlab-3.4.0-r1 b/metadata/md5-cache/dev-python/reportlab-3.4.0-r1
new file mode 100644
index 000000000000..32d5d3335d3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.4.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=6
+HOMEPAGE=http://www.reportlab.com/
+IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.4.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dcb0849d8063d32041252d727b97b7d6
diff --git a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1 b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
index 17adddd444c7..e5dc0870be2c 100644
--- a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
+++ b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[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(-)]
 RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.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/appdirs-1.4.0-r1[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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-34.0.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc66b1ced371a7c8db6abcd9d6244342
+_md5_=703473b9b5494713a3867f05e6b648b9
diff --git a/metadata/md5-cache/dev-python/setuptools-36.0.1 b/metadata/md5-cache/dev-python/setuptools-36.0.1
index 46ffdbf786f5..a361d89b3a77 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.0.1
+++ b/metadata/md5-cache/dev-python/setuptools-36.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-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 ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[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(-)]
 RDEPEND=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.0.1.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=778606ec3ad336e165122c345bd4ddd0
+_md5_=a0ab4926d5e487afb766001e6e690780
diff --git a/metadata/md5-cache/dev-python/sip-4.19.1 b/metadata/md5-cache/dev-python/sip-4.19.1
deleted file mode 100644
index cab51afd9180..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-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/12
-SRC_URI=mirror://sourceforge/pyqt/sip-4.19.1.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9223b8c840a41ac171e437829d1b9cb4
diff --git a/metadata/md5-cache/dev-python/sip-4.19.3 b/metadata/md5-cache/dev-python/sip-4.19.3
index 30e4a143c309..56d5a8a66d21 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.3
+++ b/metadata/md5-cache/dev-python/sip-4.19.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
 IUSE=debug doc 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 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/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.3.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e775b90db44944a3e06d7b6393fe1adc
+_md5_=2c9690c5d26d2bc5d39f78aa9253a800
diff --git a/metadata/md5-cache/dev-python/tempora-1.9 b/metadata/md5-cache/dev-python/tempora-1.9
index f54ff802473e..8224abe70738 100644
--- a/metadata/md5-cache/dev-python/tempora-1.9
+++ b/metadata/md5-cache/dev-python/tempora-1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/tempora
 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=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
 LICENSE=MIT
 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/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(-)] 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/t/tempora/tempora-1.9.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ab48f9bbeae9d311d1c6cd1f4889ebf
+_md5_=d20928af805f569e595a44ca50278982
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 139182132664..82e7031797c7 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.3.1 b/metadata/md5-cache/dev-qt/qt-creator-4.3.1
deleted file mode 100644
index 5b67356fc820..000000000000
--- a/metadata/md5-cache/dev-qt/qt-creator-4.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.0:5 >=dev-qt/qtcore-5.6.0:5 >=dev-qt/qtdeclarative-5.6.0:5[widgets] >=dev-qt/qtgui-5.6.0:5 >=dev-qt/qthelp-5.6.0:5 >=dev-qt/qtnetwork-5.6.0:5[ssl] >=dev-qt/qtprintsupport-5.6.0:5 >=dev-qt/qtquickcontrols-5.6.0:5 >=dev-qt/qtscript-5.6.0:5 >=dev-qt/qtsql-5.6.0:5[sqlite] >=dev-qt/qtsvg-5.6.0:5 >=dev-qt/qtwidgets-5.6.0:5 >=dev-qt/qtx11extras-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 clangcodemodel? ( <sys-devel/clang-5:= || ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) ) designer? ( >=dev-qt/designer-5.6.0:5 ) qbs? ( >=dev-util/qbs-1.8.1-r1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets] ) >=dev-qt/linguist-tools-5.6.0:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.6.0:5 ) test? ( >=dev-qt/qtdeclarative-5.6.0:5[localstorage,xml] >=dev-qt/qtquickcontrols2-5.6.0:5 >=dev-qt/qttest-5.6.0:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=6
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.0:5 >=dev-qt/qtcore-5.6.0:5 >=dev-qt/qtdeclarative-5.6.0:5[widgets] >=dev-qt/qtgui-5.6.0:5 >=dev-qt/qthelp-5.6.0:5 >=dev-qt/qtnetwork-5.6.0:5[ssl] >=dev-qt/qtprintsupport-5.6.0:5 >=dev-qt/qtquickcontrols-5.6.0:5 >=dev-qt/qtscript-5.6.0:5 >=dev-qt/qtsql-5.6.0:5[sqlite] >=dev-qt/qtsvg-5.6.0:5 >=dev-qt/qtwidgets-5.6.0:5 >=dev-qt/qtx11extras-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 clangcodemodel? ( <sys-devel/clang-5:= || ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) ) designer? ( >=dev-qt/designer-5.6.0:5 ) qbs? ( >=dev-util/qbs-1.8.1-r1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( <sys-devel/clang-5:* || ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.0:5 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.3/4.3.1/qt-creator-opensource-src-4.3.1.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26c4ee72ac1cd2361d1c55fdd3ec7649
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.4.1 b/metadata/md5-cache/dev-qt/qt-creator-4.4.1
index a91b86ccae47..a30060516ea2 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.4.1
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
 EAPI=6
 HOMEPAGE=https://doc.qt.io/qtcreator/
 IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.9.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.2:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.4/4.4.1/qt-creator-opensource-src-4.4.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7382d2b1ef79459d17112b53a256615
+_md5_=92ef28eefb39263eb87138733af19df2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a795837681cb..f5e5e34265d9 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/ammeter-1.1.4-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
index 8df7027d99fa..ad642cc82b65 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3[ruby_targets_ruby24] >=dev-ruby/rake-0.10[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby24] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby24] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] dev-util/aruba[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Write specs for your Rails 3+ generators
 EAPI=5
 HOMEPAGE=https://github.com/alexrothenberg/ammeter
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e82b38fec5082775a6bbbc74d93a6486
+_md5_=a341662c622b914d9a892363c5c828a2
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.3 b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
new file mode 100644
index 000000000000..fd3427a4524e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[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? ( 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=Methods for encoding/decoding Adobe's binary-to-text encoding of the same name
+EAPI=6
+HOMEPAGE=https://github.com/datawraith/ascii85gem
+IUSE=test 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
+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=0
+SRC_URI=mirror://rubygems/Ascii85-1.0.3.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b19206f05c8d76e89f82360e71a4e09b
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.0 b/metadata/md5-cache/dev-ruby/ast-2.4.0
new file mode 100644
index 000000000000..10b6ffebd575
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bacon[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=A library for working with abstract syntax trees
+EAPI=6
+HOMEPAGE=https://github.com/whitequark/ast
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_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/ast-2.4.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=29937d63e420a9c8ed316f6972f3833e
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
deleted file mode 100644
index 4a8ec9b6a7f6..000000000000
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Provides a simple and natural way to build fault-tolerant concurrent programs
-EAPI=5
-HOMEPAGE=https://github.com/celluloid/celluloid
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c241420f06bd73a09e56eabc32d5b8c2
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2 b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
deleted file mode 100644
index 9fa23d61d556..000000000000
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Evented IO for Celluloid actors
-EAPI=5
-HOMEPAGE=https://github.com/celluloid/celluloid-io
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/celluloid-io-0.16.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0fb054261830d1b265e7b58bc491a9a6
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.10 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.10
new file mode 100644
index 000000000000..b1353298f80d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( 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=Pure Ruby library that can read and write PNG images
+EAPI=6
+HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/chunky_png-1.3.10.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7b85fbeb0d8160a5e8dd7e8cfa950ff5
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
deleted file mode 100644
index e0e8b21b3f9a..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-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_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.3.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=229e67d858c89ce04f3eef77e452f67b
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
deleted file mode 100644
index 7ea95dda7ef9..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-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_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.3.7.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8212272f92d1e7c7ddf2c28e6d5c4db8
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
deleted file mode 100644
index af9012335abc..000000000000
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
-EAPI=5
-HOMEPAGE=http://jashkenas.github.io/coffee-script/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x64-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/coffee-script-source-1.9.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ceb26a66766f0ab6e589390ca72f2f3e
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index 66c9e879abca..0a695d0b39cd 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] <dev-ruby/sass-3.5:*[ruby_targets_ruby24] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Compass Stylesheet Authoring Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] <dev-ruby/sass-3.5:*[ruby_targets_ruby24] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb9d4be067dcf6676082784edb33c048
+_md5_=dee42565a2038074bfff23e858307512
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index aca28747a591..8d0aac0fefa5 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] <dev-ruby/sass-3.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? ( 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=Compass Stylesheet Authoring Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] <dev-ruby/sass-3.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? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fae2e84483b9615a4366e78ea239c07a
+_md5_=92fe128162b191d11c5d13844e51f3c8
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index 184418f9b099..07603877c65c 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] <dev-ruby/sass-3.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? ( 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=Speed up your Sass compilation by making @import only import each file once
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] <dev-ruby/sass-3.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? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-import-once-1.0.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a1b12df06516cf5977ea7f0a764ed409
+_md5_=e0756dab91d46080d499a1018dc5b84d
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
deleted file mode 100644
index 604817ac1033..000000000000
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Really simple JSON and XML parsing, ripped from Merb and Rails
-EAPI=5
-HOMEPAGE=https://github.com/jnunemaker/crack
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=787bc59046f4a97414171b4facad314a
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
index 06cf506fb655..5a435fcf8e82 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Really simple JSON and XML parsing, ripped from Merb and Rails
 EAPI=5
 HOMEPAGE=https://github.com/jnunemaker/crack
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=69212082f27acecc1cb9fffebf16ff58
+_md5_=9a77696dc6519c0228e8e161390f7488
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.4 b/metadata/md5-cache/dev-ruby/daemons-1.2.4
deleted file mode 100644
index 6d14881873cf..000000000000
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
-EAPI=5
-HOMEPAGE=https://github.com/thuehlinger/daemons
-IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.4.tar.gz -> daemons-1.2.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8d91285a7ccf1e03723183ac60986294
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.5 b/metadata/md5-cache/dev-ruby/daemons-1.2.5
deleted file mode 100644
index 2c7f09c9492c..000000000000
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
-EAPI=6
-HOMEPAGE=https://github.com/thuehlinger/daemons
-IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.5.tar.gz -> daemons-1.2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d6e665697ca7b2e26310325b46a07e5
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.6 b/metadata/md5-cache/dev-ruby/daemons-1.2.6
index 086aa40f80f3..81a5aa9f05eb 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.6
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
 EAPI=6
 HOMEPAGE=https://github.com/thuehlinger/daemons
 IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.6.tar.gz -> daemons-1.2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d6e665697ca7b2e26310325b46a07e5
+_md5_=f2a7f70f8b51df87c30006b3c4e5e8a4
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
index 9063f8dc34dc..1849e179549b 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION='did you mean?'experience in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/yuki24/did_you_mean
 IUSE=elibc_FreeBSD ruby_targets_ruby23 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/did_you_mean-1.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=943b2f8fabd6c6c11a1add14f7f693cd
+_md5_=bfcb5046d94721b6b4904ddd846794b8
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.24 b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
deleted file mode 100644
index 7750a02d1c0e..000000000000
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Domain Name manipulation library for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/domain_name-0.5.24.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c5ad6f2f06e688a1da6a0349e9575cba
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.3 b/metadata/md5-cache/dev-ruby/facter-3.6.3
deleted file mode 100644
index 1e3ea7b5af4a..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-0.9.3 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.3.tar.gz -> facter-3.6.3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7be1d8e00a10c75c9d73036fec223d7b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.4 b/metadata/md5-cache/dev-ruby/facter-3.6.4
deleted file mode 100644
index 0608674aa485..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3 >=dev-cpp/yaml-cpp-0.5.1 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.4.tar.gz -> facter-3.6.4.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab369af82d592cd34f1c698ace687e4b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.7 b/metadata/md5-cache/dev-ruby/facter-3.6.7
deleted file mode 100644
index 4a95d86603e2..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.7.tar.gz -> facter-3.6.7.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ace2f15f86bedb5a06bbffcbfeee8236
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.8 b/metadata/md5-cache/dev-ruby/facter-3.6.8
deleted file mode 100644
index f405102f35c3..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.8.tar.gz -> facter-3.6.8.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ace2f15f86bedb5a06bbffcbfeee8236
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
deleted file mode 100644
index a7768a5bb20f..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=HTTP/REST API client library with pluggable components
-EAPI=5
-HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=33d2cf1e50910e91dd5513bbdafb6a7e
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
index 0f0a997bf0a6..2feb427297e3 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/REST API client library with pluggable components
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c1c3e30be1fc0eed39c69b4655becc06
+_md5_=65ed3225900100a08d58deb407c3c19f
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
deleted file mode 100644
index ba4450f82537..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Various middleware for Faraday
-EAPI=5
-HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.10.0.tar.gz -> faraday_middleware-0.10.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a0c3a9347e547c3aa3af802f52d0ba85
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
deleted file mode 100644
index bab1353db804..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Response JSON parser using MultiJson and FaradayMiddleware
-EAPI=5
-HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=217a7e77f02296d90e359e3fd3fd58e1
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.3.1 b/metadata/md5-cache/dev-ruby/fuubar-2.3.1
index ea9916d6ba41..a06d47ff8721 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.3.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Instafailing RSpec progress bar formatter
 EAPI=6
 HOMEPAGE=https://github.com/jeffkreeftmeijer/fuubar
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/fuubar-2.3.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cfac82892ff85b3e5872e39b4ce4c792
+_md5_=9d9a90341330109cef9004193325bd4c
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.14.5 b/metadata/md5-cache/dev-ruby/github_api-0.14.5
deleted file mode 100644
index 6828740f9334..000000000000
--- a/metadata/md5-cache/dev-ruby/github_api-0.14.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby wrapper for the GitHub REST API v3
-EAPI=5
-HOMEPAGE=https://github.com/peter-murach/github
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/peter-murach/github/archive/v0.14.5.tar.gz -> github_api-0.14.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=762e8be24e1e9b3bf7d8082075d940c9
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.17.0 b/metadata/md5-cache/dev-ruby/github_api-0.17.0
deleted file mode 100644
index 348465ea6de9..000000000000
--- a/metadata/md5-cache/dev-ruby/github_api-0.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] dev-ruby/vcr:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] dev-ruby/vcr:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby wrapper for the GitHub REST API v3
-EAPI=6
-HOMEPAGE=https://github.com/peter-murach/github
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/peter-murach/github/archive/v0.17.0.tar.gz -> github_api-0.17.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9918bc8cddf1f14bf3836340d88b85fd
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.18.1 b/metadata/md5-cache/dev-ruby/github_api-0.18.1
deleted file mode 100644
index 65c03cb2b935..000000000000
--- a/metadata/md5-cache/dev-ruby/github_api-0.18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8:0[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8:0[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] dev-ruby/vcr:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] dev-ruby/vcr:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby wrapper for the GitHub REST API v3
-EAPI=6
-HOMEPAGE=https://github.com/peter-murach/github
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8:0[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8:0[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/peter-murach/github/archive/v0.18.1.tar.gz -> github_api-0.18.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d0b4bbd8e8ed178016a2449747ebd271
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.12 b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
deleted file mode 100644
index b15ad48aebc9..000000000000
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby language binding for GnuPG Made Easy
-EAPI=5
-HOMEPAGE=https://github.com/ueno/ruby-gpgme
-IUSE=elibc_FreeBSD ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ) || ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.12.tar.gz -> ruby-gpgme-2.0.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1806624611d92e011b2b1b5ebcadd5d8
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0 b/metadata/md5-cache/dev-ruby/gruff-0.7.0
index 306a218a12bb..0e45ccc3127e 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Beautiful graphs for one or multiple datasets
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/gruff
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.7.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=873b90fe10778aa62ddb554efd4204e4
+_md5_=92936e9717d0eeeb4cc40c55c3c3b5c8
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
index 79304ac2013c..bbd2943307b1 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rails:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rails:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/tilt:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rails:4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rails:4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/rails:4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ) doc? ( dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby web page templating engine
 EAPI=5
 HOMEPAGE=http://haml-lang.com/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/tilt:*[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=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=af8c31974571b0ba73b541ee35241f69
+_md5_=a1d746edf49c8be525895bac5b65158a
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
deleted file mode 100644
index fd4d061c7b26..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] =dev-util/aruba-0.6.2[ruby_targets_ruby22] app-admin/puppet[ruby_targets_ruby22] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Encrypted YAML backend for hiera
-EAPI=5
-HOMEPAGE=https://github.com/TomPoulton/hiera-eyaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.1.0.tar.gz -> hiera-eyaml-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7df4b7de9331de2cb72fa94cc4c763f
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0-r1
deleted file mode 100644
index 3d89112cb699..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/trollop:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ~dev-util/aruba-0.6.2[ruby_targets_ruby22] app-admin/puppet[ruby_targets_ruby22] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ~dev-util/aruba-0.6.2[ruby_targets_ruby23] app-admin/puppet[ruby_targets_ruby23] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Encrypted YAML backend for hiera
-EAPI=6
-HOMEPAGE=https://github.com/TomPoulton/hiera-eyaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/trollop:2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.1.0.tar.gz -> hiera-eyaml-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=21d7d104bed753b3b1393506339fb2c7
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
deleted file mode 100644
index fb764bc0f30b..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A GPG backend for hiera-eyaml
-EAPI=5
-HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ba0bd1d203a4d0dfbc4610a3e0309bc6
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
deleted file mode 100644
index c43939207887..000000000000
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( >=dev-ruby/rdoc-4.0[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Hoe extends rake to provide full project automation
-EAPI=5
-HOMEPAGE=http://seattlerb.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/hoe-3.13.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b7c452cb9a38f5cfaa4855e80a81b4bb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.15.6-r1 b/metadata/md5-cache/dev-ruby/httparty-0.15.6-r1
new file mode 100644
index 000000000000..b903bf67cc66
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/httparty-0.15.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( 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? ( 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=Makes http fun! Also, makes consuming restful web services dead easy
+EAPI=6
+HOMEPAGE=https://jnunemaker.github.com/httparty
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/httparty-0.15.6.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9166f494ec5eb65c9ab989a1284ed979
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
new file mode 100644
index 000000000000..cafd30f0d3a6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
+EAPI=5
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64 ~arm ~x64-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[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=5
+SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.5.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=97b08e1fe9f57a56846b647c249a39cd
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
deleted file mode 100644
index 2eddee76e1ba..000000000000
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
-EAPI=5
-HOMEPAGE=https://github.com/joliss/jquery-ui-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=6
-SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=44393a9618a9e7c896293040aba24e71
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
new file mode 100644
index 000000000000..15d1af1ecb87
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
+EAPI=6
+HOMEPAGE=https://github.com/joliss/jquery-ui-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64 ~arm ~x64-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[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=6
+SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=093bc901b050ed0590574fc98721a091
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2-r1 b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
deleted file mode 100644
index 84064fe13eae..000000000000
--- a/metadata/md5-cache/dev-ruby/json-1.8.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A JSON implementation as a Ruby extension
-EAPI=5
-HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/json-1.8.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49cc9e7408bfeb6c7aa69038456daf5d
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.2-r1 b/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
index de076e8e6e62..bd34e109016c 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.2.tar.gz -> locale-2.1.2-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d62e20dfdebbdfc1c4c8efecef006882
+_md5_=eb8b3966d30d90e6d8c3c109950eedfb
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
deleted file mode 100644
index 37966a91a6a7..000000000000
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby library used for automating interaction with websites
-EAPI=5
-HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=22ae27f0d28f361ff32d953ec52339ca
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
deleted file mode 100644
index e24029c401b2..000000000000
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby library used for automating interaction with websites
-EAPI=5
-HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5ea85936fbc68c52a0c146531c0e1775
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
index 046075b78a73..ee011bc5cba8 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library used for automating interaction with websites
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/mechanize
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=34b8ce1064417d0b997cd02afee2034f
+_md5_=ee5d8a940d1e20ce4f2b1d8e5106755b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.25.1 b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
index d83335d6c3e8..674418b7813a 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/mime-types/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+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/mime-types-1.25.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8639928f70b6530a6f5027bce544c18b
+_md5_=1209105d92683f2529302bf38caeb41e
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1 b/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
deleted file mode 100644
index 639d1d86e4ac..000000000000
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=mirror://rubygems/mime-types-3.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dd4b05f220bbb097c726b3119a929537
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
deleted file mode 100644
index b79814f2947d..000000000000
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
-EAPI=5
-HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=16e6fb13069e6256471bd1029e72652b
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index e9ba2613f2b7..f1507bdc3cbe 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/coderay[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/coderay[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/coderay[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/coderay[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://mocha.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[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.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e192eebf692e62d3636e07fd434417c6
+_md5_=e1a5421adf2fa20e3079b9c4112cc602
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index e6c4c2d451b4..5db4e4c40bf0 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[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.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b3c3b332914e55ab4c45cfac9bba5e5f
+_md5_=92980616db797e8886811ade795df080
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.0 b/metadata/md5-cache/dev-ruby/mocha-1.2.0
deleted file mode 100644
index 2d6ea8d7acaa..000000000000
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/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] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
-EAPI=5
-HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1.0
-SRC_URI=mirror://rubygems/mocha-1.2.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1928862b5077d4127b84fc9cfb5b0bee
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.1 b/metadata/md5-cache/dev-ruby/mocha-1.2.1
deleted file mode 100644
index 6e4279997297..000000000000
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
-EAPI=5
-HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1.0
-SRC_URI=mirror://rubygems/mocha-1.2.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ea535068dd843cba08be89c18ba04006
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.13.1 b/metadata/md5-cache/dev-ruby/multi_json-1.13.1
new file mode 100644
index 000000000000..dfc7c0a4c8fa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/yajl-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A gem to provide swappable JSON backends
+EAPI=6
+HOMEPAGE=https://github.com/intridea/multi_json
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/intridea/multi_json/archive/v1.13.1.tar.gz -> multi_json-1.13.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0f235e0badd6052aac7d12026f470d6c
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
deleted file mode 100644
index ab1313de7ebf..000000000000
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A generic swappable back-end for XML parsing
-EAPI=5
-HOMEPAGE=http://rdoc.info/gems/multi_xml
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f9a2918df6f79bfa1d85c08c4c0ef23b
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index ee280de9ceeb..62b416624883 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -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? ( 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? ( 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=Numerical N-dimensional Array class
 EAPI=5
 HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+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/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=894f2ed217501214b171de3a1a2289fd
+_md5_=d52477f42541010e9eee48a13019198f
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
index fe67bdd0bcd5..ee089547555d 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides telnet client functionality
 EAPI=5
 HOMEPAGE=https://github.com/ruby/net-telnet
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_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=https://github.com/ruby/net-telnet/archive/v0.1.1.tar.gz -> net-telnet-0.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=43f03547830cbbf6d95315e5aa12ab9a
+_md5_=9a35a70691c4b14ff00c9c01b1225164
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.12.1 b/metadata/md5-cache/dev-ruby/parallel-1.12.1
index fc372fa4dc4f..731acf18e84f 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.12.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Run any code in parallel Processes or Threads
 EAPI=6
 HOMEPAGE=https://github.com/grosser/parallel
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+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-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.12.1.tar.gz -> parallel-1.12.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ed8cd08c348a365def20b773050dcb4a
+_md5_=13846c09c6de56173a00cb02764b5d8b
diff --git a/metadata/md5-cache/dev-ruby/patron-0.10.0 b/metadata/md5-cache/dev-ruby/patron-0.10.0
index e24189e32445..c813be72f953 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.10.0
+++ b/metadata/md5-cache/dev-ruby/patron-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=6
 HOMEPAGE=https://toland.github.com/patron/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.10.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6437cc859597c3d77b2f05d4ef2d2e52
+_md5_=70c648d36ba44a9c4e32abeddaeb00fa
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
deleted file mode 100644
index 47477ddadbd3..000000000000
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
-EAPI=5
-HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=de5d6f09605518e5c37001ea71d2c0a7
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
deleted file mode 100644
index ab4b32aaef30..000000000000
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Libpcap bindings for ruby compat
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0.12
-SRC_URI=mirror://rubygems/pcaprub-0.12.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ab25b48d8f0a568ef2bfa1f92d9e1438
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
index acd9d0d16d25..a418b799f9fe 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=net-libs/libpcap 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=Libpcap bindings for ruby compat
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=net-libs/libpcap 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 )
 RESTRICT=test
 SLOT=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ab25b48d8f0a568ef2bfa1f92d9e1438
+_md5_=187cfd502fcac154f329cdc0fe96e32b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
deleted file mode 100644
index 3702ffccc331..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Implements low level PDF features for Prawn
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-core-0.6.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ef755f34f0b4e8ad01f96a5aab40594b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
deleted file mode 100644
index 744ba5ac6a1b..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] =dev-ruby/pdf-reader-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Implements low level PDF features for Prawn
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-core-0.6.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7143a3821a919b152f860ea4ec1be58b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
index 5fd3598a0792..bdb6bf50dcd8 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Implements low level PDF features for Prawn
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-core/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.7.0.tar.gz -> pdf-core-0.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ca9c403b41d677d1d67d1016fdaa004a
+_md5_=109991f5bd2820623b43a2d30b3b87c4
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
deleted file mode 100644
index d4eb6b1ddb14..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A tool for analyzing PDF output
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-inspector-1.1.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1cda05f0496d1d8eac1786384ffa97ce
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
deleted file mode 100644
index 9d4cae1a1c47..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A tool for analyzing PDF output
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-inspector-1.2.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7a77eaf67922491d5cba90252fed1414
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
deleted file mode 100644
index f87247edab4a..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A tool for analyzing PDF output
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-inspector-1.2.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c1998796109caa7522cdd3fce172e79c
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
index 87af30376e02..866d6aa3e5b2 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A tool for analyzing PDF output
 EAPI=6
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby22] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby23] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.3.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5d373c0bb24400881972c8e5aa03f339
+_md5_=edca6a37fad45daa69c37308b6effd3f
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
deleted file mode 100644
index 2ff6b75b0212..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=PDF parser conforming as much as possible to the PDF specification from Adobe
-EAPI=5
-HOMEPAGE=https://github.com/yob/pdf-reader/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8941d7f2bf0f2e6a1c0722043717a5f2
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
index 4935fc234c78..89f2edef6dcc 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF parser conforming as much as possible to the PDF specification f
 EAPI=5
 HOMEPAGE=https://github.com/yob/pdf-reader/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f7410496bbd8cdd5931e0bf068395b79
+_md5_=779b4656648e0710d4cce57fee755ded
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
index 450e7756bc60..1057e5b867ac 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=PDF parser conforming as much as possible to the PDF specification f
 EAPI=5
 HOMEPAGE=https://github.com/yob/pdf-reader/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.0.0.tar.gz -> pdf-reader-2.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3a6fc1605d4d64fcb555ed79598fd5ae
+_md5_=66990dda431e88272ca8418265a5d8ff
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
deleted file mode 100644
index e8cb389db297..000000000000
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A PhantomJS driver for Capybara
-EAPI=5
-HOMEPAGE=https://github.com/jonleighton/poltergeist
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=www-client/phantomjs ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.10.0.tar.gz -> poltergeist-1.10.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6e13e2c8548d4db11eb3c4afee85f09a
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
deleted file mode 100644
index 93ad7aca5041..000000000000
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A PhantomJS driver for Capybara
-EAPI=5
-HOMEPAGE=https://github.com/jonleighton/poltergeist
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=www-client/phantomjs ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.9.0.tar.gz -> poltergeist-1.9.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3f26de21fe749c475de84b856e7118f4
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.1.0 b/metadata/md5-cache/dev-ruby/prawn-2.1.0
deleted file mode 100644
index 97488970f250..000000000000
--- a/metadata/md5-cache/dev-ruby/prawn-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Fast, Nimble PDF Generation For Ruby
-EAPI=5
-HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=https://github.com/prawnpdf/prawn/archive/2.1.0.tar.gz -> prawn-2.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a598bbfb02b0da9c3e6b9de863b82db9
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.2.0 b/metadata/md5-cache/dev-ruby/prawn-2.2.0
index ff694549505e..452ffd2354aa 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, Nimble PDF Generation For Ruby
 EAPI=6
 HOMEPAGE=http://prawn.majesticseacreature.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby23] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.2.0.tar.gz -> prawn-2.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8e6f9387956f0ee892480fc21d649a19
+_md5_=9a2166d5bf470ee33301e2cf76923ad7
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-4.3.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-4.3.0
deleted file mode 100644
index 97f57bf71cbc..000000000000
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-4.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Library needed to connect puppet to puppetdb
-EAPI=5
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/xenial/PC1/p/puppetdb/puppetdb-termini_4.3.0-1puppetlabs1_all.deb
-_eclasses_=unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=285f7fd1aa163c6872098d9ab800e496
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index 85996b68aeea..52bd6638ed17 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
 IUSE=doc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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/racc-1.4.14.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=35233d1ba52237a30ce6e358f1b52810
+_md5_=d85954a836bf861549940ec8824ecd5c
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1 b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
deleted file mode 100644
index bbdca2eb7bb6..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( virtual/ruby-minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Make-like scripting in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/jimweirich/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/rake-0.9.6.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5522fb3ed3b39b443c17357846a8e101
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
index 691168af832c..d9ff3e56dfad 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.10.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b088c9ac8337c3543ba32e407f1cb707
+_md5_=2e271c3b7fe47cb470b8e297ec0253e0
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
deleted file mode 100644
index 569565bc4c1e..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
-EAPI=5
-HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=amd64 arm ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e6ee00bbd0cd577381a585dcd4905c9e
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.3.0 b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
index 29b705b19b93..4ff433406f46 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.3.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.3.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=45c935dae36c897f5d420c70ec6c597c
+_md5_=81578403a8c3bc85dea44f7fb1e9e2a6
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
deleted file mode 100644
index fc0f8dd15ea1..000000000000
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby22] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A module for using Textile in Ruby
-EAPI=5
-HOMEPAGE=http://redcloth.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=81316b4d42f620cb1eaeb5187d6fbb68
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
index 2503b901b8e1..c29f9aa3da73 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A module for using Textile in Ruby
 EAPI=5
 HOMEPAGE=http://redcloth.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1a7bccdca221d5d972528b62e3e5bfbf
+_md5_=f2bc667cc1547577f4d93a027ff57dcb
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
deleted file mode 100644
index dff992fdbce7..000000000000
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=RightScale's robust HTTP/S connection module
-EAPI=5
-HOMEPAGE=http://rightscale.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=659cf7768fd340c601c8179dd2659e5b
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
deleted file mode 100644
index 6745e2b94e72..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cd8dd07af3ee56feef85aef2e21a2ee8
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
deleted file mode 100644
index db26ce1969ce..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ba688496c8d547821a4424359693e6a8
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
deleted file mode 100644
index b4f7f2c03dc1..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c9f7e2e05d9be6090b564ab42517e427
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
deleted file mode 100644
index e04df02d6835..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby22] dev-ruby/rspec-expectations:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f0771d01cd7348a8d99c9f9f7c939e46
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
deleted file mode 100644
index 16dd747fe1da..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.6.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.6.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=6
-HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.6.0.tar.gz -> rspec-rails-3.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1e62248b6e030cac7a7795ce9a8ccc04
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.7.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.7.1
deleted file mode 100644
index 99edddabd562..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.7.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.7.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=6
-HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.7.1.tar.gz -> rspec-rails-3.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4ede09dae3c9abb8eb553f9b40a0ef52
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.7.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.7.2
index 943cd825a292..6a12db027ae0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.7.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.7*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby24] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby24] ~dev-ruby/rspec-rails-3.7.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( 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=RSpec's official Ruby on Rails plugin
 EAPI=6
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.7*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.7.2.tar.gz -> rspec-rails-3.7.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4ede09dae3c9abb8eb553f9b40a0ef52
+_md5_=c82fbad8560c4eeb08479235c5ee3a28
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
index 021cabb688fd..e572ba5d6b61 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] dev-ruby/shoulda-matchers:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar:2[ruby_targets_ruby23] dev-ruby/shoulda-matchers:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] dev-ruby/shoulda-matchers:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar:2[ruby_targets_ruby23] dev-ruby/shoulda-matchers:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] dev-ruby/fuubar:2[ruby_targets_ruby24] dev-ruby/shoulda-matchers:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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=RSpec support and matchers
 EAPI=5
 HOMEPAGE=https://github.com/thekompanee/rspectacular
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] dev-ruby/shoulda-matchers:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar:2[ruby_targets_ruby23] dev-ruby/shoulda-matchers:3[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] dev-ruby/shoulda-matchers:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar:2[ruby_targets_ruby23] dev-ruby/shoulda-matchers:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] dev-ruby/fuubar:2[ruby_targets_ruby24] dev-ruby/shoulda-matchers:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.70.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ffc3d76bc70e03a55e64a001b5377b65
+_md5_=8502d2e8b08f076806379522e339bf3f
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
deleted file mode 100644
index e7649a3938ef..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby library for Oracle OCI8
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~x86
-LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-oci8-2.1.8.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=922ac70a44a27f1afbf16cface837947
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
deleted file mode 100644
index 21292f3d5a34..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A Ruby library for Oracle OCI8
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-oci8-2.2.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb007c4136475d3badba7a89f08c4883
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
index 2b31e758358a..9e23360589c3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Ruby
 RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.4.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2cc805e6c56611deed7f5339bceb0dcc
+_md5_=f0b4b1119de99d5929076b7f3ebfc874
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
new file mode 100644
index 000000000000..5ee47c00fa75
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A Ruby library for Oracle OCI8
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Ruby
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-oci8-2.2.5.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=d2952cb8fab887b72768a76222306cb1
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
deleted file mode 100644
index 25ce43aa45d5..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Text Progress Bar Library for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-progressbar-1.7.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d81765f37213a6ed7fce408e89b5e3fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.3-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.3-r1
index deba45e31d2a..926ee1221680 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby23] dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby23] dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.8.3.tar.gz -> ruby-progressbar-1.8.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2a91cbd20f09ebcd4c75bdb4a6ae0c54
+_md5_=44909dc0b22354478afceb417a1f80c3
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1
deleted file mode 100644
index 1abbc4013aad..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official Ruby-on-Rails Integration with Sass
-EAPI=5
-HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=5.0
-SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.6.tar.gz -> sass-rails-5.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c807cf158069c14d235acc352cb70fd8
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index 417302c40a3c..188a3491f912 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+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] ) )
 DESCRIPTION=Library providing spawn() which is almost perfectly compatible with ruby 1.9's
 EAPI=5
 HOMEPAGE=https://github.com/ujihisa/spawn-for-legacy
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=83fd84635c4c3b74a77a8b30cb573b93
+_md5_=bb4d7c6b998834c4374a18c8fdb983ab
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.13.0 b/metadata/md5-cache/dev-ruby/simplecov-0.13.0
deleted file mode 100644
index 8d2ad96351c2..000000000000
--- a/metadata/md5-cache/dev-ruby/simplecov-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Code coverage with a configuration library and merging across test suites
-EAPI=5
-HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0.8
-SRC_URI=mirror://rubygems/simplecov-0.13.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.0 b/metadata/md5-cache/dev-ruby/simplecov-0.14.0
deleted file mode 100644
index 2af8b39c2277..000000000000
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Code coverage with a configuration library and merging across test suites
-EAPI=5
-HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0.8
-SRC_URI=mirror://rubygems/simplecov-0.14.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.1 b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
index 253f43b213e1..776b42b8166b 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] =dev-ruby/docile-1.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] =dev-ruby/docile-1.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby24] <dev-ruby/json-3:0[ruby_targets_ruby24] dev-ruby/simplecov-html:0.10[ruby_targets_ruby24] =dev-ruby/docile-1.1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Code coverage with a configuration library and merging across test suites
 EAPI=5
 HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc 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/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] =dev-ruby/docile-1.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] =dev-ruby/docile-1.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby24] <dev-ruby/json-3:0[ruby_targets_ruby24] dev-ruby/simplecov-html:0.10[ruby_targets_ruby24] =dev-ruby/docile-1.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.8
 SRC_URI=mirror://rubygems/simplecov-0.14.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=beba26760782ee2a6d34800079e7aa09
+_md5_=51f14647f2c8d879c0638ab60632ce0b
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.8 b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
index be1fd155cc71..3b7fff66bb49 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.8
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal eff
 EAPI=6
 HOMEPAGE=http://www.sinatrarb.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] >=dev-ruby/rack-1.5:*[ruby_targets_ruby24] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby24] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.8.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=02ef27fe3d03ac62782361aab9b5bfa5
+_md5_=a927d0bd1927af48f7c374c5e7934360
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
index dba46c1be48f..7f25f539a97c 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
 EAPI=5
 HOMEPAGE=http://slim-lang.com/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c15be622c493ea4a4b68d5f56d9c63e6
+_md5_=39bff3c3af3bc00c6c5dd5d6ad958f60
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9 b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
deleted file mode 100644
index 3204fd77df8a..000000000000
--- a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby library to read and write spreadsheet documents
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/spreadsheet
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/spreadsheet-0.6.9.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fe112d638261bb4b4ab91d6f65ecb5a1
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.4.1 b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
deleted file mode 100644
index 9b95a96192dc..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets/archive/v3.4.1.tar.gz -> sprockets-3.4.1-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=74fcb69ff2646ce152eb28a535623aa7
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.5.2 b/metadata/md5-cache/dev-ruby/sprockets-3.5.2
deleted file mode 100644
index b78366c33b23..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-3.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets/archive/v3.5.2.tar.gz -> sprockets-3.5.2-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9acb322823b7ae59e2a0a185b1e4fad3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.6.3 b/metadata/md5-cache/dev-ruby/sprockets-3.6.3
deleted file mode 100644
index 158029ea3374..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-3.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets/archive/v3.6.3.tar.gz -> sprockets-3.6.3-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.0 b/metadata/md5-cache/dev-ruby/sprockets-3.7.0
deleted file mode 100644
index 90533f766eda..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets/archive/v3.7.0.tar.gz -> sprockets-3.7.0-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.13.1 b/metadata/md5-cache/dev-ruby/sshkit-1.13.1
deleted file mode 100644
index 1d2f39037424..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.13.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb44c20edaf0993021b1adc18c08787c
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.14.0 b/metadata/md5-cache/dev-ruby/sshkit-1.14.0
deleted file mode 100644
index 3a8c6b717d8e..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.14.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6b360280a0165c881d26c2abe0e322bb
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
deleted file mode 100644
index 5225ec3530c9..000000000000
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=An improved version of the Test::Unit framework from Ruby 1.8
-EAPI=5
-HOMEPAGE=http://test-unit.rubyforge.org/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=2
-SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d0e3f1678ed08e4c64b6a880c30ac281
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
deleted file mode 100644
index 040572467585..000000000000
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=RR adapter for Test::Unit
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/test-unit/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bff33de2ddf01407de90f0707ab5bea2
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index 35208e6cd506..578143c7c042 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -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_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+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] ) )
 DESCRIPTION=Tool to convert an array of struct into an HTML table
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/tidy_table
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e316ef325cdaa4634e13a2b32298f770
+_md5_=701e084529932830b372721eeaaef556
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.0.0 b/metadata/md5-cache/dev-ruby/uglifier-4.0.0
deleted file mode 100644
index 97c141591120..000000000000
--- a/metadata/md5-cache/dev-ruby/uglifier-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
-EAPI=6
-HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=https://github.com/lautis/uglifier/archive/v4.0.0.tar.gz -> uglifier-4.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f94b61d75f645d4f05f907b0cbcc9140
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.0.1 b/metadata/md5-cache/dev-ruby/uglifier-4.0.1
deleted file mode 100644
index 7e699a9a1300..000000000000
--- a/metadata/md5-cache/dev-ruby/uglifier-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
-EAPI=6
-HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=https://github.com/lautis/uglifier/archive/v4.0.1.tar.gz -> uglifier-4.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f94b61d75f645d4f05f907b0cbcc9140
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.1.0 b/metadata/md5-cache/dev-ruby/uglifier-4.1.0
deleted file mode 100644
index d333acfec80c..000000000000
--- a/metadata/md5-cache/dev-ruby/uglifier-4.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
-EAPI=6
-HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=https://github.com/lautis/uglifier/archive/v4.1.0.tar.gz -> uglifier-4.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f94b61d75f645d4f05f907b0cbcc9140
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.1.3 b/metadata/md5-cache/dev-ruby/uglifier-4.1.3
new file mode 100644
index 000000000000..98898335990d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
+EAPI=6
+HOMEPAGE=https://github.com/lautis/uglifier
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=4
+SRC_URI=https://github.com/lautis/uglifier/archive/v4.1.3.tar.gz -> uglifier-4.1.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4c91f718237317abe9bf7d02b9acccb7
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.3.0 b/metadata/md5-cache/dev-ruby/web-console-2.3.0
index 10ee1b96f3f5..123bc60c5d8e 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.3.0
+++ b/metadata/md5-cache/dev-ruby/web-console-2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-4.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/simplecov[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-4.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/simplecov[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/rails:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/simplecov[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/rails:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/simplecov[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A debugging tool for your Ruby on Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rails/web-console
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/web-console/archive/v2.3.0.tar.gz -> web-console-2.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fdd4277df2273b6e0389b494aa3dc6d1
+_md5_=ccd27c557cf922c3ceef11f709fbdfde
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.3.1 b/metadata/md5-cache/dev-ruby/web-console-3.3.1
deleted file mode 100644
index 07c652f62521..000000000000
--- a/metadata/md5-cache/dev-ruby/web-console-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-5.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A debugging tool for your Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/web-console/archive/v3.3.1.tar.gz -> web-console-3.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.4.0 b/metadata/md5-cache/dev-ruby/web-console-3.4.0
deleted file mode 100644
index 19b187ff7935..000000000000
--- a/metadata/md5-cache/dev-ruby/web-console-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-5.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A debugging tool for your Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/web-console/archive/v3.4.0.tar.gz -> web-console-3.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.5.1 b/metadata/md5-cache/dev-ruby/web-console-3.5.1
index 5f75896ec4f6..03af99d79885 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.5.1
+++ b/metadata/md5-cache/dev-ruby/web-console-3.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-5.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-5.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/rails-5.0[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A debugging tool for your Ruby on Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+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/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.5.1.tar.gz -> web-console-3.5.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d0e4a02f2d3771f9d99cab185b3c46da
+_md5_=bac5e56aad88113bcd53e07dd0d37b29
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.1.0 b/metadata/md5-cache/dev-ruby/webmock-2.1.0
deleted file mode 100644
index 6d4d1fb448d4..000000000000
--- a/metadata/md5-cache/dev-ruby/webmock-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
-EAPI=5
-HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=2
-SRC_URI=mirror://rubygems/webmock-2.1.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=72381a88341752819fd0b6b9886928d9
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.1 b/metadata/md5-cache/dev-ruby/webmock-2.3.1
deleted file mode 100644
index 980cd750d08f..000000000000
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
-EAPI=5
-HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=2
-SRC_URI=mirror://rubygems/webmock-2.3.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=df0a9b7f9f34992baedd9cd67472e57f
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.3.0 b/metadata/md5-cache/dev-ruby/webmock-3.3.0
new file mode 100644
index 000000000000..751bfc1aa163
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webmock-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24] >=dev-ruby/patron-0.4.18[ruby_targets_ruby24] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
+EAPI=6
+HOMEPAGE=https://github.com/bblimke/webmock
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=3
+SRC_URI=mirror://rubygems/webmock-3.3.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f9c10f07e861a5954373e598eb71dca0
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
deleted file mode 100644
index 92de62f6f324..000000000000
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A library to help write robots.txt compliant web robots
-EAPI=5
-HOMEPAGE=http://rubygems.org/gems/webrobots
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6fe1acdff34d5764a75d3254aaf13ff8
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
index f108da1c8ed3..f61db667fef4 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/shoulda[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to help write robots.txt compliant web robots
 EAPI=5
 HOMEPAGE=https://github.com/knu/webrobots
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f445f877b6a572d2a18d4a39a5723c02
+_md5_=26620adff2e30756a2b02e82408862a9
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.11 b/metadata/md5-cache/dev-ruby/yard-0.9.11
index 0f62c6052987..59dd562efcd4 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.11
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.11
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=6
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.11.tar.gz -> yard-0.9.11-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=861516d63ed1a4036d32950b578b4bca
+_md5_=23ec87994a630fe1c08fb1f451d6c530
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.12 b/metadata/md5-cache/dev-ruby/yard-0.9.12
index 7e52c3e656ea..9a25e1da43ad 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.12
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.12
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=6
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.12.tar.gz -> yard-0.9.12-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2646e154f840c910321386940b4541b5
+_md5_=96dccbbfa57f8ea33dced76f7a36b61d
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.4 b/metadata/md5-cache/dev-ruby/yard-0.9.4
deleted file mode 100644
index f27e7a138b07..000000000000
--- a/metadata/md5-cache/dev-ruby/yard-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Documentation generation tool for the Ruby programming language
-EAPI=5
-HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/lsegal/yard/archive/v0.9.4.tar.gz -> yard-0.9.4-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1838012ebe33e0c6ab38b1d8743bdf6a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index f50c729aaa2d..3b9d0f0b767f 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-git-0.0.20171110 b/metadata/md5-cache/dev-scheme/guile-git-0.0.20171110
index e2f05bdf246b..8d1d2416fa3d 100644
--- a/metadata/md5-cache/dev-scheme/guile-git-0.0.20171110
+++ b/metadata/md5-cache/dev-scheme/guile-git-0.0.20171110
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures dev-libs/libgit2:=
-DESCRIPTION=Structured access to bytevector contents
+DESCRIPTION=Guile bindings of git
 EAPI=6
 HOMEPAGE=https://gitlab.com/guile-git/guile-git
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=LGPL-3+
 RDEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures dev-libs/libgit2:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/guile-git-0.0.20171110.tar.gz
-_md5_=8e261ee6b34c60b3051623a85383b04d
+_md5_=f9fab37e99e16c63f4db195dc7320d63
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14 b/metadata/md5-cache/dev-scheme/kawa-1.14
deleted file mode 100644
index 78daeac9bbea..000000000000
--- a/metadata/md5-cache/dev-scheme/kawa-1.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( java-virtuals/servlet-api:3.0 ) xqtests? ( app-arch/unzip:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/kawa/
-IUSE=+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests elibc_FreeBSD source
-KEYWORDS=x86
-LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
-RDEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a1ee4446fda1eff1d5c983db84381d49
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14-r1 b/metadata/md5-cache/dev-scheme/kawa-1.14-r1
new file mode 100644
index 000000000000..9517169aee29
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/kawa-1.14-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) servlets? ( java-virtuals/servlet-api:3.0 ) xqtests? ( app-arch/unzip:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/kawa/
+IUSE=+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests elibc_FreeBSD source
+KEYWORDS=x86
+LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
+RDEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=754bf2c727f811212f46cb49d2bbf545
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index e1997e55cd73..b93f5b47656b 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/hlatex-1.0.1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1
deleted file mode 100644
index 4c8bf289b5a5..000000000000
--- a/metadata/md5-cache/dev-tex/hlatex-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=HLaTeX is a LaTeX package to use Hangul with LaTeX
-EAPI=3
-HOMEPAGE=http://project.ktug.or.kr/hlatex/
-KEYWORDS=alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1732a8190fa661b33044066aa7e64101
diff --git a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
index 971643883003..628c2b176344 100644
--- a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
+++ b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=HLaTeX is a LaTeX package to use Hangul with LaTeX
 EAPI=6
 HOMEPAGE=http://project.ktug.or.kr/hlatex/
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
 _eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a1ce0fb1a6221b9a07a9edfde0334911
+_md5_=f6e1a8eec5a00992f94b5df6994fe74e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d1b65f077b76..14a4ef7d50ef 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/aruba-0.6.2 b/metadata/md5-cache/dev-util/aruba-0.6.2
index 491070c494b4..0efbbe2bf763 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b29a4945c1ab659c6343c0cc7eac10f3
+_md5_=15ff163e8fed220532c7a5fffba81db8
diff --git a/metadata/md5-cache/dev-util/aruba-0.7.4 b/metadata/md5-cache/dev-util/aruba-0.7.4
deleted file mode 100644
index 2fd6b62d6609..000000000000
--- a/metadata/md5-cache/dev-util/aruba-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Cucumber steps for driving out command line applications
-EAPI=5
-HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/aruba-0.7.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d94bb0449c918dbb8666a88c060b8987
diff --git a/metadata/md5-cache/dev-util/aruba-0.8.1 b/metadata/md5-cache/dev-util/aruba-0.8.1
index 1d60007ce0b3..ab431711f410 100644
--- a/metadata/md5-cache/dev-util/aruba-0.8.1
+++ b/metadata/md5-cache/dev-util/aruba-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby23] =dev-ruby/childprocess-0*[ruby_targets_ruby23] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby23] >=dev-util/cucumber-1.3.19[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby23] =dev-ruby/childprocess-0*[ruby_targets_ruby23] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby23] >=dev-util/cucumber-1.3.19[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.8.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a08ca30fc6df861f0babfb124f1435bb
+_md5_=fe20c9dac13d0944a997382aa6495cb1
diff --git a/metadata/md5-cache/dev-util/buildbot-prometheus-17.7.2 b/metadata/md5-cache/dev-util/buildbot-prometheus-17.7.2
new file mode 100644
index 000000000000..59fadea91932
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-prometheus-17.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pip[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/prometheus_client[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-util/buildbot[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=A Prometheus metrics exporter for Buildbot
+EAPI=6
+HOMEPAGE=https://github.com/claws/buildbot-prometheus
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/prometheus_client[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-util/buildbot[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/claws/buildbot-prometheus/archive/17.7.2.tar.gz -> buildbot-prometheus-17.7.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09c8174b95fd2d6ff976db48bfe4797d
diff --git a/metadata/md5-cache/dev-util/cargo-0.24.0 b/metadata/md5-cache/dev-util/cargo-0.24.0
new file mode 100644
index 000000000000..ac6b50065782
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-0.24.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.24.0.tar.gz -> cargo-0.24.0.tar.gz https://crates.io/api/v1/crates/advapi32-sys/0.2.0/download -> advapi32-sys-0.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/backtrace/0.3.4/download -> backtrace-0.3.4.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargotest/0.1.0/download -> cargotest-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.4/download -> cc-1.0.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/cmake/0.1.29/download -> cmake-0.1.29.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.4.4/download -> core-foundation-0.4.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.4.4/download -> core-foundation-sys-0.4.4.crate https://crates.io/api/v1/crates/crates-io/0.13.0/download -> crates-io-0.13.0.crate https://crates.io/api/v1/crates/crossbeam/0.2.10/download -> crossbeam-0.2.10.crate https://crates.io/api/v1/crates/crossbeam/0.3.0/download -> crossbeam-0.3.0.crate https://crates.io/api/v1/crates/crypto-hash/0.3.0/download -> crypto-hash-0.3.0.crate https://crates.io/api/v1/crates/curl/0.4.8/download -> curl-0.4.8.crate https://crates.io/api/v1/crates/curl-sys/0.3.15/download -> curl-sys-0.3.15.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.8.1/download -> docopt-0.8.1.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/flate2/0.2.20/download -> flate2-0.2.20.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.2.0/download -> foreign-types-0.2.0.crate https://crates.io/api/v1/crates/fs2/0.4.2/download -> fs2-0.4.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.2.1/download -> fuchsia-zircon-0.2.1.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.2.0/download -> fuchsia-zircon-sys-0.2.0.crate https://crates.io/api/v1/crates/git2/0.6.8/download -> git2-0.6.8.crate https://crates.io/api/v1/crates/git2-curl/0.7.0/download -> git2-curl-0.7.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.2.1/download -> globset-0.2.1.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.2.0/download -> hex-0.2.0.crate https://crates.io/api/v1/crates/home/0.3.0/download -> home-0.3.0.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.2.2/download -> ignore-0.2.2.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/jobserver/0.1.9/download -> jobserver-0.1.9.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.36/download -> libc-0.2.36.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.16/download -> libgit2-sys-0.6.16.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.0.0/download -> memchr-2.0.0.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.31/download -> net2-0.2.31.crate https://crates.io/api/v1/crates/num/0.1.41/download -> num-0.1.41.crate https://crates.io/api/v1/crates/num-bigint/0.1.41/download -> num-bigint-0.1.41.crate https://crates.io/api/v1/crates/num-complex/0.1.41/download -> num-complex-0.1.41.crate https://crates.io/api/v1/crates/num-integer/0.1.35/download -> num-integer-0.1.35.crate https://crates.io/api/v1/crates/num-iter/0.1.34/download -> num-iter-0.1.34.crate https://crates.io/api/v1/crates/num-rational/0.1.40/download -> num-rational-0.1.40.crate https://crates.io/api/v1/crates/num-traits/0.1.41/download -> num-traits-0.1.41.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.9.21/download -> openssl-0.9.21.crate https://crates.io/api/v1/crates/openssl-probe/0.1.1/download -> openssl-probe-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.21/download -> openssl-sys-0.9.21.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/psapi-sys/0.1.0/download -> psapi-sys-0.1.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.18/download -> rand-0.3.18.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.5/download -> regex-0.2.5.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.5/download -> rustc-demangle-0.1.5.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/scopeguard/0.1.2/download -> scopeguard-0.1.2.crate https://crates.io/api/v1/crates/scoped-tls/0.1.0/download -> scoped-tls-0.1.0.crate https://crates.io/api/v1/crates/semver/0.8.0/download -> semver-0.8.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.27/download -> serde-1.0.27.crate https://crates.io/api/v1/crates/serde_derive/1.0.27/download -> serde_derive-1.0.27.crate https://crates.io/api/v1/crates/serde_derive_internals/0.19.0/download -> serde_derive_internals-0.19.0.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.9/download -> serde_json-1.0.9.crate https://crates.io/api/v1/crates/shell-escape/0.1.3/download -> shell-escape-0.1.3.crate https://crates.io/api/v1/crates/socket2/0.2.4/download -> socket2-0.2.4.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/tar/0.4.14/download -> tar-0.4.14.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/termcolor/0.3.3/download -> termcolor-0.3.3.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/toml/0.4.5/download -> toml-0.4.5.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.6.0/download -> url-1.6.0.crate https://crates.io/api/v1/crates/userenv-sys/0.2.0/download -> userenv-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/wincolor/0.1.4/download -> wincolor-0.1.4.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate x86? ( https://static.rust-lang.org/dist/cargo-0.23.0-i686-unknown-linux-gnu.tar.gz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cargo	5a58e76471ae53decd3da1fa44915831	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e11665d0d84f334396b3ef814585fb50
diff --git a/metadata/md5-cache/dev-util/cmake-3.10.1 b/metadata/md5-cache/dev-util/cmake-3.10.1
index 04af241a8b06..6f3b7e97781f 100644
--- a/metadata/md5-cache/dev-util/cmake-3.10.1
+++ b/metadata/md5-cache/dev-util/cmake-3.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ba479e279231e26c29a80521d2ba214
+_md5_=cdec0d317f30c21614d1e30a9ab5a891
diff --git a/metadata/md5-cache/dev-util/cmake-3.10.2 b/metadata/md5-cache/dev-util/cmake-3.10.2
index 9ad0d026fc62..1e50ef70f2cb 100644
--- a/metadata/md5-cache/dev-util/cmake-3.10.2
+++ b/metadata/md5-cache/dev-util/cmake-3.10.2
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6290b5b84e83656d4d2146f34f17db90
+_md5_=cdec0d317f30c21614d1e30a9ab5a891
diff --git a/metadata/md5-cache/dev-util/cmake-3.8.2 b/metadata/md5-cache/dev-util/cmake-3.8.2
index b2e04c0e6d06..aa8f0e548453 100644
--- a/metadata/md5-cache/dev-util/cmake-3.8.2
+++ b/metadata/md5-cache/dev-util/cmake-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5836e21465d5f1c6511e703701750ae1
+_md5_=0fed5f2435c55c9a9f3a4c8d325483cf
diff --git a/metadata/md5-cache/dev-util/cmake-3.9.6 b/metadata/md5-cache/dev-util/cmake-3.9.6
index 871cee2b0465..1c1b1d78d2f8 100644
--- a/metadata/md5-cache/dev-util/cmake-3.9.6
+++ b/metadata/md5-cache/dev-util/cmake-3.9.6
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e2d67fa93c263e44353906377f4504e
+_md5_=dfe68579b23f35a7dc7f9357a36fb9bd
diff --git a/metadata/md5-cache/dev-util/ctags-20161028 b/metadata/md5-cache/dev-util/ctags-20161028
index 583dc97aede6..6a6c21433aa0 100644
--- a/metadata/md5-cache/dev-util/ctags-20161028
+++ b/metadata/md5-cache/dev-util/ctags-20161028
@@ -4,9 +4,9 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/vim/ctags-20161028.tar.xz
-_md5_=3d64a6565ec433624dd4d042a20e16bf
+_md5_=c62c8412e610aa46a68dd3956eda5d08
diff --git a/metadata/md5-cache/dev-util/ctags-20170704 b/metadata/md5-cache/dev-util/ctags-20170704
index eafd2b3e94eb..dc171e138f8f 100644
--- a/metadata/md5-cache/dev-util/ctags-20170704
+++ b/metadata/md5-cache/dev-util/ctags-20170704
@@ -4,10 +4,10 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://github.com/universal-ctags/ctags/archive/0645b2c833e4ca956970cc96fab32a1b04c0c55c.tar.gz -> ctags-20170704.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0f0b4068b2dcd3dcf30c76b66f517d26
+_md5_=c3d10e30b828438f90a04a890abf7478
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.1.0 b/metadata/md5-cache/dev-util/cucumber-core-3.1.0
index c4e9884dd565..10af46581060 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.1.0
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby22] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby22] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3.0
+SLOT=3.1
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.1.0.tar.gz -> cucumber-core-3.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=927463fbcba06e3e4545b3a0834df4de
+_md5_=483039ea37eaca247d09a36e906607e8
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
index ef13b7e4e7ff..0399a68a72ac 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ) ruby_targets_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] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_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 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.5.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6a321b58766759b15b5c6887012d0916
+_md5_=ef81d5483ae0b580bbedd33439ac238e
diff --git a/metadata/md5-cache/dev-util/cutter-1.0 b/metadata/md5-cache/dev-util/cutter-1.0
new file mode 100644
index 000000000000..ca21cb5a231b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cutter-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-util/radare2
+DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
+EAPI=6
+HOMEPAGE=http://www.radare.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-util/radare2
+SLOT=0
+SRC_URI=https://github.com/radareorg/cutter/archive/v1.0.tar.gz -> cutter-1.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e3de6061f3cb8a4f50096652fd1f07ea
diff --git a/metadata/md5-cache/dev-util/debhelper-11 b/metadata/md5-cache/dev-util/debhelper-11
deleted file mode 100644
index f3692a135c62..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://tracker.debian.org/pkg/debhelper
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/debhelper-11.1.3 b/metadata/md5-cache/dev-util/debhelper-11.1.3
new file mode 100644
index 000000000000..255c9be35e9d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-11.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.1.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3 b/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
index aa6fe411789a..3773e26022f7 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=framework for testing other programs
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
 IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl dev-tcltk/expect
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.4.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2ecfe33c61b8835b6f967dab8139e146
+_md5_=374b7a524a4101204365cac1790b0254
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.5 b/metadata/md5-cache/dev-util/dejagnu-1.5
index 580ff216d8fb..d4b82139491b 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.5
+++ b/metadata/md5-cache/dev-util/dejagnu-1.5
@@ -4,9 +4,9 @@ DESCRIPTION=framework for testing other programs
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/tcl dev-tcltk/expect
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.5.tar.gz
-_md5_=d785f28184e6c44b07abeedd2107176c
+_md5_=9ce8f9d6b1bfb64455aa1d13a769279b
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6 b/metadata/md5-cache/dev-util/dejagnu-1.6
index 1b884d7ddea4..c39d07e3334e 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6
@@ -3,8 +3,8 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
 DESCRIPTION=Framework for testing other programs
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.tar.gz
-_md5_=8cd8fe44aec9456edad520b33524bdae
+_md5_=2805ce6129b15b129753a4626b0d6194
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20160828 b/metadata/md5-cache/dev-util/dialog-1.3.20160828
index 4552bcca7fcd..73246585c90d 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20160828
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20160828
@@ -4,10 +4,10 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20160828.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1e0c44f2fa7d6bfcc703a8448c38a682
+_md5_=0e758899fda1d4df6e3cf1697ad17d66
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170131 b/metadata/md5-cache/dev-util/dialog-1.3.20170131
index 2d4b2f29f19e..ae524f74185f 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170131
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20170131
@@ -4,10 +4,10 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/14
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170131.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5a77432746c29d3917e7fb3239644ed0
+_md5_=49039cdf273c4c57df3c9686fbd9a34a
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170509 b/metadata/md5-cache/dev-util/dialog-1.3.20170509
index ae480c274154..37a5d96f5811 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170509
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20170509
@@ -4,10 +4,10 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/14
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170509.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=643bbcb600eee22335c989722065a5fa
+_md5_=8f1299857a01868aecd389901b7b59a4
diff --git a/metadata/md5-cache/dev-util/drone-0.8.2 b/metadata/md5-cache/dev-util/drone-0.8.2
deleted file mode 100644
index 68b858f4c3fc..000000000000
--- a/metadata/md5-cache/dev-util/drone-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
-DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
-EAPI=6
-HOMEPAGE=https://github.com/drone/drone
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/drone/drone/archive/956418cae9bef51fb5855c6a7bd881ceeb4fa801.tar.gz -> drone-0.8.2.tar.gz https://github.com/drone/drone-ui/archive/cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz -> github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/net/archive/9dfe39835686865bff950a07b394c12a98ddc811.tar.gz -> github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=46afb870720583c987603d9f264d2deb
diff --git a/metadata/md5-cache/dev-util/drone-0.8.3 b/metadata/md5-cache/dev-util/drone-0.8.3
deleted file mode 100644
index 2d7c6eaf22bf..000000000000
--- a/metadata/md5-cache/dev-util/drone-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
-DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
-EAPI=6
-HOMEPAGE=https://github.com/drone/drone
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/drone/drone/archive/3daf6797ab6378d4a27b9fb1d4877e3a55a6c922.tar.gz -> drone-0.8.3.tar.gz https://github.com/drone/drone-ui/archive/cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz -> github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/net/archive/a8b9294777976932365dabb6640cf1468d95c70f.tar.gz -> github.com-golang-net-a8b9294777976932365dabb6640cf1468d95c70f.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6b2795f44911059843d51f9bac901961
diff --git a/metadata/md5-cache/dev-util/drone-0.8.4 b/metadata/md5-cache/dev-util/drone-0.8.4
new file mode 100644
index 000000000000..5c2a04613485
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-0.8.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
+DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone/archive/75150d4a429da6c95cb851bfecded03a50936675.tar.gz -> drone-0.8.4.tar.gz https://github.com/drone/drone-ui/archive/cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz -> github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz https://github.com/golang/protobuf/archive/925541529c1fa6821df4e44ce2723319eb2be768.tar.gz -> github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz https://github.com/golang/net/archive/0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz -> github.com-golang-net-0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=0de61f00118a93f6d19d4eff80fd698b
diff --git a/metadata/md5-cache/dev-util/electron-1.6.15 b/metadata/md5-cache/dev-util/electron-1.6.15
deleted file mode 100644
index a035094ea8f9..000000000000
--- a/metadata/md5-cache/dev-util/electron-1.6.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Cross platform application development framework based on web technologies
-EAPI=6
-HOMEPAGE=https://electronjs.org/
-IUSE=cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts x11-libs/gtk+:2 selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=1.6
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.15.tar.gz -> electron-1.6.15.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz -> electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.6.15.tar.gz -> electron-patches-1.6.15.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59478d76ec903bbc5e4ba843bdec67f3
diff --git a/metadata/md5-cache/dev-util/electron-1.6.16 b/metadata/md5-cache/dev-util/electron-1.6.16
new file mode 100644
index 000000000000..2859e062e927
--- /dev/null
+++ b/metadata/md5-cache/dev-util/electron-1.6.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cross platform application development framework based on web technologies
+EAPI=6
+HOMEPAGE=https://electronjs.org/
+IUSE=cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts x11-libs/gtk+:2 selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=1.6
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.16.tar.gz -> electron-1.6.16.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz -> electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.6.16.tar.gz -> electron-patches-1.6.16.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de3d4415034bb1c230dd795e7a6477d0
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.50.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.50.3
index dcec854024bc..8e3712afc36a 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.50.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.50.3
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.50.3: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(-)] 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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.50/glib-2.50.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=644a4163c390c634734432b923314071
+_md5_=ac963ae749281ed147ef33ea83b4372d
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
index 50cbc0ec3720..fc2fd856c5d9 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.52.3: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] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17d9ef571e6e7cfee85f7e526016609f
+_md5_=fad6e7c735ec7dac2222f8a6b50bc460
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.6.2 b/metadata/md5-cache/dev-util/google-perftools-2.6.2
index 5e8cd2031d30..c9c57ce3950e 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.6.2
+++ b/metadata/md5-cache/dev-util/google-perftools-2.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, multi-threaded malloc() and nifty performance analysis tools
 EAPI=6
 HOMEPAGE=https://github.com/gperftools/gperftools
 IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=-* amd64 arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 SLOT=0/4
 SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.2 -> gperftools-2.6.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=4107a5b6180bb89b5e35b70e93f803f9
+_md5_=f3f002ec505cd6a5b52c29a89e6483e2
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
index 0248d8701f07..899bd00659b6 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs highlight vim python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.6:2 >=dev-lang/perl-5.18 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( virtual/emacs ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=122ff1042afe0c9ab1c6225fcc1668e0
+_md5_=73a16eaf9fc0cd074d1d310b99c399ca
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.25-r1 b/metadata/md5-cache/dev-util/gtk-doc-am-1.25-r1
index 0da888dcb881..d396d44c8bfa 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.25-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.25-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/perl-5.18 virtual/pkgconfig !<dev-util/gtk-doc-1.25 app-arch/x
 DESCRIPTION=Automake files from gtk-doc
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 FDL-1.1
 RDEPEND=>=dev-lang/perl-5.18
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7ebbb3470018c9c5f68e9550a7278b99
+_md5_=78d2d000dafd6abc7b59c0a5185a813b
diff --git a/metadata/md5-cache/dev-util/hadolint-1.2.6 b/metadata/md5-cache/dev-util/hadolint-1.2.6
new file mode 100644
index 000000000000..e1c5a73c262e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hadolint-1.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile Linter JavaScript API
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/hadolint
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?]
+SLOT=0/1.2.6
+SRC_URI=mirror://hackage/packages/archive/hadolint/1.2.6/hadolint-1.2.6.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fe3ff698bd49a18403f1c423c79e3b97
diff --git a/metadata/md5-cache/dev-util/intltool-0.51.0-r1 b/metadata/md5-cache/dev-util/intltool-0.51.0-r1
index a45bef6eaa3f..778d55de67de 100644
--- a/metadata/md5-cache/dev-util/intltool-0.51.0-r1
+++ b/metadata/md5-cache/dev-util/intltool-0.51.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=5
 HOMEPAGE=https://launchpad.net/intltool/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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-5.8.1 dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a7ce1f03e41df077c4e9b4e0422bc623
+_md5_=85937fb8ba6c40d9e1dff5f699bbe3cc
diff --git a/metadata/md5-cache/dev-util/intltool-0.51.0-r2 b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
index 236b1f8af57f..bc78d0806312 100644
--- a/metadata/md5-cache/dev-util/intltool-0.51.0-r2
+++ b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=6
 HOMEPAGE=https://launchpad.net/intltool/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-_md5_=a4f7e6d535009114c314ee99e1df28a1
+_md5_=a4cfea80726d1a1c11c48174e246aa04
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.89.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.89.3
new file mode 100644
index 000000000000..ed71492e3502
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.89.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.89.3/jenkins.war -> jenkins-bin-2.89.3.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=73722204c34b6321353338ae930563c1
diff --git a/metadata/md5-cache/dev-util/meson-0.43.0 b/metadata/md5-cache/dev-util/meson-0.43.0
index 372929ef6446..6fc51116dc87 100644
--- a/metadata/md5-cache/dev-util/meson-0.43.0
+++ b/metadata/md5-cache/dev-util/meson-0.43.0
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.43.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45fe66acb3d1f41bd7c52fc55293bb83
+_md5_=c60123286fd589952ee8cb031fca94f5
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
index e000280df148..c6a7a55ee15f 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
 EAPI=5
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ea2d4bebc259672069966ba060170b42
+_md5_=948a66f932f78dd58baa987597e8565a
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
index b981fc505fbc..393bf9fce19c 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
 EAPI=5
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e805501dd4932c61129e96921a9c41c
+_md5_=5b8ca870ece2958b478fa465564c7a36
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.29.1 b/metadata/md5-cache/dev-util/pkgconfig-0.29.1
index 54cc9287112c..cf13eee0e09d 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.29.1
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.29.1
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
 EAPI=6
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0418614e2625e0f5898099114f645198
+_md5_=c6c79fb5cb1e0da3da8d5dca400957ab
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.29.2 b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
index 334f3c16e630..e48f6ec7064e 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.29.2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
 EAPI=6
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=be9a1dfb80baefbe5b0be1475e87bd31
+_md5_=596a6ab191a0f389f6648e6b626e8c8e
diff --git a/metadata/md5-cache/dev-util/pkgconfig-9999 b/metadata/md5-cache/dev-util/pkgconfig-9999
index ee982b47a7a5..b07d2946152e 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-9999
+++ b/metadata/md5-cache/dev-util/pkgconfig-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0418614e2625e0f5898099114f645198
+_md5_=c6c79fb5cb1e0da3da8d5dca400957ab
diff --git a/metadata/md5-cache/dev-util/promu-0.1.0 b/metadata/md5-cache/dev-util/promu-0.1.0
index c88a4871df0e..6be48bfd9e59 100644
--- a/metadata/md5-cache/dev-util/promu-0.1.0
+++ b/metadata/md5-cache/dev-util/promu-0.1.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-lang/go-1.8
 DESCRIPTION=Prometheus Utility Tool
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/promu
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/v0.1.0.tar.gz -> promu-0.1.0.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6a704a5aac1bdcbdf1f54adc90199450
+_md5_=2aced555ccec8a8c2d25e7626299109d
diff --git a/metadata/md5-cache/dev-util/qbs-1.8.1-r1 b/metadata/md5-cache/dev-util/qbs-1.8.1-r1
deleted file mode 100644
index f0e7b95eeffd..000000000000
--- a/metadata/md5-cache/dev-util/qbs-1.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
-DESCRIPTION=Modern build tool for software projects
-EAPI=6
-HOMEPAGE=https://wiki.qt.io/Qbs
-IUSE=doc examples test
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
-SLOT=0
-SRC_URI=http://download.qt.io/official_releases/qbs/1.8.1/qbs-src-1.8.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2f33c595dfe5f6b31b76d23b1eb7c668
diff --git a/metadata/md5-cache/dev-util/qbs-1.9.1 b/metadata/md5-cache/dev-util/qbs-1.9.1
index cd1c5426716c..96f1c23bd9d6 100644
--- a/metadata/md5-cache/dev-util/qbs-1.9.1
+++ b/metadata/md5-cache/dev-util/qbs-1.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Modern build tool for software projects
 EAPI=6
 HOMEPAGE=https://wiki.qt.io/Qbs
 IUSE=doc examples test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qbs/1.9.1/qbs-src-1.9.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c309c3625b6a4b6fe7e52dc0cbec2880
+_md5_=8488be31601c1519f7e3fdba05ba7c3d
diff --git a/metadata/md5-cache/dev-util/rbtools-0.7.11 b/metadata/md5-cache/dev-util/rbtools-0.7.11
new file mode 100644
index 000000000000..ffdea84e70d2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rbtools-0.7.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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(-)]
+DESCRIPTION=Command line tools for use with Review Board
+EAPI=6
+HOMEPAGE=https://www.reviewboard.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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=https://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.11.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a5a423e6784c94884587d7e9bfe81a17
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.4.4 b/metadata/md5-cache/dev-util/shellcheck-0.4.4
deleted file mode 100644
index b3936cafcf0c..000000000000
--- a/metadata/md5-cache/dev-util/shellcheck-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Shell script analysis tool
-EAPI=6
-HOMEPAGE=http://www.shellcheck.net/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.4.4
-SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.4/ShellCheck-0.4.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=651083c828b28c15219e94e4ddc06b40
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.4.5 b/metadata/md5-cache/dev-util/shellcheck-0.4.5
deleted file mode 100644
index 0ab5c91467e5..000000000000
--- a/metadata/md5-cache/dev-util/shellcheck-0.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Shell script analysis tool
-EAPI=6
-HOMEPAGE=http://www.shellcheck.net/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.4.5
-SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.5/ShellCheck-0.4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4508cce5937154ff6afbe9c3f482e348
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.4.7 b/metadata/md5-cache/dev-util/shellcheck-0.4.7
new file mode 100644
index 000000000000..c618fd3c139e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shellcheck-0.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell script analysis tool
+EAPI=6
+HOMEPAGE=http://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.7
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.7/ShellCheck-0.4.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=6b7f374665f95d83983446127ea82f9e
diff --git a/metadata/md5-cache/dev-util/staruml-bin-2.8.0 b/metadata/md5-cache/dev-util/staruml-bin-2.8.0
deleted file mode 100644
index 396f609d9657..000000000000
--- a/metadata/md5-cache/dev-util/staruml-bin-2.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A sophisticated software modeler
-EAPI=6
-HOMEPAGE=http://staruml.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=StarUML-EULA
-RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt:11 dev-libs/nss dev-libs/nspr gnome-base/gconf media-libs/fontconfig media-libs/freetype media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libX11 x11-libs/pango virtual/libudev
-RESTRICT=bindist mirror splitdebug
-SLOT=0
-SRC_URI=amd64? ( http://staruml.io/download/release/v2.8.0/StarUML-v2.8.0-64-bit.deb ) x86? ( http://staruml.io/download/release/v2.8.0/StarUML-v2.8.0-32-bit.deb )
-_eclasses_=unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=ae71522ed54944bb29a04175bed67e78
diff --git a/metadata/md5-cache/dev-util/staruml-bin-2.8.1 b/metadata/md5-cache/dev-util/staruml-bin-2.8.1
new file mode 100644
index 000000000000..89eb5c9f7b29
--- /dev/null
+++ b/metadata/md5-cache/dev-util/staruml-bin-2.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A sophisticated software modeler
+EAPI=6
+HOMEPAGE=http://staruml.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=StarUML-EULA
+RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt:11 dev-libs/nss dev-libs/nspr gnome-base/gconf media-libs/fontconfig media-libs/freetype media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libX11 x11-libs/pango virtual/libudev
+RESTRICT=bindist mirror splitdebug
+SLOT=0
+SRC_URI=amd64? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-64-bit.deb ) x86? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-32-bit.deb )
+_eclasses_=unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=f88703aaea0c8ba5f68dceb137f9216d
diff --git a/metadata/md5-cache/dev-util/unifdef-2.10 b/metadata/md5-cache/dev-util/unifdef-2.10
index 1f05a1827c8a..d386c7441ac5 100644
--- a/metadata/md5-cache/dev-util/unifdef-2.10
+++ b/metadata/md5-cache/dev-util/unifdef-2.10
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=remove #ifdef'ed lines from a file while otherwise leaving the file alone
 EAPI=4
 HOMEPAGE=http://dotat.at/prog/unifdef/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://dotat.at/prog/unifdef/unifdef-2.10.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a6c770896fddf69eb49927044c0f5324
+_md5_=6131e39192ec5ebb8833a1567388187b
diff --git a/metadata/md5-cache/dev-util/unifdef-2.11 b/metadata/md5-cache/dev-util/unifdef-2.11
index 2cfefe5e591b..cd646ae54bdb 100644
--- a/metadata/md5-cache/dev-util/unifdef-2.11
+++ b/metadata/md5-cache/dev-util/unifdef-2.11
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=remove #ifdef'ed lines from a file while otherwise leaving the file alone
 EAPI=5
 HOMEPAGE=http://dotat.at/prog/unifdef/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://dotat.at/prog/unifdef/unifdef-2.11.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7470fc95a8db4f8cceb9fbba0bc7d45b
+_md5_=8b525297aa016d1683aec25c9575eb9f
diff --git a/metadata/md5-cache/dev-util/vint-0.3.17 b/metadata/md5-cache/dev-util/vint-0.3.17
deleted file mode 100644
index 8586aba3cf7d..000000000000
--- a/metadata/md5-cache/dev-util/vint-0.3.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ansicolor-0.2.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/chardet-2.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] test? ( >=dev-python/coverage-3.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/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(-)] >=dev-python/pytest-cov-1.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(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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=Lint tool for Vim script language
-EAPI=6
-HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/ansicolor-0.2.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/chardet-2.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.17.tar.gz -> vint-0.3.17.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35ea12d638224c24aaa63450ddc8ba7a
diff --git a/metadata/md5-cache/dev-util/vint-0.3.18 b/metadata/md5-cache/dev-util/vint-0.3.18
new file mode 100644
index 000000000000..ab4605be12f5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vint-0.3.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ansicolor-0.2.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/chardet-2.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] test? ( >=dev-python/coverage-3.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/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(-)] >=dev-python/pytest-cov-1.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(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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=Lint tool for Vim script language
+EAPI=6
+HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/ansicolor-0.2.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/chardet-2.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.18.tar.gz -> vint-0.3.18.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05bfecb89d499acef4e24adb56de5334
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 4b47fb846a9d..105e863e5ef4 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
index afea8125950b..7c99f005815d 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
@@ -4,11 +4,11 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=6
 HOMEPAGE=http://cvs.nongnu.org/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ffe26d576740390b6d21c2d672958703
+_md5_=edfd3a45363e108554381e2ad80930c6
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
index 2ef398753ba0..2f5e1a8f3e20 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
@@ -4,11 +4,11 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=6
 HOMEPAGE=http://cvs.nongnu.org/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=90ccc6af6c61522816ec7e80a2768e6e
+_md5_=4f31f8fb2d5c2c4c3f8a28b8660fa326
diff --git a/metadata/md5-cache/dev-vcs/cvsps-2.1-r1 b/metadata/md5-cache/dev-vcs/cvsps-2.1-r1
index 8d216d23107c..d98970bd928b 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.1-r1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.1-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=0
 HOMEPAGE=http://www.cobite.com/cvsps/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bdb64f573b7cc8f4102f9e7d90da6c89
+_md5_=79efbd32e953ac91178ddd7d03d78d7b
diff --git a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1 b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
index 192539ebc282..feda81617bdc 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=4
 HOMEPAGE=http://www.cobite.com/cvsps/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0a0796d74df19f742aa5312bde0fd9ef
+_md5_=0ea485a70d9d16157270ba83fe6326a5
diff --git a/metadata/md5-cache/dev-vcs/cvsps-3.13-r1 b/metadata/md5-cache/dev-vcs/cvsps-3.13-r1
index 0eac0698d37e..7954c5556aa9 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-3.13-r1
+++ b/metadata/md5-cache/dev-vcs/cvsps-3.13-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib app-text/asciidoc
 DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=3
 SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d75e9375f72972b5cf888bef4028249
+_md5_=53043d5e2ebdafb0d6c7a8bb56c94ef4
diff --git a/metadata/md5-cache/dev-vcs/fossil-1.35 b/metadata/md5-cache/dev-vcs/fossil-1.35
deleted file mode 100644
index 77a1193d5ece..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-1.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/download/fossil-src-1.35.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6af1435becb3f8391f34869ffb21db26
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.3 b/metadata/md5-cache/dev-vcs/fossil-2.3
deleted file mode 100644
index dbac69727608..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.20.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json legacy-mv-rm -miniz system-sqlite +ssl static tcl th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.20.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e3df8ea9f667501c066d68fa61e75035
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.4 b/metadata/md5-cache/dev-vcs/fossil-2.4
index 64cd8db51b86..476cebf8fedd 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.4
+++ b/metadata/md5-cache/dev-vcs/fossil-2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=6
 HOMEPAGE=http://www.fossil-scm.org/
 IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.20.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=ssl? ( !miniz )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6a1423f6d895fd5a681c0d7bbd4f6f0d
+_md5_=a1c76db9a7d50900bd07cddf8309a859
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
index 4bc03cb40112..7f88c0d1a142 100644
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ b/metadata/md5-cache/dev-vcs/git-2.13.6
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=872644b9d766f19607badc730835048d
+_md5_=febfde5337199f594573b445dec47922
diff --git a/metadata/md5-cache/dev-vcs/git-2.14.3 b/metadata/md5-cache/dev-vcs/git-2.14.3
index e09a69a6e561..16938f3f9256 100644
--- a/metadata/md5-cache/dev-vcs/git-2.14.3
+++ b/metadata/md5-cache/dev-vcs/git-2.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.14.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.14.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.14.3.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd69574bc5bfcb8b2251ae618c7ec9c0
+_md5_=f724e7a214ab8d2f39a89330a991438d
diff --git a/metadata/md5-cache/dev-vcs/git-2.15.1 b/metadata/md5-cache/dev-vcs/git-2.15.1
index d79d8b400bfc..c4f42c46fa9a 100644
--- a/metadata/md5-cache/dev-vcs/git-2.15.1
+++ b/metadata/md5-cache/dev-vcs/git-2.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.15.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.15.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.15.1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.0 b/metadata/md5-cache/dev-vcs/git-2.16.0
index c340154072d1..c1314549a9e5 100644
--- a/metadata/md5-cache/dev-vcs/git-2.16.0
+++ b/metadata/md5-cache/dev-vcs/git-2.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.16.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.0.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.1 b/metadata/md5-cache/dev-vcs/git-2.16.1
new file mode 100644
index 000000000000..2b79ae17eb3e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/git-2.16.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.1.tar.xz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index f8d12b9a1ff9..2415fa38438a 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index f8d12b9a1ff9..2415fa38438a 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index f8d12b9a1ff9..2415fa38438a 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index f8d12b9a1ff9..2415fa38438a 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=806948af5f4691c387e69f1683d351ab
+_md5_=ce3332a3965d43792562516196bf2687
diff --git a/metadata/md5-cache/dev-vcs/git-tools-2015_p20151225-r2 b/metadata/md5-cache/dev-vcs/git-tools-2015_p20151225-r2
index e855873a3423..dec860a25c8c 100644
--- a/metadata/md5-cache/dev-vcs/git-tools-2015_p20151225-r2
+++ b/metadata/md5-cache/dev-vcs/git-tools-2015_p20151225-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Assorted git-related scripts
 EAPI=5
 HOMEPAGE=https://github.com/MestreLion/git-tools/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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 ) >=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-vcs/git-2.5 >=app-shells/bash-4.0
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/MestreLion/git-tools/archive/ff7a07daa6898fd0993180f64bd232aa4def6018.tar.gz -> git-tools-2015_p20151225.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6876e7ae79232cd1139cb8cbf28d4d2f
+_md5_=507f94b6c87e64ca11259cfde41f397e
diff --git a/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201 b/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201
index 8ec9af8cd59b..83edc47ecadd 100644
--- a/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201
+++ b/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201
@@ -4,11 +4,11 @@ DESCRIPTION=Assorted git-related scripts
 EAPI=5
 HOMEPAGE=https://github.com/MestreLion/git-tools/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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 ) >=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-vcs/git-2.5 >=app-shells/bash-4.0
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/MestreLion/git-tools/archive/0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6.tar.gz -> git-tools-2015_p20160201.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=618121289783f88d017b6d6a75723328
+_md5_=aced4562442632bfb567546b4181130a
diff --git a/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201-r1 b/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201-r1
index b298c36265d7..e165f38ef398 100644
--- a/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201-r1
+++ b/metadata/md5-cache/dev-vcs/git-tools-2015_p20160201-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Assorted git-related scripts
 EAPI=5
 HOMEPAGE=https://github.com/MestreLion/git-tools/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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 ) >=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-vcs/git-2.5 >=app-shells/bash-4.0
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/MestreLion/git-tools/archive/0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6.tar.gz -> git-tools-2015_p20160201.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=abbe51fae4d726f610ba402bb3749e15
+_md5_=ad3de781ec847187532a755cfe4ba714
diff --git a/metadata/md5-cache/dev-vcs/git-tools-2017.10 b/metadata/md5-cache/dev-vcs/git-tools-2017.10
index a3684532c759..fc9478824eaa 100644
--- a/metadata/md5-cache/dev-vcs/git-tools-2017.10
+++ b/metadata/md5-cache/dev-vcs/git-tools-2017.10
@@ -4,11 +4,11 @@ DESCRIPTION=Assorted git-related scripts
 EAPI=6
 HOMEPAGE=https://github.com/MestreLion/git-tools
 IUSE=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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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-vcs/git-2.5 >=app-shells/bash-4.0
 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/MestreLion/git-tools/archive/v2017.10.tar.gz -> git-tools-2017.10.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cc2360fcedbcb66cae7eb594508b1eca
+_md5_=dd5d3d62c8ee65351174df452c8bd19a
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.5 b/metadata/md5-cache/dev-vcs/hg-git-0.8.5
deleted file mode 100644
index 7106f957b2b7..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-vcs/mercurial-4.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[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(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=5
-HOMEPAGE=http://hg-git.github.io https://pypi.python.org/pypi/hg-git
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-vcs/mercurial-4.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc4c1a4cdb1ea9f8ffdae5cf6269ed15
diff --git a/metadata/md5-cache/dev-vcs/mercurial-3.8.4 b/metadata/md5-cache/dev-vcs/mercurial-3.8.4
deleted file mode 100644
index 096f3e529739..000000000000
--- a/metadata/md5-cache/dev-vcs/mercurial-3.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates 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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-3.8.4.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ca47f116ac82aeb09cf5364159b4239
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.1.3 b/metadata/md5-cache/dev-vcs/mercurial-4.1.3
deleted file mode 100644
index c0512444423c..000000000000
--- a/metadata/md5-cache/dev-vcs/mercurial-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates 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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.1.3.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c49dd45247fe7985eb1c2b72f848c28
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index b861f791f587..02c5ddbd8a7a 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102 b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
deleted file mode 100644
index 834e14f012bb..000000000000
--- a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/zlib qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv ) sdl? ( media-libs/libsdl[X,sound,joystick,video] ) app-arch/xz-utils dev-util/scons
-DESCRIPTION=An accuracy-focused Gameboy / Gameboy Color emulator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/gambatte
-IUSE=qt4 +sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv ) sdl? ( media-libs/libsdl[X,sound,joystick,video] ) games-misc/games-envd
-REQUIRED_USE=|| ( qt4 sdl )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=190808b88a79d520d21749d4d6161b13
diff --git a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r1 b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r1
new file mode 100644
index 000000000000..6e8e66a40d1f
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib app-arch/xz-utils dev-util/scons
+DESCRIPTION=An accuracy-focused Gameboy / Gameboy Color emulator
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/gambatte
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib games-misc/games-envd
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=aa77701196221b67ddbed7d7171d1f29
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.55 b/metadata/md5-cache/games-emulation/snes9x-1.55
index e41fa7dbc527..30d5f60bb34b 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.55
+++ b/metadata/md5-cache/games-emulation/snes9x-1.55
@@ -11,4 +11,4 @@ RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.55.tar.gz -> snes9x-1.55.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99b6f14f1873afbdb909de4ab778c869
+_md5_=72339d885f6c2927831776c7b8694aac
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index d7a08c221b9a..102cf947293e 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/games-envd-0 b/metadata/md5-cache/games-misc/games-envd-0
index 421dd21c79cb..68be7bcdf7e6 100644
--- a/metadata/md5-cache/games-misc/games-envd-0
+++ b/metadata/md5-cache/games-misc/games-envd-0
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Environment file for gentoo games
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Games
-KEYWORDS=alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh 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
 SLOT=0
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f23ae19c8098c041f31f69ab1fb6a86f
+_md5_=de62fb34ea1fc00cf396868c629e9301
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 25deb8cf3a9c..ae49362a4177 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2 b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2
deleted file mode 100644
index 038a0ac66b18..000000000000
--- a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 ) !static? ( media-libs/glew ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
-EAPI=5
-HOMEPAGE=http://arx-libertatis.org/
-IUSE=c++0x debug +unity-build crash-reporter static tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 ) !static? ( media-libs/glew ) crash-reporter? ( sys-devel/gdb ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78f422c3cb6570a9ffb245f7b07f0714
diff --git a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1 b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
new file mode 100644
index 000000000000..3db601c5768c
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
+EAPI=5
+HOMEPAGE=http://arx-libertatis.org/
+IUSE=c++0x debug +unity-build crash-reporter static tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) crash-reporter? ( sys-devel/gdb ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5ab8bdff03c9405726e7029f35a503
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 06dd179512bb..6d237251c2d5 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
deleted file mode 100644
index 20a328344bfb..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d66643edd6a99e6a0a165c2f4d349149
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1
new file mode 100644
index 000000000000..162efc78b1b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c92157cfe30e039372b41236ed7fd1a6
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 665ef044071d..0b162f520730 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
index 60aca8737bb9..7634b6d6b8f7 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm test
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-lang/perl >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/designer-4.8.7:4 >=dev-qt/qtcore-4.8.7:4[qt3support?,ssl] >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtdeclarative-4.8.7:4 >=dev-qt/qtgui-4.8.7:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.7:4 >=dev-qt/qtsvg-4.8.7:4 media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.7:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) handbook? ( >=dev-qt/qttest-4.8.7:4 ) nls? ( virtual/libintl ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-lang/perl >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/designer-4.8.7:4 >=dev-qt/qtcore-4.8.7:4[qt3support?,ssl] >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtdeclarative-4.8.7:4 >=dev-qt/qtgui-4.8.7:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.7:4 >=dev-qt/qtsvg-4.8.7:4 media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.7:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-qt/qttest-4.8.7:4 doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Libraries needed for programs by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33f8fcc4eb786b981815417ae21cd378
+_md5_=7eefbcd9526113b8c0d02f79b608cf26
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index c96fd8d365da..879c86a61701 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/yakuake-3.0.4 b/metadata/md5-cache/kde-misc/yakuake-3.0.4
deleted file mode 100644
index 59ccdd216608..000000000000
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knewstuff-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/kservice-5.40.0:5 >=kde-frameworks/kwayland-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/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=6
-HOMEPAGE=https://yakuake.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knewstuff-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/kservice-5.40.0:5 >=kde-frameworks/kwayland-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/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=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/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7fe393ad0796f91c608773abf02f52c8
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2 b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
index 2a618ea77717..489ac3755f5f 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Quake-style terminal emulator based on konsole
 EAPI=6
 HOMEPAGE=https://yakuake.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knewstuff-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/kservice-5.40.0:5 >=kde-frameworks/kwayland-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/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=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/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d60ec3d4352566d22d6c33b209b54de
+_md5_=1f8f43f90926b595be046999e07a981c
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index ed46d88be085..06862fab2a11 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.10.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
deleted file mode 100644
index dc0854463d62..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.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/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.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/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/bluedevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f39dcd1e431b2223a9fdb4b77b274f1
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-5.10.5
deleted file mode 100644
index d0f4ef429b74..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-frameworks/kpackage-5.40.0:5 qt4? ( dev-util/automoc:0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
-IUSE=qt4 wayland debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-frameworks/breeze-icons-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5: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/plasma/5.10.5/breeze-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=195b950c57c6b3474c1c6ef9133254f9
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
deleted file mode 100644
index 80c7915f3294..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for GRUB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e5bc01c0d865dc73b7f25d4ebefc68f
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
deleted file mode 100644
index 624cd4e04493..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=692e21f36ad4da1f6c36efea17dba4ab
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
deleted file mode 100644
index 1dfd46738fac..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aed58461608da12764666eb7d1c7f4e5
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
deleted file mode 100644
index 29c0ac43c4a4..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a287a931e758fcd3c19c190b1e9d32e
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
deleted file mode 100644
index 066d47bdb004..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
-IUSE=+kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=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/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67b630310b3a69568062a4cb48bbb966
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
deleted file mode 100644
index 22a075da5269..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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 Plasma systemsettings kcm to set GTK application look&feel
-EAPI=6
-HOMEPAGE=https://projects.kde.org/kde-gtk-config
-IUSE=+gtk3 test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/kde-gtk-config: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/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2650c6d654ab8c32cebc4387b9ce9d5f
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
deleted file mode 100644
index 38da8e565a78..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Plugin based library to create window decorations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kdecoration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b65e8b1e8a2c5673a2dd8bceb149127
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
deleted file mode 100644
index 9d42e772f8e8..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-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/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=share debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-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/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=221a2a660b353f0a80a6eb5b44f62956
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.10.5 b/metadata/md5-cache/kde-plasma/kgamma-5.10.5
deleted file mode 100644
index 116c14b5ac4a..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kgamma5-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d880a779541666add886c5d72d14aa9f
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
deleted file mode 100644
index c275658bceb2..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-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-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst x11-libs/libxcb x11-libs/libXtst x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-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-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/khotkeys-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=265236eaa880c42added78d352782767
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
deleted file mode 100644
index fa6e5f653849..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A utility that provides information about a computer system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter: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
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8c0baccc01a9728aed81dd4a61288c1
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
deleted file mode 100644
index 48e9d6e5251a..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.10.5:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma menu editor
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
-IUSE=+hotkeys debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.10.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kmenuedit-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=beb873fa98b129d97f47df0ebfb42906
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.10.5 b/metadata/md5-cache/kde-plasma/kscreen-5.10.5
deleted file mode 100644
index 30cb3fe2dfa4..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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 Plasma screen management
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen: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/plasma/5.10.5/kscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40ded9b4815cd3106b4335f969e48c03
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
deleted file mode 100644
index 851ad64da976..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Library and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+pam seccomp test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.10.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=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/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7bb1b1f113660f3c2cc38cb95f489ffb
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
deleted file mode 100644
index 8727b7a9e992..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass: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
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1bcd759e0f8b231653597c58900bdd7
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
deleted file mode 100644
index 3898f91f48bf..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.10.5:5[-minimal(-)] >=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-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 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.10.5:5[-minimal(-)] >=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-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 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/ksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b989bc5383deef9ae1375ebb6ae7578
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
deleted file mode 100644
index 8d4e80efac1d..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecd473f4112ef349aa27c5181a1b3238
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
deleted file mode 100644
index 47a992c2ddd7..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1: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/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74c80d00e005ddebbb9a13c553e84b75
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.10.5 b/metadata/md5-cache/kde-plasma/kwin-5.10.5
deleted file mode 100644
index 3796ecaba16b..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=dev-qt/designer-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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 window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 multimedia test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.10.5:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kwin-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3272cdb9fc5608f633e0f537d60965af
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.10.5 b/metadata/md5-cache/kde-plasma/kwrited-5.10.5
deleted file mode 100644
index 70ac0f1f8dfd..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/kwrited-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cd3b2c07f7e11bdaeb45958dfc4269c
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
deleted file mode 100644
index 8d5acfc4c270..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Plasma screen management library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c4b1aa508d3c0b31d2179dd2bd760f8
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
deleted file mode 100644
index 16c7bd567aa9..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-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/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-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/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.40.0:5 !minimal? ( >=kde-frameworks/plasma-5.40.0:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Task management and system monitoring library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+detailedmemory minimal X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.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/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-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/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/libksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fa945764d0807fbbd033fda6f0a0902
diff --git a/metadata/md5-cache/kde-plasma/milou-5.10.5 b/metadata/md5-cache/kde-plasma/milou-5.10.5
deleted file mode 100644
index 21b7d47943b7..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Dedicated search application built on top of Baloo
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/milou-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56a2ac1f36df09a6503b6f8395f57118
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.10.5 b/metadata/md5-cache/kde-plasma/oxygen-5.10.5
deleted file mode 100644
index 138a67f87aab..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-frameworks/kservice-5.40.0:5 qt4? ( dev-util/automoc:0 virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
-IUSE=qt4 wayland debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/oxygen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3999f9a55d99da949c6a44c97e3e3e5
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
deleted file mode 100644
index df6fd375a5b6..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-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/knewstuff-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/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-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/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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 Plasma desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop test debug +handbook test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-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/knewstuff-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/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-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/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=796f21f0bc59e73073cfaf15984446fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
deleted file mode 100644
index 50b8e8a9c866..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/plasma-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9966c095cb64f9e659b3df701d391c49
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
deleted file mode 100644
index 48a588753891..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
-IUSE=bluetooth +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kdeplasma-addons-5.10.5:5 >=kde-plasma/kgamma-5.10.5:5 >=kde-plasma/khotkeys-5.10.5:5 >=kde-plasma/kinfocenter-5.10.5:5 >=kde-plasma/kmenuedit-5.10.5:5 >=kde-plasma/kscreen-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/ksshaskpass-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/kwayland-integration-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/kwrited-5.10.5:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=kde-plasma/plasma-desktop-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=kde-plasma/polkit-kde-agent-5.10.5:5 >=kde-plasma/powerdevil-5.10.5:5 >=kde-plasma/systemsettings-5.10.5:5 >=kde-plasma/user-manager-5.10.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.10.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.10.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.10.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.10.5:5 >=kde-plasma/kde-gtk-config-5.10.5:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.10.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.10.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.10.5:5 >=kde-plasma/plymouth-kcm-5.10.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.10.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.10.5:5 )
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b6ceb6db9978153bcda2fb0f6ac82b06
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
deleted file mode 100644
index 5ef451433f95..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/networkmanager-qt-5.40.0:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=modemmanager openconnect teamd debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/networkmanager-qt-5.40.0:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/plasma-nm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de7528d2741473bbe168594a40db5543
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
deleted file mode 100644
index d65c3b83ba00..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/plasma-pa-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2a78d30e348ddf7755a98ff3c15d7b3
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
deleted file mode 100644
index 930701122171..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=Useful applications for Plasma development
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-2.2.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a23d9828d36e4e6d59e0375b1b13702
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
deleted file mode 100644
index 1022bf5caa36..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kidletime-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/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-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/kxmlrpcclient-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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 Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kidletime-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/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-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/kxmlrpcclient-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b9f53cd4eb1ef8f7bd24e08409bc9a8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
deleted file mode 100644
index f38da36e28a3..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38482e7ac7a0917ad0cfebfd3de91d14
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
deleted file mode 100644
index 1c4d9880302d..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/plymouth-kcm
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1afca2081421a8093d95da37d8d05bd0
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
deleted file mode 100644
index 63c90b9e55b6..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=752cbf4a956713009941b46b2cd58ed3
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
deleted file mode 100644
index d04d228791f9..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
-IUSE=consolekit +wireless debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/powerdevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9b5ce826cde5cfb25ab67f7aeeb694f
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
deleted file mode 100644
index 6d71b1fce0f8..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e2d652e7c4dcd320dc9313a685127d0
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
deleted file mode 100644
index ea2428fb7343..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System settings utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.10.5:5 ) !kde-plasma/systemsettings: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
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cc443e8bf1be98a7d469295e4ba87ca
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.10.5 b/metadata/md5-cache/kde-plasma/user-manager-5.10.5
deleted file mode 100644
index 92830ec65d7f..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-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/plasma/5.10.5/user-manager-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f43cc8b39c1c460fca0817ca076d3fd8
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 7c2e499a0430..054c38574f19 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.7.0-r1 b/metadata/md5-cache/lxde-base/lxpanel-0.7.0-r1
deleted file mode 100644
index c4a93fed1d4c..000000000000
--- a/metadata/md5-cache/lxde-base/lxpanel-0.7.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools ) virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Lightweight X11 desktop panel for LXDE
-EAPI=4
-HOMEPAGE=https://wiki.lxde.org/en/LXPanel
-IUSE=+alsa wifi
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%200.7.x/lxpanel-0.7.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=31c4036855430cf87ac6a8f73e29dcf0
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index db5708e0d149..48de834ec9ec 100644
--- a/metadata/md5-cache/lxqt-base/Manifest.gz
+++ b/metadata/md5-cache/lxqt-base/Manifest.gz
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0
index 84fc992a347a..9a6797c9ed10 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=5
 HOMEPAGE=http://lxqt.org/
 IUSE=+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit powermanagement sddm ssh-askpass sudo
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-common-0.11.0 ~lxqt-base/lxqt-config-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 ~lxqt-base/lxqt-notificationd-0.11.0 ~lxqt-base/lxqt-panel-0.11.0 ~lxqt-base/lxqt-qtplugin-0.11.0 ~lxqt-base/lxqt-runner-0.11.0 ~lxqt-base/lxqt-session-0.11.0 virtual/ttf-fonts about? ( ~lxqt-base/lxqt-about-0.11.0 ) admin? ( ~lxqt-base/lxqt-admin-0.11.0 ) filemanager? ( >=x11-misc/pcmanfm-qt-0.11.0 ) icons? ( oxygen? ( kde-frameworks/oxygen-icons ) !oxygen? ( virtual/freedesktop-icon-theme ) ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) policykit? ( ~lxqt-base/lxqt-policykit-0.11.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.11.0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-0.11.0 ) sudo? ( ~lxqt-base/lxqt-sudo-0.11.0 )
 REQUIRED_USE=oxygen? ( icons )
 SLOT=0
-_md5_=6b24b830dd376a51d9fe62abd26b90e1
+_md5_=0cb5b05a6c3d3f9e5d878bf85e759cf8
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6f7b2e7cd19f..1c9ee71945ec 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/drac-1.12-r1 b/metadata/md5-cache/mail-client/drac-1.12-r1
deleted file mode 100644
index 1e64d59521eb..000000000000
--- a/metadata/md5-cache/mail-client/drac-1.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=virtual/mta >=sys-libs/db-3.2.9 >=sys-apps/sed-4
-DESCRIPTION=A robust implementation of POP-before-SMTP
-EAPI=0
-HOMEPAGE=http://mail.cc.umanitoba.ca/drac/
-IUSE=debug
-KEYWORDS=x86 sparc ppc hppa ~amd64 ppc64
-LICENSE=rc
-RDEPEND=virtual/mta >=sys-libs/db-3.2.9 >=sys-apps/sed-4 >=net-nds/portmap-5b-r6
-SLOT=0
-SRC_URI=ftp://ftp.cc.umanitoba.ca/src/drac.tar.Z
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa2a92ffd3829a5515d17c8ef675bf8f
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r1 b/metadata/md5-cache/mail-client/neomutt-20171215-r1
new file mode 100644
index 000000000000..18bea7b4d8d2
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20171215-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1e45c2c5e1b3e18839ea5e45fdc079a7
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r2 b/metadata/md5-cache/mail-client/neomutt-20171215-r2
new file mode 100644
index 000000000000..2cf116f5f9cb
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20171215-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c2fc10e2eb1698cf974cac6505bb871c
diff --git a/metadata/md5-cache/mail-client/neomutt-9999 b/metadata/md5-cache/mail-client/neomutt-9999
index cf6dd72f72e6..5306fe21289f 100644
--- a/metadata/md5-cache/mail-client/neomutt-9999
+++ b/metadata/md5-cache/mail-client/neomutt-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=https://www.neomutt.org/
 IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9cf0204eb12dde7c7abffb09c4e15dfc
+_md5_=c2fc10e2eb1698cf974cac6505bb871c
diff --git a/metadata/md5-cache/mail-client/roundcube-1.2.5 b/metadata/md5-cache/mail-client/roundcube-1.2.5
deleted file mode 100644
index 906d0fb0b3b0..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=6
-HOMEPAGE=https://roundcube.net
-IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.0.6 >=dev-php/PEAR-Mail_Mime-1.8.9 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Net_SMTP-1.6.2 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.2.5
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.2.5/roundcubemail-1.2.5.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=0e00948884e815756313d2a926a9ea07
diff --git a/metadata/md5-cache/mail-client/roundcube-1.2.6 b/metadata/md5-cache/mail-client/roundcube-1.2.6
deleted file mode 100644
index 029efe3352e1..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=6
-HOMEPAGE=https://roundcube.net
-IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.0.6 >=dev-php/PEAR-Mail_Mime-1.8.9 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Net_SMTP-1.6.2 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.2.6
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.2.6/roundcubemail-1.2.6-complete.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=d8df815b72cc8ec38f54aae9e71e422a
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.0 b/metadata/md5-cache/mail-client/roundcube-1.3.0
deleted file mode 100644
index 36de772103da..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=6
-HOMEPAGE=https://roundcube.net
-IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 >=dev-php/PEAR-Net_Socket-1.2.1 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.3.0
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.0/roundcubemail-1.3.0.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=40d38dd98487b4395703f317e8b14a9c
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.1 b/metadata/md5-cache/mail-client/roundcube-1.3.1
deleted file mode 100644
index 444cbe64f577..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=6
-HOMEPAGE=https://roundcube.net
-IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 >=dev-php/PEAR-Net_Socket-1.2.1 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.3.1
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.1/roundcubemail-1.3.1-complete.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=95281078396dc9549839a462f984dd13
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.3 b/metadata/md5-cache/mail-client/roundcube-1.3.3
deleted file mode 100644
index 9e31498f93f4..000000000000
--- a/metadata/md5-cache/mail-client/roundcube-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
-EAPI=6
-HOMEPAGE=https://roundcube.net
-IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 >=dev-php/PEAR-Net_Socket-1.2.1 virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=1.3.3
-SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.3/roundcubemail-1.3.3-complete.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=95281078396dc9549839a462f984dd13
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.4 b/metadata/md5-cache/mail-client/roundcube-1.3.4
new file mode 100644
index 000000000000..895aac40fd4d
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=6
+HOMEPAGE=https://roundcube.net
+IUSE=enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 >=dev-php/PEAR-Net_Socket-1.2.1 dev-php/PEAR-Console_CommandLine dev-php/PEAR-Console_Getopt dev-php/PEAR-Exception virtual/httpd-php enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.3.4
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.4/roundcubemail-1.3.4-complete.tar.gz
+_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=3283d96981dbd23ec8b2cdb21e1f98cf
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.8.0 b/metadata/md5-cache/mail-client/thunderbird-45.8.0
index f84ddafb504d..d03567b1ca3f 100644
--- a/metadata/md5-cache/mail-client/thunderbird-45.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-45.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=system-harfbuzz? ( system-icu )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ar.xpi -> thunderbird-45.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ast.xpi -> thunderbird-45.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/be.xpi -> thunderbird-45.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bg.xpi -> thunderbird-45.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/br.xpi -> thunderbird-45.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ca.xpi -> thunderbird-45.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cs.xpi -> thunderbird-45.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cy.xpi -> thunderbird-45.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/da.xpi -> thunderbird-45.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/de.xpi -> thunderbird-45.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/el.xpi -> thunderbird-45.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/et.xpi -> thunderbird-45.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/eu.xpi -> thunderbird-45.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fi.xpi -> thunderbird-45.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fr.xpi -> thunderbird-45.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gd.xpi -> thunderbird-45.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gl.xpi -> thunderbird-45.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/he.xpi -> thunderbird-45.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hr.xpi -> thunderbird-45.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hu.xpi -> thunderbird-45.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/id.xpi -> thunderbird-45.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/is.xpi -> thunderbird-45.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/it.xpi -> thunderbird-45.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ja.xpi -> thunderbird-45.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ko.xpi -> thunderbird-45.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/lt.xpi -> thunderbird-45.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nl.xpi -> thunderbird-45.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pl.xpi -> thunderbird-45.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/rm.xpi -> thunderbird-45.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ro.xpi -> thunderbird-45.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ru.xpi -> thunderbird-45.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/si.xpi -> thunderbird-45.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sk.xpi -> thunderbird-45.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sl.xpi -> thunderbird-45.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sq.xpi -> thunderbird-45.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sr.xpi -> thunderbird-45.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/tr.xpi -> thunderbird-45.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/uk.xpi -> thunderbird-45.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/vi.xpi -> thunderbird-45.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/source/thunderbird-45.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.8.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-12.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.45	a2be5f5e8620147b5a8e27fc6ccfab14	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.45	a2be5f5e8620147b5a8e27fc6ccfab14	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6f103cebc3209f76435075bf3251e184
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.5.0 b/metadata/md5-cache/mail-client/thunderbird-52.5.0
index 2de3a3113e27..b578c0cb1e8b 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.5.0
+++ b/metadata/md5-cache/mail-client/thunderbird-52.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ar.xpi -> thunderbird-52.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ast.xpi -> thunderbird-52.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/be.xpi -> thunderbird-52.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/bg.xpi -> thunderbird-52.5.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/br.xpi -> thunderbird-52.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ca.xpi -> thunderbird-52.5.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/cs.xpi -> thunderbird-52.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/cy.xpi -> thunderbird-52.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/da.xpi -> thunderbird-52.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/de.xpi -> thunderbird-52.5.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/el.xpi -> thunderbird-52.5.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/et.xpi -> thunderbird-52.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/eu.xpi -> thunderbird-52.5.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fi.xpi -> thunderbird-52.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fr.xpi -> thunderbird-52.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/gd.xpi -> thunderbird-52.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/gl.xpi -> thunderbird-52.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/he.xpi -> thunderbird-52.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hr.xpi -> thunderbird-52.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hu.xpi -> thunderbird-52.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/id.xpi -> thunderbird-52.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/is.xpi -> thunderbird-52.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/it.xpi -> thunderbird-52.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ja.xpi -> thunderbird-52.5.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ko.xpi -> thunderbird-52.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/lt.xpi -> thunderbird-52.5.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nl.xpi -> thunderbird-52.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pl.xpi -> thunderbird-52.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/rm.xpi -> thunderbird-52.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ro.xpi -> thunderbird-52.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ru.xpi -> thunderbird-52.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/si.xpi -> thunderbird-52.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sk.xpi -> thunderbird-52.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sl.xpi -> thunderbird-52.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sq.xpi -> thunderbird-52.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sr.xpi -> thunderbird-52.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/tr.xpi -> thunderbird-52.5.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/uk.xpi -> thunderbird-52.5.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/vi.xpi -> thunderbird-52.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/source/thunderbird-52.5.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=035891733013ab86238bc7f23139ffdc
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.5.2 b/metadata/md5-cache/mail-client/thunderbird-52.5.2
index a959ba528aa4..8cb13f4ccd4f 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.5.2
+++ b/metadata/md5-cache/mail-client/thunderbird-52.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ar.xpi -> thunderbird-52.5.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ast.xpi -> thunderbird-52.5.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/be.xpi -> thunderbird-52.5.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bg.xpi -> thunderbird-52.5.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.2-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/br.xpi -> thunderbird-52.5.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ca.xpi -> thunderbird-52.5.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cs.xpi -> thunderbird-52.5.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cy.xpi -> thunderbird-52.5.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/da.xpi -> thunderbird-52.5.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/de.xpi -> thunderbird-52.5.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/el.xpi -> thunderbird-52.5.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/et.xpi -> thunderbird-52.5.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/eu.xpi -> thunderbird-52.5.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fi.xpi -> thunderbird-52.5.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fr.xpi -> thunderbird-52.5.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gd.xpi -> thunderbird-52.5.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gl.xpi -> thunderbird-52.5.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/he.xpi -> thunderbird-52.5.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hr.xpi -> thunderbird-52.5.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hu.xpi -> thunderbird-52.5.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/id.xpi -> thunderbird-52.5.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/is.xpi -> thunderbird-52.5.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/it.xpi -> thunderbird-52.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ja.xpi -> thunderbird-52.5.2-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ko.xpi -> thunderbird-52.5.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/lt.xpi -> thunderbird-52.5.2-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nl.xpi -> thunderbird-52.5.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pl.xpi -> thunderbird-52.5.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/rm.xpi -> thunderbird-52.5.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ro.xpi -> thunderbird-52.5.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ru.xpi -> thunderbird-52.5.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/si.xpi -> thunderbird-52.5.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sk.xpi -> thunderbird-52.5.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sl.xpi -> thunderbird-52.5.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sq.xpi -> thunderbird-52.5.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sr.xpi -> thunderbird-52.5.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.2-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.2-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/tr.xpi -> thunderbird-52.5.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/uk.xpi -> thunderbird-52.5.2-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/vi.xpi -> thunderbird-52.5.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.2-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/source/thunderbird-52.5.2.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.2.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ee717e5108db720014b20e8ef6cbc86e
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.5.2 b/metadata/md5-cache/mail-client/thunderbird-bin-52.5.2
index b2843fb55775..25e3583032d4 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-52.5.2
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.5.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ar.xpi -> thunderbird-52.5.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ast.xpi -> thunderbird-52.5.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/be.xpi -> thunderbird-52.5.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bg.xpi -> thunderbird-52.5.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.2-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/br.xpi -> thunderbird-52.5.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ca.xpi -> thunderbird-52.5.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cs.xpi -> thunderbird-52.5.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cy.xpi -> thunderbird-52.5.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/da.xpi -> thunderbird-52.5.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/de.xpi -> thunderbird-52.5.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/el.xpi -> thunderbird-52.5.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/et.xpi -> thunderbird-52.5.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/eu.xpi -> thunderbird-52.5.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fi.xpi -> thunderbird-52.5.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fr.xpi -> thunderbird-52.5.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gd.xpi -> thunderbird-52.5.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gl.xpi -> thunderbird-52.5.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/he.xpi -> thunderbird-52.5.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hr.xpi -> thunderbird-52.5.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hu.xpi -> thunderbird-52.5.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/id.xpi -> thunderbird-52.5.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/is.xpi -> thunderbird-52.5.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/it.xpi -> thunderbird-52.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ja.xpi -> thunderbird-52.5.2-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ko.xpi -> thunderbird-52.5.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/lt.xpi -> thunderbird-52.5.2-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nl.xpi -> thunderbird-52.5.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pl.xpi -> thunderbird-52.5.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/rm.xpi -> thunderbird-52.5.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ro.xpi -> thunderbird-52.5.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ru.xpi -> thunderbird-52.5.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/si.xpi -> thunderbird-52.5.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sk.xpi -> thunderbird-52.5.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sl.xpi -> thunderbird-52.5.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sq.xpi -> thunderbird-52.5.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sr.xpi -> thunderbird-52.5.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.2-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.2-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/tr.xpi -> thunderbird-52.5.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/uk.xpi -> thunderbird-52.5.2-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/vi.xpi -> thunderbird-52.5.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.2-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-US/thunderbird-52.5.2.tar.bz2 -> thunderbird-bin_x86_64-52.5.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-US/thunderbird-52.5.2.tar.bz2 -> thunderbird-bin_i686-52.5.2.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f32082f3f1980fa88531128c9afc9a6
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 24f987f697be..e5cadad3a127 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2 b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
new file mode 100644
index 000000000000..92e69a020b3f
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=Weighted Policy daemon for Postfix
+EAPI=6
+HOMEPAGE=http://www.policyd-weight.org/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/perl-File-Spec virtual/perl-Sys-Syslog dev-perl/Net-DNS dev-perl/Net-IP >=mail-mta/postfix-2.1 virtual/tmpfiles
+SLOT=0
+SRC_URI=http://www.policyd-weight.org/releases/policyd-weight-0.1.15.2.tar.gz mirror://gentoo/policyd-weight-0.1.15.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/policyd-weight/policyd-weight-0.1.15.2-patches-1.0.tar.xz
+_eclasses_=tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f5609f33e915f34c7877c533ea048819
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index baf35fea4ad1..56f4e0604019 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3_pre20180107 b/metadata/md5-cache/mail-mta/postfix-3.3_pre20180107
deleted file mode 100644
index f7e1ac5954a5..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.3_pre20180107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=IBM
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20180107.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=db353a4ecfa18999990a198cc2555f8f
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3_pre20180121 b/metadata/md5-cache/mail-mta/postfix-3.3_pre20180121
new file mode 100644
index 000000000000..c38c3ee1b5a6
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.3_pre20180121
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=IBM
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20180121.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=db353a4ecfa18999990a198cc2555f8f
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
index ec471b1a3684..8cd987a4e50d 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Extremely simple MTA to get mail off the system to a Mailhub
 EAPI=4
 HOMEPAGE=ftp://ftp.debian.org/debian/pool/main/s/ssmtp/
 IUSE=ipv6 +ssl gnutls +mta
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl:0 ) gnutls? ( net-libs/gnutls[openssl] ) ) net-mail/mailbase mta? ( !net-mail/mailwrapper !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 https://dev.gentoo.org/~flameeyes/ssmtp/ssmtp-2.64-patches-3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e984950b63dad8f64ec2b42a6b4a47c2
+_md5_=8058b2d2208b1968cb025e0e283052aa
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r3 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
index 851a768467c7..19f85012618a 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Extremely simple MTA to get mail off the system to a Mailhub
 EAPI=5
 HOMEPAGE=ftp://ftp.debian.org/debian/pool/main/s/ssmtp/
 IUSE=ipv6 libressl +ssl gnutls +mta
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ssl? ( gnutls? ( net-libs/gnutls[openssl] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !net-mail/mailwrapper !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 https://dev.gentoo.org/~pinkbyte/distfiles/patches/ssmtp-2.64-patches-4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4e120406e59cd2db3772eb4795e99e27
+_md5_=01f06fa064135afc0b146f8667c8cbd6
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 0cb3a3793104..964c420415b2 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/hack-3.000 b/metadata/md5-cache/media-fonts/hack-3.000
deleted file mode 100644
index 66dd395ccb11..000000000000
--- a/metadata/md5-cache/media-fonts/hack-3.000
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A typeface designed for source code
-EAPI=6
-HOMEPAGE=https://github.com/source-foundry/Hack
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/source-foundry/Hack/releases/download/v3.000/Hack-v3.000-ttf.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c7e9b8c925151f0a6d4c099051c3eb43
diff --git a/metadata/md5-cache/media-fonts/hack-3.001 b/metadata/md5-cache/media-fonts/hack-3.001
new file mode 100644
index 000000000000..538c7fb78539
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/hack-3.001
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup unpack
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=A typeface designed for source code
+EAPI=6
+HOMEPAGE=https://github.com/source-foundry/Hack
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/source-foundry/Hack/releases/download/v3.001/Hack-v3.001-ttf.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c7e9b8c925151f0a6d4c099051c3eb43
diff --git a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9 b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
index bae409f9e8b4..b7b1a587dea9 100644
--- a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
@@ -4,10 +4,10 @@ DESCRIPTION=free good quality fonts gpl'd by URW++
 EAPI=0
 HOMEPAGE=http://www.urwpp.de/
 IUSE=X
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!media-fonts/gnu-gs-fonts-std !media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://gentoo/urw-fonts-2.4-9.fc13.src.rpm
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=43f6ce7dcdd2316c2d94e251ed337d72
+_md5_=7bf795a9084c86f5afe704f73f878ff5
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 8ca17fdabf71..6c0185ca6f56 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/darktable-2.2.5 b/metadata/md5-cache/media-gfx/darktable-2.2.5
index e7e0481bb013..5e1d707810bb 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.5
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.5/darktable-2.2.5.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f63610e0cdaf52599f742ff8748cc67c
+_md5_=cf81d7ad4d997591e01102d904f9e508
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.0 b/metadata/md5-cache/media-gfx/darktable-2.4.0
index 4b3e1b845e85..36db2c46a269 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.0
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-2.4.0.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6acfbcc8f4e980fa0f9ddfed007c27fb
+_md5_=5f72c2dd5f843b502606e85a3c3272da
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.1 b/metadata/md5-cache/media-gfx/darktable-2.4.1
new file mode 100644
index 000000000000..e05610321264
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A virtual lighttable and darkroom for photographers
+EAPI=6
+HOMEPAGE=https://www.darktable.org/
+IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+REQUIRED_USE=cpu_flags_x86_sse3
+SLOT=0
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.1/darktable-2.4.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f72c2dd5f843b502606e85a3c3272da
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index 7a111234b7f1..40c39b94c434 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ad4eb4a1fb11f791d8deb498a24230d
+_md5_=b071862973f8e897f5a456d09c7a10e2
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5
index 5b235e48e05a..39f4a874d4bc 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew:0= ) virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=09535ac79e8125f8adae6afe1e587f94
diff --git a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2 b/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2
index 1c43520ea9a7..6a15e4145aef 100644
--- a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2
+++ b/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-2.3.3.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cc3c47e418351414d09bdff9dd5c1fe6
diff --git a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1 b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
index 65256ba4c567..f78eab3ee783 100644
--- a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-3.0.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b38f167621ea858b14ed13c33ff315a0
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index a65b6bc21550..10e324d9135e 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -7,5 +7,5 @@ IUSE=curl debug java libeai motif +nsplugin opencl osc rbp +sox static-libs elib
 LICENSE=GPL-3
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) rbp? ( dev-games/ode:0=[double-precision] ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=29f18fea9842f0de247c6c6c2aa00480
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.15 b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
new file mode 100644
index 000000000000..d7496074f8b4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.10:=[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free, redistributable digital camera software application
+EAPI=6
+HOMEPAGE=http://www.gphoto.org/
+IUSE=aalib exif ncurses nls readline
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.10:=[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.15.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=496cce28f4376bab087fd7eecedfe5d8
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1 b/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
index 58d937361afe..509fde8079a3 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=5
 HOMEPAGE=http://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg:0 virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) postscript? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f6317b7c6c461c777add1c78ef2812e8
+_md5_=6db3b6c87294632d9329b0e4d9078d78
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.40.1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1
index 646a9d9df22a..d0b8e92d69d2 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.40.1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=6
 HOMEPAGE=http://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg:0 virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) postscript? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=333d39bd1174b6354d06e0df5f592652
+_md5_=67b5cd8f2276d164ac204880b37e3851
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
index 18d5aa3ac369..f2d7904bf84f 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=6
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) !<=sci-chemistry/cluster-1.3.081231 java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d3887deaf4e5fc8e5350e5316a715c8c
+_md5_=0fb2d95eac48491bb2450852801f7564
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.31.0 b/metadata/md5-cache/media-gfx/icoutils-0.31.0
deleted file mode 100644
index 8f3746257f8f..000000000000
--- a/metadata/md5-cache/media-gfx/icoutils-0.31.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to extract and convert images in icon and cursor files (.ico, .cur)
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/icoutils/
-IUSE=nls
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://nongnu/icoutils/icoutils-0.31.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11ce2b85dd7e3cc73dc8e04061b74df9
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.31.1 b/metadata/md5-cache/media-gfx/icoutils-0.31.1
deleted file mode 100644
index 5499d862e5e3..000000000000
--- a/metadata/md5-cache/media-gfx/icoutils-0.31.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to extract and convert images in icon and cursor files (.ico, .cur)
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/icoutils/
-IUSE=nls
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://nongnu/icoutils/icoutils-0.31.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2bc91a62f36c514e6483d38ef1395b8d
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.31.3 b/metadata/md5-cache/media-gfx/icoutils-0.31.3
deleted file mode 100644
index 0e2ded6cc194..000000000000
--- a/metadata/md5-cache/media-gfx/icoutils-0.31.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to extract and convert images in icon and cursor files (.ico, .cur)
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/icoutils/
-IUSE=nls
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://nongnu/icoutils/icoutils-0.31.3.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cca97f23699d00791654f88a624dcdbc
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.2 b/metadata/md5-cache/media-gfx/inkscape-0.92.2
index 1d8b78a0f1a3..ded5f90aee35 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.2
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.2
@@ -4,7 +4,7 @@ DESCRIPTION=A SVG based generic vector-drawing program
 EAPI=6
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.48 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-gfx/potrace media-gfx/scour[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-gfx/uniconvertor dia? ( app-office/dia ) latex? ( media-gfx/pstoedit[plotutils] app-text/dvipsk app-text/texlive-core ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.2.tar.bz2 https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81858a821ab4c2ae64ea2c954adc5efa
+_md5_=9bc904a9ab0ff24e87a2a4639da234f4
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r3 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r3
new file mode 100644
index 000000000000..e5c08f0952bd
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
+DESCRIPTION=Generic 2D CAD program
+EAPI=5
+HOMEPAGE=http://www.librecad.org/
+IUSE=3d debug doc tools
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
+SLOT=0
+SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=734470f13ebbb7aade088b37b406fe52
diff --git a/metadata/md5-cache/media-gfx/librecad-9999 b/metadata/md5-cache/media-gfx/librecad-9999
index fb0d55a82466..8301fa7ea085 100644
--- a/metadata/md5-cache/media-gfx/librecad-9999
+++ b/metadata/md5-cache/media-gfx/librecad-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=20cdad17da8f8f7b11158aff09e6759e
+_md5_=d1ea29dc9c64481f54c38abfa4414014
diff --git a/metadata/md5-cache/media-gfx/scour-0.36 b/metadata/md5-cache/media-gfx/scour-0.36
index a3854c356b27..7d03299c2b52 100644
--- a/metadata/md5-cache/media-gfx/scour-0.36
+++ b/metadata/md5-cache/media-gfx/scour-0.36
@@ -4,11 +4,11 @@ DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
 EAPI=6
 HOMEPAGE=https://github.com/scour-project/scour
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.36.tar.gz -> scour-0.36.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd127390cc4c7acbeec1bfef2e69b9e3
+_md5_=9316319db12eb2f807e68507a2702e46
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2 b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
index a8a16dc5ec7f..f43753a56648 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
+++ b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
-SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
+SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch https://bitbucket.org/dismine/valentina/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdeda7dda608828d0f123302314b321e
+_md5_=1da1e0dae07d377091552ad3f845248b
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4d53c517717b..af4b27a10e10 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/babl-0.1.38 b/metadata/md5-cache/media-libs/babl-0.1.38
index be2817e80bfe..f78bb9e7f6bc 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.38
+++ b/metadata/md5-cache/media-libs/babl-0.1.38
@@ -4,9 +4,9 @@ DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=6
 HOMEPAGE=http://www.gegl.org/babl/
 IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.38.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9db08bb88e19768474fcf93c71a2dd1e
+_md5_=8944f3d9aa35d0f730f792fa3803346a
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2 b/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
index 1c95a7cd8076..5dd21d5d070f 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~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.5.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=154adfa2e61fa7dc189373224ed59415
+_md5_=28d90f8e8ea480ae60a55d90e69645d3
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.4 b/metadata/md5-cache/media-libs/fontconfig-2.12.4
index 9f82a4cd6b4d..7d1beea7bcb8 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.4
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.4
@@ -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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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.5.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=793f6a9294cf37dd2e6ef1f645bd3412
+_md5_=0a0449c8b2a138e0b46f6207db00fd33
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index cea21e514fe0..31e742449c4e 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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.5.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(-)?] 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	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e885746440cdf35afc8e99f55c463985
+_md5_=a313cd8c01c0d8aaf204f982d23f3ed4
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.91 b/metadata/md5-cache/media-libs/fontconfig-2.12.91
index 0bf3572c0a4f..9a25ce12e2cc 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.91
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.91
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.91.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ca2142aee3e7022522bf8beca1b73990
+_md5_=019e278355934749823a9e31e4490fe8
diff --git a/metadata/md5-cache/media-libs/freetype-2.8 b/metadata/md5-cache/media-libs/freetype-2.8
index 51a7798cd0dc..e0f6de7da7cd 100644
--- a/metadata/md5-cache/media-libs/freetype-2.8
+++ b/metadata/md5-cache/media-libs/freetype-2.8
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=6
 HOMEPAGE=http://www.freetype.org/
 IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.8.tar.bz2 mirror://nongnu/freetype/freetype-2.8.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.8.tar.bz2 mirror://nongnu/freetype/ft2demos-2.8.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.8.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.8.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=56b41fcba86359a6d4b133fc7f0787bc
+_md5_=d5ab4a1d7edac5089f7c88883140a58e
diff --git a/metadata/md5-cache/media-libs/freetype-2.8.1 b/metadata/md5-cache/media-libs/freetype-2.8.1
index 671b114982c9..01e19569bb75 100644
--- a/metadata/md5-cache/media-libs/freetype-2.8.1
+++ b/metadata/md5-cache/media-libs/freetype-2.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=6
 HOMEPAGE=http://www.freetype.org/
 IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.8.1.tar.bz2 mirror://nongnu/freetype/freetype-2.8.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.8.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.8.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.8.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.8.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ada96e4f5a700f3acc979d0b22c34bcc
+_md5_=f8c46b7ec7d52408f1d4ccc0cf03f266
diff --git a/metadata/md5-cache/media-libs/freetype-2.9 b/metadata/md5-cache/media-libs/freetype-2.9
index 87d230f4f444..afbb24ac54b0 100644
--- a/metadata/md5-cache/media-libs/freetype-2.9
+++ b/metadata/md5-cache/media-libs/freetype-2.9
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=6
 HOMEPAGE=http://www.freetype.org/
 IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.9.tar.bz2 mirror://nongnu/freetype/freetype-2.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=abef91e20d93c905367568be0c43acb2
+_md5_=10bcdd6fb2279390c1a25817acd0d666
diff --git a/metadata/md5-cache/media-libs/freetype-9999 b/metadata/md5-cache/media-libs/freetype-9999
index 638098c58d1f..187ca0093415 100644
--- a/metadata/md5-cache/media-libs/freetype-9999
+++ b/metadata/md5-cache/media-libs/freetype-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!bindist? ( bindist )
 SLOT=2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=22d9120c4f4575facaac34f9201435ab
+_md5_=a476d096a340de22da0fea76d544605f
diff --git a/metadata/md5-cache/media-libs/gd-2.2.4 b/metadata/md5-cache/media-libs/gd-2.2.4
index 61e5f95e6d18..0830b7a9fa24 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.4
+++ b/metadata/md5-cache/media-libs/gd-2.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.4/libgd-2.2.4.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=95ea1f156a86daf8136db5d89173b8a2
+_md5_=e49a967d049da113e7ffc1db6cc8da7b
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5 b/metadata/md5-cache/media-libs/gd-2.2.5
index ed704dc9e6c6..28c40359f54d 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5
+++ b/metadata/md5-cache/media-libs/gd-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=457b97ef26004b754b17467c8059ef44
+_md5_=2397e9af88869d5512e168dbf6c449ca
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.26 b/metadata/md5-cache/media-libs/gegl-0.3.26
index 5f9ec6bea677..5cecd9426448 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.26
+++ b/metadata/md5-cache/media-libs/gegl-0.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eab73546bfece475e342de0e5112cc8a
+_md5_=1d9b9554a769df2cdf4a39667e74b6c1
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.12 b/metadata/md5-cache/media-libs/jasper-2.0.12
index d685ed9eed79..17b327a08d97 100644
--- a/metadata/md5-cache/media-libs/jasper-2.0.12
+++ b/metadata/md5-cache/media-libs/jasper-2.0.12
@@ -4,10 +4,10 @@ DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standa
 EAPI=6
 HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
 IUSE=doc jpeg opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=JasPer2.0
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,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/4
 SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.12.tar.gz -> jasper-2.0.12.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c808c044a7c29b3705dc6c4c0a2b674
+_md5_=60a32262d0572fa68504fbc8853a1a18
diff --git a/metadata/md5-cache/media-libs/jasper-9999 b/metadata/md5-cache/media-libs/jasper-9999
index 472b17cc2c85..66c94cc9a614 100644
--- a/metadata/md5-cache/media-libs/jasper-9999
+++ b/metadata/md5-cache/media-libs/jasper-9999
@@ -8,4 +8,4 @@ LICENSE=JasPer2.0
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d53079576714f46a59159f1506d493b
+_md5_=025d694db7109d1535e808623eaa2bf5
diff --git a/metadata/md5-cache/media-libs/jbigkit-2.1 b/metadata/md5-cache/media-libs/jbigkit-2.1
index 1bc5fe7c43e6..74e84c53d1ed 100644
--- a/metadata/md5-cache/media-libs/jbigkit-2.1
+++ b/metadata/md5-cache/media-libs/jbigkit-2.1
@@ -3,9 +3,9 @@ DESCRIPTION=data compression algorithm for bi-level high-resolution images
 EAPI=5
 HOMEPAGE=http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 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=GPL-2
 SLOT=0/2.1
 SRC_URI=http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fb6d7930093daa478e57d8f24176f490
+_md5_=3ac9061cc42af56cd4826c3d45af1261
diff --git a/metadata/md5-cache/media-libs/jpeg-8d-r1 b/metadata/md5-cache/media-libs/jpeg-8d-r1
index 6fd67c6af401..3d537986bac6 100644
--- a/metadata/md5-cache/media-libs/jpeg-8d-r1
+++ b/metadata/md5-cache/media-libs/jpeg-8d-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=5
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v8d.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=256cd7baa4aa02360e6a4a55c645e04b
+_md5_=6f06f2df12472428e2d8911743a0b25b
diff --git a/metadata/md5-cache/media-libs/jpeg-8d-r2 b/metadata/md5-cache/media-libs/jpeg-8d-r2
index 6b71adc6a381..c669a9ecf746 100644
--- a/metadata/md5-cache/media-libs/jpeg-8d-r2
+++ b/metadata/md5-cache/media-libs/jpeg-8d-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=5
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!=media-libs/jpeg-8*:0 !<media-libs/libjpeg-turbo-1.3.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=8
 SRC_URI=http://www.ijg.org/files/jpegsrc.v8d.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=678c9c4680a2165261b3099570aaf760
+_md5_=49e6c327f84b572d0a7ea57940d18027
diff --git a/metadata/md5-cache/media-libs/jpeg-9a b/metadata/md5-cache/media-libs/jpeg-9a
index 1e8e7508f97d..32a9435deed2 100644
--- a/metadata/md5-cache/media-libs/jpeg-9a
+++ b/metadata/md5-cache/media-libs/jpeg-9a
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=5
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9a.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1c35d8f2bb825b7564c47d6bf51832c9
+_md5_=4ceab3128cc8fd7b8036fc86e261ed50
diff --git a/metadata/md5-cache/media-libs/jpeg-9b b/metadata/md5-cache/media-libs/jpeg-9b
index 992a2b523e4e..03d859fc2421 100644
--- a/metadata/md5-cache/media-libs/jpeg-9b
+++ b/metadata/md5-cache/media-libs/jpeg-9b
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=5
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9b.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1c35d8f2bb825b7564c47d6bf51832c9
+_md5_=4ceab3128cc8fd7b8036fc86e261ed50
diff --git a/metadata/md5-cache/media-libs/lcms-2.8-r1 b/metadata/md5-cache/media-libs/lcms-2.8-r1
index a1a50c502f70..7501b6469d31 100644
--- a/metadata/md5-cache/media-libs/lcms-2.8-r1
+++ b/metadata/md5-cache/media-libs/lcms-2.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=6
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs +threads test tiff zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3db82822d8683c51a7c72b484b09e793
+_md5_=74bf4135225060c6b0d3eb926ef75388
diff --git a/metadata/md5-cache/media-libs/lcms-2.8-r2 b/metadata/md5-cache/media-libs/lcms-2.8-r2
index 04e0a34c7b5d..86e8ce0c3b77 100644
--- a/metadata/md5-cache/media-libs/lcms-2.8-r2
+++ b/metadata/md5-cache/media-libs/lcms-2.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=6
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs test +threads tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.8.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c64d6aa3883440c11c94bea868a4c3c7
+_md5_=a523de5b64b0ff18948491990238a109
diff --git a/metadata/md5-cache/media-libs/lcms-2.9 b/metadata/md5-cache/media-libs/lcms-2.9
index 2340adf5714a..32507f332542 100644
--- a/metadata/md5-cache/media-libs/lcms-2.9
+++ b/metadata/md5-cache/media-libs/lcms-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=6
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs test +threads tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.9.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=929c91a760673fd6eb9f956777e5c4e1
+_md5_=224e27625e68f34e651c20412e3882bd
diff --git a/metadata/md5-cache/media-libs/libffado-2.3.0 b/metadata/md5-cache/media-libs/libffado-2.3.0
deleted file mode 100644
index 8b226b95eb6c..000000000000
--- a/metadata/md5-cache/media-libs/libffado-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/libxmlpp:2.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(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2 sys-apps/dbus sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python2_7? ( >=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(+)] qt4? ( dev-python/PyQt4[dbus,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils ) virtual/pkgconfig dev-util/scons virtual/pkgconfig
-DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
-EAPI=6
-HOMEPAGE=http://www.ffado.org
-IUSE=debug qt4 test-programs python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=dev-cpp/libxmlpp:2.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(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2 sys-apps/dbus sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python2_7? ( >=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(+)] qt4? ( dev-python/PyQt4[dbus,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.ffado.org/files/libffado-2.3.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=c1946b732b7b8c7a194950e17fd661db
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.16 b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
new file mode 100644
index 000000000000..6acd356d8b0f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
+DESCRIPTION=Library that implements support for numerous digital cameras
+EAPI=6
+HOMEPAGE=http://www.gphoto.org/
+IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
+SLOT=0/6
+SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.16.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=52e9ba8c85c9dbe605a131a346a76d04
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r2 b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
new file mode 100644
index 000000000000..540ff762adae
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=C/C++ library for PDF generation
+EAPI=6
+HOMEPAGE=http://www.libharu.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/2.3.0
+SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1e3bf3e1407b1c373b3f11fd4a5664c
diff --git a/metadata/md5-cache/media-libs/libpng-1.2.57 b/metadata/md5-cache/media-libs/libpng-1.2.57
index 1e49782644b4..625c1283f346 100644
--- a/metadata/md5-cache/media-libs/libpng-1.2.57
+++ b/metadata/md5-cache/media-libs/libpng-1.2.57
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=media-libs/libpng-1.2*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/libpng/libpng-1.2.57.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a5c364f7fc887457013f9a81abed324d
+_md5_=eff1db4615faf6e2d980fa75e5faf758
diff --git a/metadata/md5-cache/media-libs/libpng-1.5.28 b/metadata/md5-cache/media-libs/libpng-1.5.28
index a317f036d312..e687b1e23a55 100644
--- a/metadata/md5-cache/media-libs/libpng-1.5.28
+++ b/metadata/md5-cache/media-libs/libpng-1.5.28
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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=libpng
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=media-libs/libpng-1.5*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.5
 SRC_URI=mirror://sourceforge/libpng/libpng-1.5.28.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.5.28-apng.patch.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=595f3fefc7e878cab146501e0f7d5488
+_md5_=2ec9bcb3227ce3e3bdd7afceb21473a6
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.27 b/metadata/md5-cache/media-libs/libpng-1.6.27
index a42f85ba7824..fca952cd412e 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.27
+++ b/metadata/md5-cache/media-libs/libpng-1.6.27
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.27.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.27-apng.patch.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d5cd502499bb35ed9992efbd92fa1da2
+_md5_=81dbc400e3e0b2e29510f20f773c1e15
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.29 b/metadata/md5-cache/media-libs/libpng-1.6.29
index 557c52b424d0..ef61c15351c1 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.29
+++ b/metadata/md5-cache/media-libs/libpng-1.6.29
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.29.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.29-apng.patch.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e78280acfc07d4e0eeb50df0444dc4f
+_md5_=88e43920ac20b1dffc6a239da9e778e9
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.31 b/metadata/md5-cache/media-libs/libpng-1.6.31
index f15668943927..6b1386f2dd34 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.31
+++ b/metadata/md5-cache/media-libs/libpng-1.6.31
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.31.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.31-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9d0a7539ce2e00ba0928c75458e027de
+_md5_=29ecbce875e4af304f2e79d4ea3e646c
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.32 b/metadata/md5-cache/media-libs/libpng-1.6.32
index 5e63dabf4341..b051709ef137 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.32
+++ b/metadata/md5-cache/media-libs/libpng-1.6.32
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.32.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.32-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9d0a7539ce2e00ba0928c75458e027de
+_md5_=29ecbce875e4af304f2e79d4ea3e646c
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.34 b/metadata/md5-cache/media-libs/libpng-1.6.34
index 9875086e9d5d..0126404c225b 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.34
+++ b/metadata/md5-cache/media-libs/libpng-1.6.34
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.34.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.34-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9d0a7539ce2e00ba0928c75458e027de
+_md5_=29ecbce875e4af304f2e79d4ea3e646c
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.5 b/metadata/md5-cache/media-libs/libraw-0.18.5
deleted file mode 100644
index e162b65794d4..000000000000
--- a/metadata/md5-cache/media-libs/libraw-0.18.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
-DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
-EAPI=6
-HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/16
-SRC_URI=https://www.libraw.org/data/LibRaw-0.18.5.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz )
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=72ce840a5f27f1b75ba850b5dd02700d
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.7 b/metadata/md5-cache/media-libs/libraw-0.18.7
new file mode 100644
index 000000000000..3527a89e62e9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libraw-0.18.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
+DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
+EAPI=6
+HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
+IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/16
+SRC_URI=https://www.libraw.org/data/LibRaw-0.18.7.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz )
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=fb34e93a67687e86afc685970ef85309
diff --git a/metadata/md5-cache/media-libs/mesa-18.0.0_rc2 b/metadata/md5-cache/media-libs/mesa-18.0.0_rc2
new file mode 100644
index 000000000000..5071b7c154ad
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.0.0_rc2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.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:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=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
+LICENSE=MIT
+RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.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:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.0.0-rc2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2508d4dca65188781f1289e49412ce26
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r5 b/metadata/md5-cache/media-libs/mlt-6.4.1-r5
deleted file mode 100644
index a61e7f57fa5c..000000000000
--- a/metadata/md5-cache/media-libs/mlt-6.4.1-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
-DESCRIPTION=Open source multimedia framework for television broadcasting
-EAPI=6
-HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9bab855c0d9239691ec18972d8e132b1
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r6 b/metadata/md5-cache/media-libs/mlt-6.4.1-r6
new file mode 100644
index 000000000000..ad5ddf523982
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mlt-6.4.1-r6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+DESCRIPTION=Open source multimedia framework for television broadcasting
+EAPI=6
+HOMEPAGE=https://www.mltframework.org/
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8ff7593dbbc07b7945f1902da0de9552
diff --git a/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0 b/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
new file mode 100644
index 000000000000..a0a792972a08
--- /dev/null
+++ b/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
+EAPI=6
+HOMEPAGE=https://github.com/munt/munt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/munt/munt/archive/munt_2_3_0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4cbeabee13e328fc7d3dd27b8c25fb0a
diff --git a/metadata/md5-cache/media-libs/openal-1.18.2-r1 b/metadata/md5-cache/media-libs/openal-1.18.2-r1
index 03a142b8ad78..880f9eeb51a2 100644
--- a/metadata/md5-cache/media-libs/openal-1.18.2-r1
+++ b/metadata/md5-cache/media-libs/openal-1.18.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=6
 HOMEPAGE=http://kcat.strangesoft.net/openal.html
 IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4046beb41dd9858a8f20e944189e97b9
+_md5_=73adca03e0e23666f8d868fa2493dc5c
diff --git a/metadata/md5-cache/media-libs/openh264-1.7.0-r1 b/metadata/md5-cache/media-libs/openh264-1.7.0-r1
index 6214eb7eb0b0..87800bfa536a 100644
--- a/metadata/md5-cache/media-libs/openh264-1.7.0-r1
+++ b/metadata/md5-cache/media-libs/openh264-1.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=!<www-client/firefox-39
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/cisco/openh264/archive/v1.7.0.tar.gz -> openh264-1.7.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox39.tar.gz -> gmp-api-Firefox39.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=6a3990a4fce2bf9cf75f8f3ca1fceb18
diff --git a/metadata/md5-cache/media-libs/openimageio-1.3.5 b/metadata/md5-cache/media-libs/openimageio-1.3.5
deleted file mode 100644
index d3001ad0cce5..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-1.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/glew:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sci-libs/hdf5 sys-libs/zlib:= virtual/jpeg:0 gif? ( media-libs/giflib ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) colorio? ( >=media-libs/opencolorio-1.0.7:= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) ssl? ( dev-libs/openssl:0 ) tbb? ( dev-cpp/tbb ) truetype? ( media-libs/freetype:2= ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A library for reading and writing images
-EAPI=5
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype python_targets_python2_7
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/glew:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sci-libs/hdf5 sys-libs/zlib:= virtual/jpeg:0 gif? ( media-libs/giflib ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) colorio? ( >=media-libs/opencolorio-1.0.7:= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) ssl? ( dev-libs/openssl:0 ) tbb? ( dev-cpp/tbb ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.3.5.tar.gz -> openimageio-1.3.5.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6291a11d82175c8b2e78092df45652c
diff --git a/metadata/md5-cache/media-libs/openimageio-1.6.13 b/metadata/md5-cache/media-libs/openimageio-1.6.13
index e2c83c0c44f6..914c9f47c9d5 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.6.13
+++ b/metadata/md5-cache/media-libs/openimageio-1.6.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( >=media-libs/opencolorio-1.0.7:= ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,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(+)?] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0 ) truetype? ( media-libs/freetype:2= ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( >=media-libs/opencolorio-1.0.7:= ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,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(+)?] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0 ) truetype? ( media-libs/freetype:2= ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A library for reading and writing images
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype python_targets_python2_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 ~ppc64 x86
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( >=media-libs/opencolorio-1.0.7:= ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,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(+)?] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0 ) truetype? ( media-libs/freetype:2= )
+RDEPEND=dev-libs/boost:= dev-libs/pugixml:= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( >=media-libs/opencolorio-1.0.7:= ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( >=media-libs/opencv-2.3:= python? ( >=media-libs/opencv-2.4.8[python,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(+)?] ) ) opengl? ( virtual/glu virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0 ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.6.13.tar.gz -> openimageio-1.6.13.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=679b0234d73b8d38884a3d817965383d
+_md5_=ac495e4375fa757e4429dfd125cf0908
diff --git a/metadata/md5-cache/media-libs/openimageio-1.6.18 b/metadata/md5-cache/media-libs/openimageio-1.6.18
index 8345d6662536..96720c169a4a 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.6.18
+++ b/metadata/md5-cache/media-libs/openimageio-1.6.18
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/pugixml:0= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:= colorio? ( media-libs/opencolorio:0= ) ffmpeg? ( media-video/ffmpeg:0= ) field3d? ( media-libs/Field3D ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:0= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype:2= ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-libs/boost:= dev-libs/pugixml:0= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:0= ) ffmpeg? ( media-video/ffmpeg:0= ) field3d? ( media-libs/Field3D ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:0= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype:2= ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A library for reading and writing images
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_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
+IUSE=colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_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
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/pugixml:0= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:= colorio? ( media-libs/opencolorio:0= ) ffmpeg? ( media-video/ffmpeg:0= ) field3d? ( media-libs/Field3D ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:0= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype:2= )
+RDEPEND=dev-libs/boost:= dev-libs/pugixml:0= media-libs/ilmbase:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/openexr:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:0= ) ffmpeg? ( media-video/ffmpeg:0= ) field3d? ( media-libs/Field3D ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:0= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype: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 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.6.18.tar.gz -> openimageio-1.6.18.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c069f4b2238b3c7cdace1ce3319d4bf5
+_md5_=ba16bc2cfe091b0189f53c6d1816b412
diff --git a/metadata/md5-cache/media-libs/openimageio-1.7.17 b/metadata/md5-cache/media-libs/openimageio-1.7.17
index 26543f60d1e6..712f3239665e 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.7.17
+++ b/metadata/md5-cache/media-libs/openimageio-1.7.17
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:= colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A library for reading and writing images
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:= colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= ) raw? ( media-libs/libraw:= ) ssl? ( dev-libs/openssl:0= ) truetype? ( media-libs/freetype:2= )
+RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype: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 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.7.17.tar.gz -> openimageio-1.7.17.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b88d1e7c1efcb1900fa9bb0773668b9d
+_md5_=ba85650530be52e9b4802c2914ddca1c
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.7 b/metadata/md5-cache/media-libs/openimageio-1.8.7
new file mode 100644
index 000000000000..08981252d87a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A library for reading and writing images
+EAPI=6
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+IUSE=colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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(+)?] dev-libs/boost:=[python,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(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype: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 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.7.tar.gz -> openimageio-1.8.7.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb81abc3cd288636d77bd2423e6493a9
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2 b/metadata/md5-cache/media-libs/openjpeg-1.5.2
index 452dd03d85ba..39c5e5a0f25a 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=5
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e64400edbf16e8166f539cf3ce27da59
+_md5_=bb4fed673ee5267fe0472295b3ef5691
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1 b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
index 4d6589cf1aaa..bda2ae820e2e 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=5
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78ed3cfb52884ea9f10ed62aeaece0cb
+_md5_=e1228cf3ea6416f6b552f34dbd4e4e75
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.1.1_p20160922 b/metadata/md5-cache/media-libs/openjpeg-2.1.1_p20160922
index 9bf26cbc181f..04d00a38e23a 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.1.1_p20160922
+++ b/metadata/md5-cache/media-libs/openjpeg-2.1.1_p20160922
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/fac916f72a162483a4d6d804fd070fdf32f402ed.tar.gz -> openjpeg-2.1.1_p20160922.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/cc09dc4e43850b725a2aaf6e1d58cbf45bc2322c.tar.gz -> openjpeg-data_20160921.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dd4b2cd805f6ad76bafe8e7056ec59c
+_md5_=62b6a276cf26324fcb8b29a0ec722732
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.1.2 b/metadata/md5-cache/media-libs/openjpeg-2.1.2
index 0ecd014efbce..4170994fc250 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.1.2
+++ b/metadata/md5-cache/media-libs/openjpeg-2.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.1.2.tar.gz -> openjpeg-2.1.2.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/cc09dc4e43850b725a2aaf6e1d58cbf45bc2322c.tar.gz -> openjpeg-data_20160921.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a62ffd26275ea1d46f85ae08b6cee45
+_md5_=1be6d01bd40bd0c966140c002d4f26f9
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.2.0 b/metadata/md5-cache/media-libs/openjpeg-2.2.0
index cd0d0e65a4ce..b78d73ff5f77 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.2.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.2.0.tar.gz -> openjpeg-2.2.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/40f427cb5e8d6b186fa497618532656331d09d0c.tar.gz -> openjpeg-data_20170809.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=02c1b53b0cafd4a3dd0334837ccdc470
+_md5_=7dc89764c290ac9baf902bc3382853dc
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index 91506cf1f3ed..b66996ad5db3 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de53b42b3060a1f0095c710d2be9f66c
+_md5_=081f3df5f144eb2fe95a14141683aaed
diff --git a/metadata/md5-cache/media-libs/tiff-3.9.7-r1 b/metadata/md5-cache/media-libs/tiff-3.9.7-r1
index b9eb09e26497..0af15e6105d0 100644
--- a/metadata/md5-cache/media-libs/tiff-3.9.7-r1
+++ b/metadata/md5-cache/media-libs/tiff-3.9.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for manipulation of TIFF (Tag Image File Format) images
 EAPI=5
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/tiff-compat !=media-libs/tiff-3*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e722482273a0dc2dac0edcd6a5ca4ee2
+_md5_=01038813ca72654a2526fcc557fd13d0
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.8 b/metadata/md5-cache/media-libs/tiff-4.0.8
index 52a257f96f95..88446d23047d 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.8
+++ b/metadata/md5-cache/media-libs/tiff-4.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=6
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1f6cb87e473a6f3d4502ec44735ebdbf
+_md5_=793d9ba6269c28daa30a7b6179a0c7a3
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.9 b/metadata/md5-cache/media-libs/tiff-4.0.9
index fa7247f84b97..34ef14e96293 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.9
+++ b/metadata/md5-cache/media-libs/tiff-4.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=6
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.9.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=23c5ead7744d628fc3d9a3b0b6c26455
+_md5_=1c94012272523e3a2694c06d0132df72
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index d3679796dc8f..7e15c3585d9c 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/gst-plugins-assrender-1.12.3 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.3
index 6476b39aa924..4de61e6ea307 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68b55dcf2c1cd70213acb0b416fd40a8
+_md5_=19de24a32d36813e62fa35a938a33a21
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 34c2ad561104..b0c2d088d54d 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tucnak2-2.48 b/metadata/md5-cache/media-radio/tucnak2-2.48
deleted file mode 100644
index fe7f04a0ce89..000000000000
--- a/metadata/md5-cache/media-radio/tucnak2-2.48
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi:0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=4
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw ftdi gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi:0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak2-2.48.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd462c86e12e4793c5c312b971341119
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.14 b/metadata/md5-cache/media-radio/xlog-2.0.14
deleted file mode 100644
index a83168156b77..000000000000
--- a/metadata/md5-cache/media-radio/xlog-2.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An amateur radio logging program
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/xlog
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.14.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d12228a44a1719d6ab0802cc845233d7
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.14-r1 b/metadata/md5-cache/media-radio/xlog-2.0.14-r1
deleted file mode 100644
index 57aced7c58c6..000000000000
--- a/metadata/md5-cache/media-radio/xlog-2.0.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libpng:0 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An amateur radio logging program
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/xlog
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.14.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e14731431200c6e2179a658461dc0437
diff --git a/metadata/md5-cache/media-radio/xwxapt-3.3 b/metadata/md5-cache/media-radio/xwxapt-3.3
new file mode 100644
index 000000000000..f6bf1d10c1e3
--- /dev/null
+++ b/metadata/md5-cache/media-radio/xwxapt-3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=net-wireless/rtl-sdr media-libs/alsa-lib dev-libs/glib:2 x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GTK+ linux weather satellite APT image decoder software
+EAPI=6
+HOMEPAGE=http://www.qsl.net/5b4az/pages/apt.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/rtl-sdr media-libs/alsa-lib dev-libs/glib:2 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=http://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.3.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1a395e503f9974c4cab4710656d0a408
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 140daf5a30e7..88badf3d6090 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/kid3-3.5.0 b/metadata/md5-cache/media-sound/kid3-3.5.0
deleted file mode 100644
index 1f0c9311a858..000000000000
--- a/metadata/md5-cache/media-sound/kid3-3.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple tag editor based on Qt
-EAPI=6
-HOMEPAGE=https://kid3.sourceforge.io/
-IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3: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
-REQUIRED_USE=flac? ( vorbis )
-SLOT=5
-SRC_URI=mirror://sourceforge/kid3/kid3-3.5.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14fa4a648645abcdaebb98090a3c7377
diff --git a/metadata/md5-cache/media-sound/kid3-3.5.1 b/metadata/md5-cache/media-sound/kid3-3.5.1
index 60a34524993d..140c0bbfc2a3 100644
--- a/metadata/md5-cache/media-sound/kid3-3.5.1
+++ b/metadata/md5-cache/media-sound/kid3-3.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple tag editor based on Qt
 EAPI=6
 HOMEPAGE=https://kid3.sourceforge.io/
 IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3: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
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.5.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01c1192c835300a5fbb1fd3993967f09
+_md5_=4dba590d4bd854fe59cf1d1ff1b7d2c9
diff --git a/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0 b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
new file mode 100644
index 000000000000..00f98912f796
--- /dev/null
+++ b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=media-libs/alsa-lib media-libs/munt-mt32emu X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
+DESCRIPTION=ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
+EAPI=6
+HOMEPAGE=https://github.com/munt/munt
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=media-libs/alsa-lib media-libs/munt-mt32emu X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
+SLOT=0
+SRC_URI=https://github.com/munt/munt/archive/munt_2_3_0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=fa1e6d19714b9f84ef84e6e6bb55942e
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.90 b/metadata/md5-cache/media-sound/pragha-1.3.90
index f9c404473727..b89bc7d23730 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.90
+++ b/metadata/md5-cache/media-sound/pragha-1.3.90
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.36:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.8:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.36:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.8:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig xfce-base/exo >=sys-apps/sed-4
 DESCRIPTION=A lightweight music player (for Xfce)
 EAPI=6
 HOMEPAGE=https://github.com/pragha-music-player/pragha
@@ -11,4 +11,4 @@ REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) libnotify? ( peas ) mtp? ( udev ) ry
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/V1.3.90/pragha-1.3.90.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0860c8dab940fb937147b9ad0e485937
+_md5_=a8db9a3b2822d95f1121307322a1e025
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.1.7 b/metadata/md5-cache/media-sound/pulseeffects-3.1.7
new file mode 100644
index 000000000000..9667f9d7dae6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/pycairo[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/gst-python-1.12.0:1.0[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(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[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(-)] >=sci-libs/scipy-0.18[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(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/pycairo[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/gst-python-1.12.0:1.0[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(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[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(-)] >=sci-libs/scipy-0.18[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(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-sound/pulseaudio[equalizer]
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.1.7.tar.gz -> pulseeffects-3.1.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62d7cb968918f0a573893fd207ea3102
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.70 b/metadata/md5-cache/media-sound/spotify-1.0.70
new file mode 100644
index 000000000000..f2196f531c11
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.0.70
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Spotify is a social music platform
+EAPI=6
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=gnome pax_kernel pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=Spotify
+RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python pulseaudio? ( media-sound/pulseaudio ) gnome? ( gnome-extra/gnome-integration-spotify )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.70.399.g5ffabd56-27_i386.deb )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8908f5d8ee53f095f1984433b8682799
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.70-r1 b/metadata/md5-cache/media-sound/spotify-1.0.70-r1
new file mode 100644
index 000000000000..7c811f1bf4a6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.0.70-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Spotify is a social music platform
+EAPI=6
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=systray pax_kernel pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=Spotify
+RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python pulseaudio? ( media-sound/pulseaudio ) systray? ( gnome-extra/gnome-integration-spotify )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.70.399.g5ffabd56-27_i386.deb )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b32529634064216a2ef53126f1c5bb91
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f0e8fa5b9b18..d5087faaa077 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/ffdiaporama-2.1 b/metadata/md5-cache/media-video/ffdiaporama-2.1
deleted file mode 100644
index b88d0486a5ab..000000000000
--- a/metadata/md5-cache/media-video/ffdiaporama-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) libav? ( >=media-video/libav-9:0=[encode] ) >=sys-apps/sed-4
-DESCRIPTION=Movie creator from photos and video clips
-EAPI=5
-HOMEPAGE=http://ffdiaporama.tuxfamily.org
-IUSE=libav openclipart texturemate
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 openclipart? ( CC0-1.0 ) texturemate? ( CC-BY-3.0 )
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) libav? ( >=media-video/libav-9:0=[encode] )
-SLOT=0
-SRC_URI=http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_bin_2.1.2014.0209.tar.gz -> ffdiaporama_bin_2.1.2014.0209.tar.gz http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_rsc_2.1.2014.0209.tar.gz -> ffdiaporama_rsc_2.1.2014.0209.tar.gz openclipart? ( http://openclipart.org/downloads/0.18/openclipart-0.18-svgonly.tar.bz2 ) texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_texturemate_1.0.2014.0125.tar.gz -> ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f018fc088d1b42b12cf30cfa2dd24f4
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.1-r1 b/metadata/md5-cache/media-video/ffdiaporama-2.1-r1
deleted file mode 100644
index 2695ae6c43b2..000000000000
--- a/metadata/md5-cache/media-video/ffdiaporama-2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) libav? ( >=media-video/libav-9:0=[encode] ) >=sys-apps/sed-4
-DESCRIPTION=Movie creator from photos and video clips
-EAPI=5
-HOMEPAGE=http://ffdiaporama.tuxfamily.org
-IUSE=libav openclipart texturemate
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 openclipart? ( CC0-1.0 ) texturemate? ( CC-BY-3.0 )
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) libav? ( >=media-video/libav-9:0=[encode] )
-SLOT=0
-SRC_URI=http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_bin_2.1.2014.0209.tar.gz -> ffdiaporama_bin_2.1.2014.0209.tar.gz http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_rsc_2.1.2014.0209.tar.gz -> ffdiaporama_rsc_2.1.2014.0209.tar.gz https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.1-libav10.patch openclipart? ( http://openclipart.org/downloads/0.18/openclipart-0.18-svgonly.tar.bz2 ) texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_texturemate_1.0.2014.0125.tar.gz -> ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3b7ff20d99924b44a29d74e044aa1cd
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701 b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701
deleted file mode 100644
index 9897a1ef2c3b..000000000000
--- a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtmultimedia:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 ) libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] ) >=sys-apps/sed-4
-DESCRIPTION=Movie creator from photos and video clips
-EAPI=6
-HOMEPAGE=http://ffdiaporama.tuxfamily.org
-IUSE=libav openclipart qt5 texturemate
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 texturemate? ( CC-BY-3.0 )
-RDEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtmultimedia:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 ) libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )
-SLOT=0
-SRC_URI=http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_bin_2.2.devel.2014.0701.tar.gz http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch texturemate? ( http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4d203ba1b6299db874bb13f50220b82
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1 b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
index d6d744a968fd..ea82bd288565 100644
--- a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
+++ b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Movie creator from photos and video clips
 EAPI=6
 HOMEPAGE=http://ffdiaporama.tuxfamily.org
 IUSE=libav openclipart texturemate
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 texturemate? ( CC-BY-3.0 )
 RDEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_bin_2.2.devel.2014.0701.tar.gz http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch texturemate? ( http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=560ae746cefd818ac9458bcbb32e2a1d
+_md5_=eda368caf16cae389681180ddbd3f889
diff --git a/metadata/md5-cache/media-video/gxine-0.5.907-r1 b/metadata/md5-cache/media-video/gxine-0.5.907-r1
index 4e9a62ac0582..535123873e03 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.907-r1
+++ b/metadata/md5-cache/media-video/gxine-0.5.907-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.907.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3fcdca3e4c5d61f1d05ab2ccb816fd88
diff --git a/metadata/md5-cache/media-video/gxine-0.5.908-r1 b/metadata/md5-cache/media-video/gxine-0.5.908-r1
index 649ec1a7d954..e61307c57a55 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.908-r1
+++ b/metadata/md5-cache/media-video/gxine-0.5.908-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( virtual/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.908.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45761f55d518e9efa99123ebcfa9ba56
diff --git a/metadata/md5-cache/media-video/gxine-0.5.909 b/metadata/md5-cache/media-video/gxine-0.5.909
index f11ac89ad248..0db4eb5c7e8e 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.909
+++ b/metadata/md5-cache/media-video/gxine-0.5.909
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( virtual/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.909.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=17b5ac616b25588ce924548498dfc916
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.13 b/metadata/md5-cache/media-video/kaffeine-2.0.13
deleted file mode 100644
index 465852f7bc5f..000000000000
--- a/metadata/md5-cache/media-video/kaffeine-2.0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-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/solid-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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Media player with digital TV support by KDE
-EAPI=6
-HOMEPAGE=https://kaffeine.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.3 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-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/solid-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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 || ( >=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/kaffeine/kaffeine-2.0.13.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20a869bfd7c8eb6e7dd50ffc448c18c1
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.14 b/metadata/md5-cache/media-video/kaffeine-2.0.14
index 35609cc729c1..daf029118a09 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.14
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=Media player with digital TV support by KDE
 EAPI=6
 HOMEPAGE=https://kaffeine.kde.org/
 IUSE=dvb debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-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/solid-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/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) !media-video/kaffeine: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
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.14.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18d2c7e5bb82934ae767ec9c4e553139
+_md5_=b69f0adb5ef993fcf5295e266eead6ed
diff --git a/metadata/md5-cache/media-video/libav-11.3 b/metadata/md5-cache/media-video/libav-11.3
deleted file mode 100644
index e0d534d1f660..000000000000
--- a/metadata/md5-cache/media-video/libav-11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
-SLOT=0/11
-SRC_URI=https://libav.org/releases/libav-11.3.tar.xz https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de953d9ee0efc4fff9253d93cd51c9a3
diff --git a/metadata/md5-cache/media-video/libav-11.3-r1 b/metadata/md5-cache/media-video/libav-11.3-r1
deleted file mode 100644
index 94c70552e155..000000000000
--- a/metadata/md5-cache/media-video/libav-11.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
-SLOT=0/11
-SRC_URI=https://libav.org/releases/libav-11.3.tar.xz https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=85547a8159c564dd1372954ba7e5a1a7
diff --git a/metadata/md5-cache/media-video/libav-11.4 b/metadata/md5-cache/media-video/libav-11.4
deleted file mode 100644
index b90c7c64aa01..000000000000
--- a/metadata/md5-cache/media-video/libav-11.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
-SLOT=0/11
-SRC_URI=https://libav.org/releases/libav-11.4.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b72416d8ec5447c452cc88f80f70862d
diff --git a/metadata/md5-cache/media-video/libav-11.6 b/metadata/md5-cache/media-video/libav-11.6
deleted file mode 100644
index a374d5c2b643..000000000000
--- a/metadata/md5-cache/media-video/libav-11.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
-SLOT=0/11
-SRC_URI=https://libav.org/releases/libav-11.6.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b72416d8ec5447c452cc88f80f70862d
diff --git a/metadata/md5-cache/media-video/libav-11.7 b/metadata/md5-cache/media-video/libav-11.7
deleted file mode 100644
index c00e20a87ef9..000000000000
--- a/metadata/md5-cache/media-video/libav-11.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
-SLOT=0/11
-SRC_URI=https://libav.org/releases/libav-11.7.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b72416d8ec5447c452cc88f80f70862d
diff --git a/metadata/md5-cache/media-video/libav-12 b/metadata/md5-cache/media-video/libav-12
deleted file mode 100644
index cc506bf20d08..000000000000
--- a/metadata/md5-cache/media-video/libav-12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nvidia? ( media-video/nvidia-video-codec ) fdk? ( >=media-libs/fdk-aac-0.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nvidia? ( media-video/nvidia-video-codec ) fdk? ( >=media-libs/fdk-aac-0.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )
-SLOT=0/12
-SRC_URI=https://libav.org/releases/libav-12.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz ) https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e906ed4ff51caf117f82ebc923a8831
diff --git a/metadata/md5-cache/media-video/libav-12.1 b/metadata/md5-cache/media-video/libav-12.1
deleted file mode 100644
index 02afbf648705..000000000000
--- a/metadata/md5-cache/media-video/libav-12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nvidia? ( media-video/nvidia-video-codec ) fdk? ( >=media-libs/fdk-aac-0.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
-HOMEPAGE=https://libav.org/
-IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nvidia? ( media-video/nvidia-video-codec ) fdk? ( >=media-libs/fdk-aac-0.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
-RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )
-SLOT=0/12
-SRC_URI=https://libav.org/releases/libav-12.1.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz ) https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b8b4b6147037f0438bbfbebeeb5886a
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.10 b/metadata/md5-cache/media-video/makemkv-1.10.10
new file mode 100644
index 000000000000..5beb98eb218a
--- /dev/null
+++ b/metadata/md5-cache/media-video/makemkv-1.10.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst setup
+DEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) >=sys-apps/sed-4
+DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
+EAPI=6
+HOMEPAGE=http://www.makemkv.com/
+IUSE=+gui libav multilib
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
+RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
+SLOT=0
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.10.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.10.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5acf31987a75f9a539193724817d3138
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.9 b/metadata/md5-cache/media-video/makemkv-1.10.9
deleted file mode 100644
index 6f06b29c51b2..000000000000
--- a/metadata/md5-cache/media-video/makemkv-1.10.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) >=sys-apps/sed-4
-DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
-EAPI=6
-HOMEPAGE=http://www.makemkv.com/
-IUSE=+gui libav multilib
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
-RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
-SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.9.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cec5ba4b1c60001976878baea53d8915
diff --git a/metadata/md5-cache/media-video/mkclean-0.8.9 b/metadata/md5-cache/media-video/mkclean-0.8.9
deleted file mode 100644
index 8faf3ba7a8c3..000000000000
--- a/metadata/md5-cache/media-video/mkclean-0.8.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=mkclean is a command line tool to clean and optimize Matroska files
-EAPI=4
-HOMEPAGE=http://www.matroska.org/downloads/mkclean.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.9.tar.bz2
-_md5_=02b4dcb05826c5a96be3ac18cb64018d
diff --git a/metadata/md5-cache/media-video/mkvalidator-0.5.1 b/metadata/md5-cache/media-video/mkvalidator-0.5.1
deleted file mode 100644
index 3e6bef508ea8..000000000000
--- a/metadata/md5-cache/media-video/mkvalidator-0.5.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=mkvalidator is a command line tool to verify Matroska files for spec conformance
-EAPI=5
-HOMEPAGE=http://www.matroska.org/downloads/mkvalidator.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.5.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7f645ca85d72fc0de403154e9df21e65
diff --git a/metadata/md5-cache/media-video/mplayer-1.2.1-r1 b/metadata/md5-cache/media-video/mplayer-1.2.1-r1
deleted file mode 100644
index 464415be8a70..000000000000
--- a/metadata/md5-cache/media-video/mplayer-1.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-2.6:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) virtual/pkgconfig dga? ( x11-proto/xf86dgaproto ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm )
-DESCRIPTION=Media Player for Linux
-EAPI=5
-HOMEPAGE=http://www.mplayerhq.hu/
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-2.6:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
-REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
-RESTRICT=faac? ( bindist )
-SLOT=0
-SRC_URI=mirror://mplayer/releases/MPlayer-1.2.1.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97a5d8c6ec3daf6ef7183351b9ab323a
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r2 b/metadata/md5-cache/media-video/mplayer-1.3.0-r2
deleted file mode 100644
index 3469d2f931ab..000000000000
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) virtual/pkgconfig dga? ( x11-proto/xf86dgaproto ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm )
-DESCRIPTION=Media Player for Linux
-EAPI=5
-HOMEPAGE=http://www.mplayerhq.hu/
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
-REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
-RESTRICT=faac? ( bindist )
-SLOT=0
-SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ce325ce99964938a42c2f5d3134fc4e5
diff --git a/metadata/md5-cache/media-video/smplayer-18.2.0 b/metadata/md5-cache/media-video/smplayer-18.2.0
new file mode 100644
index 000000000000..0478d657b3a8
--- /dev/null
+++ b/metadata/md5-cache/media-video/smplayer-18.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
+EAPI=6
+HOMEPAGE=http://www.smplayer.eu/
+IUSE=autoshutdown bidi debug mpris
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2+ BSD-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smplayer-18.2.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=36d6168dc8224e99986135b47defff82
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 32879eaed487..3ad49794dad8 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.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.2
new file mode 100644
index 000000000000..2cc4eb1f80db
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=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(+)?] virtual/pkgconfig
+DESCRIPTION=scans log files and bans IPs that show malicious signs
+EAPI=6
+HOMEPAGE=http://www.fail2ban.org/
+IUSE=selinux systemd 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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+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.2 -> fail2ban-0.10.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=787a375c17d27fd8288a44a80cff1b6e
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.9.7 b/metadata/md5-cache/net-analyzer/fail2ban-0.9.7
deleted file mode 100644
index 84c56ae80ae9..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] virtual/pkgconfig
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=6
-HOMEPAGE=http://www.fail2ban.org/
-IUSE=selinux systemd python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_pypy python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-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(+)?] 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_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(+)?] 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_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(+)?] 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_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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-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_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 )
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.9.7 -> fail2ban-0.9.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=606e7003e9ee44f2ddd7df1e1352d123
diff --git a/metadata/md5-cache/net-analyzer/flent-1.0.1 b/metadata/md5-cache/net-analyzer/flent-1.0.1
deleted file mode 100644
index 2869850e19d3..000000000000
--- a/metadata/md5-cache/net-analyzer/flent-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=The FLExible Network Tester
-EAPI=6
-HOMEPAGE=https://flent.org/
-IUSE=+qt5 qt4 +plots python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) plots? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) net-analyzer/netperf[demo] net-misc/iperf net-analyzer/fping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/tohojo/flent/archive/v1.0.1.tar.gz -> flent-1.0.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1de4d2a4ae147c22973e987225fde691
diff --git a/metadata/md5-cache/net-analyzer/flent-1.0.1-r1 b/metadata/md5-cache/net-analyzer/flent-1.0.1-r1
new file mode 100644
index 000000000000..039f8d968e9f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/flent-1.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=The FLExible Network Tester
+EAPI=6
+HOMEPAGE=https://flent.org/
+IUSE=+qt5 +plots python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) plots? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) net-analyzer/netperf[demo] net-misc/iperf net-analyzer/fping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/tohojo/flent/archive/v1.0.1.tar.gz -> flent-1.0.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf70e2bc0e544068f0f1cbbd28e4bf1f
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.0-r2 b/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
index 37fa48553c5e..ffaceae8a5f4 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-libs/nDPI net-misc/curl virtual/libmysqlclient >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs virtual/libmysqlclient >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=6
 HOMEPAGE=http://www.ntop.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-libs/nDPI net-misc/curl virtual/libmysqlclient dev-db/redis
+RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs virtual/libmysqlclient dev-db/redis
 SLOT=0
 SRC_URI=https://github.com/ntop/ntopng/archive/3.0.tar.gz -> ntopng-3.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f7f75470b81e5f9fcd08deafdf1a42e8
+_md5_=c846b67f6393c1851812685b34aaab6c
diff --git a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.2 b/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.2
index 2c6031b876e4..04cadf2f0340 100644
--- a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.2
+++ b/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.2
@@ -3,9 +3,9 @@ DEPEND=dev-util/promu >=dev-lang/go-1.8
 DESCRIPTION=Prometheus exporter for machine metrics
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/node_exporter
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.15.2.tar.gz -> prometheus-node_exporter-0.15.2.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f58ac25eac4e3e04f3ef07b2203db0ef
+_md5_=1d45644441c372e5a411dd64dc4f7767
diff --git a/metadata/md5-cache/net-analyzer/suricata-2.0.11 b/metadata/md5-cache/net-analyzer/suricata-2.0.11
deleted file mode 100644
index 84ca09ef0a5e..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-2.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.18 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.18 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-2.0.11.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b56879522f5242ac5db430e36094c699
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.0.1 b/metadata/md5-cache/net-analyzer/suricata-3.0.1
deleted file mode 100644
index 13bfa2dec476..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.18 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.18 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.0.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=14edfb0d2890d1e0e604c95b1c64d639
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.1.3 b/metadata/md5-cache/net-analyzer/suricata-3.1.3
deleted file mode 100644
index 7b11e6997524..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.1.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ba1325182820377a8639bdde447e6cd4
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.2 b/metadata/md5-cache/net-analyzer/suricata-3.2
deleted file mode 100644
index 93c207dd11e7..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=81e70da2893e01265b1dec454fddc753
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.2-r1 b/metadata/md5-cache/net-analyzer/suricata-3.2-r1
deleted file mode 100644
index 64d05ccb58df..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
-REQUIRED_USE=lua? ( !luajit )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7ef0c193db7c77fd4c2a91327788313f
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.2.1 b/metadata/md5-cache/net-analyzer/suricata-3.2.1
deleted file mode 100644
index 8bca4dd75465..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-3.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.2.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4d40aff89796d627b30195454eabff48
diff --git a/metadata/md5-cache/net-analyzer/suricata-4.0.3 b/metadata/md5-cache/net-analyzer/suricata-4.0.3
new file mode 100644
index 000000000000..35cd439ce438
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=5
+HOMEPAGE=http://suricata-ids.org/
+IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
+REQUIRED_USE=lua? ( !luajit )
+SLOT=0
+SRC_URI=http://www.openinfosecfoundation.org/download/suricata-4.0.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=75995215b4566893d9a3a1d6414dceb7
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.2.7 b/metadata/md5-cache/net-analyzer/wireshark-2.2.7
deleted file mode 100644
index 5e7c18606b34..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-2.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=6
-HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi libssh randpkt randpktdump sshdump ssl tfshark zlib +filecaps
-KEYWORDS=alpha
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh ) ssl? ( crypt )
-SLOT=0/2.2.7
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.2.7.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=156116d66190753f724123e639d38b36
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.2.7-r1 b/metadata/md5-cache/net-analyzer/wireshark-2.2.7-r1
new file mode 100644
index 000000000000..90d72a6387e8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.2.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=6
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi libssh randpkt randpktdump sshdump ssl tfshark zlib +filecaps
+KEYWORDS=alpha
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh ) ssl? ( crypt )
+SLOT=0/2.2.7
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.2.7.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=08a6d5ff92f73ed09aff8ed40c38cd92
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.2 b/metadata/md5-cache/net-analyzer/wireshark-2.4.2
deleted file mode 100644
index af21eb880efb..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=6
-HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
-SLOT=0/2.4.2
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af20cd31e318be8caa0123fc8d43c79d
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.2-r1 b/metadata/md5-cache/net-analyzer/wireshark-2.4.2-r1
new file mode 100644
index 000000000000..d60214caacbc
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=6
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
+SLOT=0/2.4.2
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a4ff82e23768193ceb5401148bd15cb6
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.3 b/metadata/md5-cache/net-analyzer/wireshark-2.4.3-r1
index e8931a1cf4c2..e8931a1cf4c2 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.3-r1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.17 b/metadata/md5-cache/net-analyzer/zabbix-2.2.17
deleted file mode 100644
index 42d3ac664d98..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=453a840d5cd15ab363fc7b23a1eb55d2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.18 b/metadata/md5-cache/net-analyzer/zabbix-2.2.18
deleted file mode 100644
index 43397967773e..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.18.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=453a840d5cd15ab363fc7b23a1eb55d2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.19 b/metadata/md5-cache/net-analyzer/zabbix-2.2.19
deleted file mode 100644
index 6905c146a595..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=453a840d5cd15ab363fc7b23a1eb55d2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.20 b/metadata/md5-cache/net-analyzer/zabbix-2.2.20
deleted file mode 100644
index f4fa37b88c36..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.20.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=453a840d5cd15ab363fc7b23a1eb55d2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.10 b/metadata/md5-cache/net-analyzer/zabbix-3.0.10
deleted file mode 100644
index f2509f20bc15..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.11 b/metadata/md5-cache/net-analyzer/zabbix-3.0.11
deleted file mode 100644
index 5fced230e932..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.12 b/metadata/md5-cache/net-analyzer/zabbix-3.0.12
deleted file mode 100644
index 8bfe09febd54..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.13 b/metadata/md5-cache/net-analyzer/zabbix-3.0.13
deleted file mode 100644
index 39073f95a3f0..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.6 b/metadata/md5-cache/net-analyzer/zabbix-3.0.6
deleted file mode 100644
index 90c7c02f40a0..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=f7b8e93f5f839d613b1087c8b86a3d16
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.8 b/metadata/md5-cache/net-analyzer/zabbix-3.0.8
deleted file mode 100644
index 92bfba0cb1c9..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.9 b/metadata/md5-cache/net-analyzer/zabbix-3.0.9
deleted file mode 100644
index bfc962aa24ee..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.2 b/metadata/md5-cache/net-analyzer/zabbix-3.2.2
deleted file mode 100644
index 4a1350ba9194..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=52d13ddc7b8be493a7f8cf9e2d49930c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.3 b/metadata/md5-cache/net-analyzer/zabbix-3.2.3
deleted file mode 100644
index 724d867d45d6..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=52d13ddc7b8be493a7f8cf9e2d49930c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.4 b/metadata/md5-cache/net-analyzer/zabbix-3.2.4
deleted file mode 100644
index d8103301797c..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.5 b/metadata/md5-cache/net-analyzer/zabbix-3.2.5
deleted file mode 100644
index 8e92e822670b..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.6 b/metadata/md5-cache/net-analyzer/zabbix-3.2.6
deleted file mode 100644
index 402481b72896..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.7 b/metadata/md5-cache/net-analyzer/zabbix-3.2.7
deleted file mode 100644
index d69960a39e36..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.8 b/metadata/md5-cache/net-analyzer/zabbix-3.2.8
deleted file mode 100644
index a40154adc02f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.1 b/metadata/md5-cache/net-analyzer/zabbix-3.4.1
deleted file mode 100644
index 72b7eb910b68..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=779ce8237550d9a1b21ff3217aa9eb39
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.2 b/metadata/md5-cache/net-analyzer/zabbix-3.4.2
deleted file mode 100644
index 6c4a884b718d..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=779ce8237550d9a1b21ff3217aa9eb39
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.3 b/metadata/md5-cache/net-analyzer/zabbix-3.4.3
deleted file mode 100644
index a389feee1d39..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=779ce8237550d9a1b21ff3217aa9eb39
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.4 b/metadata/md5-cache/net-analyzer/zabbix-3.4.4
deleted file mode 100644
index ff6b72998ad8..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=http://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=779ce8237550d9a1b21ff3217aa9eb39
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.6 b/metadata/md5-cache/net-analyzer/zabbix-3.4.6
new file mode 100644
index 000000000000..b0adc1d86de1
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.4.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.6.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=0a6a5ae7434ec5043ff03de6daed3c23
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 9da473d72276..6c0a34e04322 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.16 b/metadata/md5-cache/net-dialup/freeradius-3.0.16
new file mode 100644
index 000000000000..50bd2bc6cb60
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc 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(+)] ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=6
+HOMEPAGE=http://www.freeradius.org/
+IUSE=debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap postgres python readline sqlite ssl python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc 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(+)] ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+RESTRICT=test firebird? ( bindist )
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.16.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.16.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=863671965579362e91238ee798faae20
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r4 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r4
deleted file mode 100644
index 254c0ab11258..000000000000
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
-DESCRIPTION=Point-to-Point Protocol (PPP)
-EAPI=5
-HOMEPAGE=https://ppp.samba.org/
-IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD GPL-2
-PDEPEND=net-dialup/ppp-scripts
-RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
-SLOT=0/2.4.7
-SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-5.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3e602bd9c334b2bcd6e332ceaecb48a6
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r5 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r5
new file mode 100644
index 000000000000..dc45f8248f16
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+DESCRIPTION=Point-to-Point Protocol (PPP)
+EAPI=6
+HOMEPAGE=https://ppp.samba.org/
+IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD GPL-2
+PDEPEND=net-dialup/ppp-scripts
+RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+SLOT=0/2.4.7
+SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-5.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=32400a2fbd1b02890cc041998812e4ee
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 8d1130a4d26d..18a960f8a51a 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.11.2 b/metadata/md5-cache/net-dns/bind-9.11.2
deleted file mode 100644
index 332c029d3cba..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
-EAPI=5
-HOMEPAGE=http://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
-REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dcef94eae88934366ab96098f58eba84
diff --git a/metadata/md5-cache/net-dns/bind-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-9.11.2_p1
new file mode 100644
index 000000000000..f0fe2301ceca
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.11.2_p1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
+EAPI=5
+HOMEPAGE=http://www.isc.org/software/bind
+IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1bae84baaeb27596e67af013b50c6f9d
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3 b/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
index 05c1dcde0157..5ecd5348f53b 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5798f4d27721d04da47d207a6e2dec4d
+_md5_=fc57ff70b4bff18d37b0a12593c3c63f
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.2 b/metadata/md5-cache/net-dns/bind-tools-9.11.2
deleted file mode 100644
index e7828f49d5d1..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
-EAPI=5
-HOMEPAGE=http://www.isc.org/software/bind
-IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
-REQUIRED_USE=gost? ( !libressl ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1729b630288b0d0d4ff97b829cf7a7a1
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
new file mode 100644
index 000000000000..fc7f8af3ab05
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=5
+HOMEPAGE=http://www.isc.org/software/bind
+IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
+REQUIRED_USE=gost? ( !libressl ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=39301be4be1f77969b8e6cc4601a64d9
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.76 b/metadata/md5-cache/net-dns/dnsmasq-2.76
deleted file mode 100644
index f805d61ecfb7..000000000000
--- a/metadata/md5-cache/net-dns/dnsmasq-2.76
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
-DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Small forwarding DNS server
-EAPI=6
-HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
-REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script )
-SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ffce10760e28c4adb8c9f5eeacc6c98c
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.76-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.76-r1
deleted file mode 100644
index b7784fa64d3f..000000000000
--- a/metadata/md5-cache/net-dns/dnsmasq-2.76-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
-DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Small forwarding DNS server
-EAPI=6
-HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
-REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script )
-SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=466686bbad0ac6cd31577a5ae670ee27
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.77 b/metadata/md5-cache/net-dns/dnsmasq-2.77
deleted file mode 100644
index eb2f68be5ec3..000000000000
--- a/metadata/md5-cache/net-dns/dnsmasq-2.77
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
-DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Small forwarding DNS server
-EAPI=6
-HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
-REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( !idn )
-SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.77.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5c7b0c8c0f2c29489e91f9a5a81ee2d5
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.77-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.77-r1
deleted file mode 100644
index ea8802d2b168..000000000000
--- a/metadata/md5-cache/net-dns/dnsmasq-2.77-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
-DEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Small forwarding DNS server
-EAPI=6
-HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
-REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
-SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.77.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bf6092332505aa3d46ad0ce4e801d3b6
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.78 b/metadata/md5-cache/net-dns/dnsmasq-2.78
index 3ea79be1e496..413ad7f2f361 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.78
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.78
@@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cba948efe4246b5ae316fb3f1b3ee7f7
+_md5_=3a574b69d36c2a03aae6c270cd923b1b
diff --git a/metadata/md5-cache/net-dns/hesiod-3.1.0 b/metadata/md5-cache/net-dns/hesiod-3.1.0
index 6c1baa4f9996..68ec0b460868 100644
--- a/metadata/md5-cache/net-dns/hesiod-3.1.0
+++ b/metadata/md5-cache/net-dns/hesiod-3.1.0
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=DNS functionality to access to DB of information that changes infrequently
 EAPI=2
 HOMEPAGE=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.1.0.tar.gz mirror://gentoo/hesiod-3.1.0-patches.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b8a46bb713c8375f07852dfa055a5c0
+_md5_=fb5e96e08baa91fda78898ffc26a0baf
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.6.17 b/metadata/md5-cache/net-dns/ldns-utils-1.6.17
deleted file mode 100644
index 2ee2d43c60e3..000000000000
--- a/metadata/md5-cache/net-dns/ldns-utils-1.6.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=net-libs/ldns-1.6.17[dane?,ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
-DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
-EAPI=5
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=dane ecdsa examples gost ssl
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=net-libs/ldns-1.6.17[dane?,ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz
-_md5_=ffebcd525c41cdabcb89ec96cf1ed08a
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.0 b/metadata/md5-cache/net-dns/ldns-utils-1.7.0
deleted file mode 100644
index 20da1ddfeba3..000000000000
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=net-libs/ldns-1.7.0[dane?,ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
-DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
-EAPI=5
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=+dane ecdsa examples gost ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=BSD
-RDEPEND=>=net-libs/ldns-1.7.0[dane?,ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_md5_=28e2af4769471aea68df2b8a32417e4e
diff --git a/metadata/md5-cache/net-dns/libidn-1.33 b/metadata/md5-cache/net-dns/libidn-1.33
index b0cad682ad98..65e98402bbea 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33
+++ b/metadata/md5-cache/net-dns/libidn-1.33
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f0193f40f30dd3487b9fd607ccf239c5
+_md5_=5e2505a9101e1ad849b702981d2b2d37
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r1 b/metadata/md5-cache/net-dns/libidn-1.33-r1
index 95403624c408..b760796a9a60 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33-r1
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9eab6bc3018ce1d3a5d7b9b4c61a9223
+_md5_=d9cd9c3ff6f583741e282a862fa459ea
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r2 b/metadata/md5-cache/net-dns/libidn-1.33-r2
index 6ab503972ac2..6e65363a0007 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33-r2
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b536594bf0e3f3857ce2c4aeaf04c70b
+_md5_=ceadca8dba1628352bb17e02a11984a1
diff --git a/metadata/md5-cache/net-dns/openresolv-3.8.1 b/metadata/md5-cache/net-dns/openresolv-3.8.1
index 60dece0ebe48..afda4ebf6f79 100644
--- a/metadata/md5-cache/net-dns/openresolv-3.8.1
+++ b/metadata/md5-cache/net-dns/openresolv-3.8.1
@@ -4,9 +4,9 @@ DESCRIPTION=A framework for managing DNS information
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/openresolv
 IUSE=selinux
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/openresolv/openresolv-3.8.1.tar.xz
-_md5_=efc5a7bd1510ccc5619d3382ee1f9a66
+_md5_=19611387028cd3380fc779a4729c384c
diff --git a/metadata/md5-cache/net-dns/openresolv-3.9.0 b/metadata/md5-cache/net-dns/openresolv-3.9.0
index 4da85bd75170..628c69b28afc 100644
--- a/metadata/md5-cache/net-dns/openresolv-3.9.0
+++ b/metadata/md5-cache/net-dns/openresolv-3.9.0
@@ -4,9 +4,9 @@ DESCRIPTION=A framework for managing DNS information
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/openresolv
 IUSE=selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz
-_md5_=caf556ef2a40d0b8bf38a2e5ac84c9a8
+_md5_=399660411906e008f18c38c9ad8df0ca
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.0 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.0
deleted file mode 100644
index 420a7e3eab00..000000000000
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
-DESCRIPTION=The PowerDNS Recursor
-EAPI=6
-HOMEPAGE=https://www.powerdns.com/
-IUSE=libressl luajit protobuf snmp sodium systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6ba80b1fff104969753214a0ca54749e
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.1 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.1
new file mode 100644
index 000000000000..244d31a8139d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
+DESCRIPTION=The PowerDNS Recursor
+EAPI=6
+HOMEPAGE=https://www.powerdns.com/
+IUSE=libressl luajit protobuf snmp sodium systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0527bf85c2874e25c56413f65c2fa0f4
diff --git a/metadata/md5-cache/net-dns/unbound-1.6.8 b/metadata/md5-cache/net-dns/unbound-1.6.8
new file mode 100644
index 000000000000..c2c4f2f3e5c9
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.6.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=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(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,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/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=5
+HOMEPAGE=http://unbound.net/
+IUSE=debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+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(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,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/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://unbound.net/downloads/unbound-1.6.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=672c180723e8af7567d2ee21481fe204
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index f525571ac0ce..ab3a7c028d84 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1 b/metadata/md5-cache/net-firewall/pglinux-2.3.1
index 5fb9301cdb98..3b0409f93076 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.3.1
+++ b/metadata/md5-cache/net-firewall/pglinux-2.3.1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( kde-plasma/kde-cli-tools[kdesu] kde-apps/kdesu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Privacy oriented firewall application
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/peerguardian/
 IUSE=cron dbus logrotate networkmanager qt4 zlib
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( kde-plasma/kde-cli-tools[kdesu] kde-apps/kdesu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager:= )
+RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager:= )
 REQUIRED_USE=qt4? ( dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/peerguardian/pgl-2.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=610478b3585c8b9ed213d4466acc3458
+_md5_=ce6b83bb1d86101e4e6c7c7015f259b7
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 1ca0906a3ed4..ffb1147cf1e3 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.5.15 b/metadata/md5-cache/net-fs/samba-4.5.15
index bc39a5b32ea9..accc400902bb 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.15
+++ b/metadata/md5-cache/net-fs/samba-4.5.15
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.15.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=4414ffccf1cd9f7ede4df73f64b1c97e
+_md5_=1eb9150702a50b246d692284cf423c24
diff --git a/metadata/md5-cache/net-fs/samba-4.7.3 b/metadata/md5-cache/net-fs/samba-4.7.3
index d69972e1eab0..83aff1a83e2b 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.3
+++ b/metadata/md5-cache/net-fs/samba-4.7.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=d379cc2daed07f38a22c6b7352f8b239
+_md5_=6441879d4925bce5cdd867e7c104c7da
diff --git a/metadata/md5-cache/net-fs/samba-4.7.4 b/metadata/md5-cache/net-fs/samba-4.7.4
index ae6bf90249bc..77be2f76f681 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.4
+++ b/metadata/md5-cache/net-fs/samba-4.7.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=3ddf5bff81cdc1007bccf0f20e665e17
+_md5_=f6bc893590788333cf34a089409fb6ea
diff --git a/metadata/md5-cache/net-fs/samba-4.8.0_rc1 b/metadata/md5-cache/net-fs/samba-4.8.0_rc1
deleted file mode 100644
index d3c80029e8f5..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.8.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/rc/samba-4.8.0rc1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=6d80dfd122767c72796e951f81e51bf9
diff --git a/metadata/md5-cache/net-fs/samba-4.8.0_rc2 b/metadata/md5-cache/net-fs/samba-4.8.0_rc2
new file mode 100644
index 000000000000..9c8987f6d4ed
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.0_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/rc/samba-4.8.0rc2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=5a28d4d47700467541f49b85cce7adc4
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index d3ba89117cee..d25449523536 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.5 b/metadata/md5-cache/net-ftp/lftp-4.7.5
index 359ecaff18d3..d19e6829e0f9 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.5
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.5
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.7.5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2940de200ce68ff05bd5c1ea5abdf451
+_md5_=67f71a45f021764869286c93ae461f45
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.2 b/metadata/md5-cache/net-ftp/lftp-4.8.2
index dbfa471ab98b..4e8d5ccf2a2f 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.8.2
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.8.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=299d930a7a1aa07402e6c6c098ac2aa3
+_md5_=f4116b56d64249b4f9e0b7a5a8bb0e26
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.3 b/metadata/md5-cache/net-ftp/lftp-4.8.3
index 02449acfa869..a4d0b96cc41e 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.8.3
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.8.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=299d930a7a1aa07402e6c6c098ac2aa3
+_md5_=f4116b56d64249b4f9e0b7a5a8bb0e26
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 8649210a4c8f..9f674d4192b5 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.1.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.1.0
deleted file mode 100644
index 50b55812dfa2..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Signal Desktop
-EAPI=6
-HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnome-base/gconf:2 dev-libs/libappindicator:3 dev-libs/nss x11-libs/libXtst net-print/cups
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.1.0_amd64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76de14626ef9d99ae6f8f53bd5dabe71
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.2.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.2.0
new file mode 100644
index 000000000000..d7702b387a26
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Signal Desktop
+EAPI=6
+HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=gnome-base/gconf:2 dev-libs/libappindicator:3 dev-libs/nss x11-libs/libXtst net-print/cups
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.2.0_amd64.deb
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=76de14626ef9d99ae6f8f53bd5dabe71
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 44e2ca4e1b28..a085f06b5710 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-r1 b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
index 446178b23d99..0c15d65eea0f 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10-r1
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 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_targets_ruby22? ( dev-lang/ruby:2.2 ) ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 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_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Epic5 IRC Client
 EAPI=4
 HOMEPAGE=http://epicsol.org/
-IUSE=archive ipv6 perl tcl ruby socks5 valgrind elibc_FreeBSD ruby_targets_ruby22
+IUSE=archive ipv6 perl tcl ruby socks5 valgrind elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 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_targets_ruby22? ( dev-lang/ruby:2.2 ) )
-REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby22 ) ) ruby_targets_ruby22? ( ruby )
+RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 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_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby22 ruby_targets_ruby23 ) ) ruby_targets_ruby22? ( ruby ) ruby_targets_ruby23? ( ruby )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=20b811464fdfcc3b395be8df2087a5fc
+_md5_=077a64d3d3358557ef6f8287209b589a
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30
deleted file mode 100644
index 91d0e830e1c6..000000000000
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby ) ssl? ( !gnutls? ( dev-libs/openssl ) )
-DESCRIPTION=IRC fileserver using DCC
-EAPI=5
-HOMEPAGE=http://iroffer.dinoex.net/
-IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby ) ssl? ( !gnutls? ( dev-libs/openssl ) )
-REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=18aecf21724bf7064981ac0b6c7d2871
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
new file mode 100644
index 000000000000..fdcc5b1d3454
--- /dev/null
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+DESCRIPTION=IRC fileserver using DCC
+EAPI=6
+HOMEPAGE=http://iroffer.dinoex.net/
+IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=28f26c122dbd6d5e516cbd0fcc06b0cc
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
deleted file mode 100644
index 56bb73df39c8..000000000000
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A ruby IRC bot
-EAPI=5
-HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host toilet test elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fbfdeddc9620a67f9c77e089f58157ce
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b3acb847a2f0..ac338c181d5d 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/accounts-qt-1.13 b/metadata/md5-cache/net-libs/accounts-qt-1.13
deleted file mode 100644
index f3eccf0e216f..000000000000
--- a/metadata/md5-cache/net-libs/accounts-qt-1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libaccounts-glib dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Qt5 bindings for libaccounts-glib
-EAPI=5
-HOMEPAGE=https://01.org/gsso/
-IUSE=doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=net-libs/libaccounts-glib dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~kensington/distfiles/accounts-qt-1.13.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a273b76e2792e5155f8b03d4483a8fca
diff --git a/metadata/md5-cache/net-libs/accounts-qt-1.15 b/metadata/md5-cache/net-libs/accounts-qt-1.15
index 44413ca871e7..8a43d33a981a 100644
--- a/metadata/md5-cache/net-libs/accounts-qt-1.15
+++ b/metadata/md5-cache/net-libs/accounts-qt-1.15
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 bindings for libaccounts-glib
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=>=net-libs/libaccounts-glib-1.23 dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz -> accounts-qt-1.15.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=0f1af1f7643127bf7e2b75bb0b805f1b
+_md5_=00716887bec0bea11d2159306b4be2df
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.15 b/metadata/md5-cache/net-libs/gnutls-3.5.15
index 0da5e9c4ef10..408b8d7b9dbf 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.15
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.15.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=677392874acccf5411a4d5acca650a2c
+_md5_=3253c6e289731d2887fa574f23ad42cd
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.16 b/metadata/md5-cache/net-libs/gnutls-3.5.16
index ddd8c8bc2f55..6432982be34d 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.16
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.16
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.16.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0a879a49b0f0b5c0a9143ca843598552
+_md5_=0167cb5c88077409c764bbf127bff7e0
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.17 b/metadata/md5-cache/net-libs/gnutls-3.5.17
index 083c8ed67911..58e385df308c 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.17
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.17
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.17.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0a879a49b0f0b5c0a9143ca843598552
+_md5_=0167cb5c88077409c764bbf127bff7e0
diff --git a/metadata/md5-cache/net-libs/kimap2-0.1.1 b/metadata/md5-cache/net-libs/kimap2-0.1.1
deleted file mode 100644
index 2f28a4d92bee..000000000000
--- a/metadata/md5-cache/net-libs/kimap2-0.1.1
+++ /dev/null
@@ -1,14 +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/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl:2 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers - successor of kimap
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl:2 >=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/unstable/kimap2/0.1.1/src/kimap2-0.1.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0 b/metadata/md5-cache/net-libs/kimap2-0.2.0
deleted file mode 100644
index da235bc3c486..000000000000
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0
+++ /dev/null
@@ -1,14 +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/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl:2 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers - successor of kimap
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 dev-libs/cyrus-sasl:2 >=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/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
new file mode 100644
index 000000000000..f1346e4773f1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] dev-libs/cyrus-sasl:2 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers - successor of kimap
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] dev-libs/cyrus-sasl:2 >=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/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ed07e24edea48b82ef1aa4c7da81ac72
diff --git a/metadata/md5-cache/net-libs/ldns-1.6.17 b/metadata/md5-cache/net-libs/ldns-1.6.17
deleted file mode 100644
index a23a89a16b40..000000000000
--- a/metadata/md5-cache/net-libs/ldns-1.6.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dane? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gost? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(+)] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen )
-DESCRIPTION=a library with the aim to simplify DNS programming in C
-EAPI=5
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=dane doc +ecdsa gost python +ssl static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=dane? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gost? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(+)] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=ecdsa? ( ssl ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f969328a3d0fd890f73ab2182897e47e
diff --git a/metadata/md5-cache/net-libs/ldns-1.6.17-r1 b/metadata/md5-cache/net-libs/ldns-1.6.17-r1
deleted file mode 100644
index a813cbc57685..000000000000
--- a/metadata/md5-cache/net-libs/ldns-1.6.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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(+)] ) dane? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gost? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen )
-DESCRIPTION=a library with the aim to simplify DNS programming in C
-EAPI=5
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=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(+)] ) dane? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gost? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-REQUIRED_USE=ecdsa? ( ssl ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3771a13056762fffdde73e43bd5b1455
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.0-r1 b/metadata/md5-cache/net-libs/ldns-1.7.0-r1
deleted file mode 100644
index bfa478896225..000000000000
--- a/metadata/md5-cache/net-libs/ldns-1.7.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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(+)] ) dane? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gost? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen )
-DESCRIPTION=a library with the aim to simplify DNS programming in C
-EAPI=5
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=+dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=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(+)] ) dane? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gost? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) )
-REQUIRED_USE=ecdsa? ( ssl ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6157bd12d24e1f17a09e2fde95834847
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.21-r2 b/metadata/md5-cache/net-libs/libaccounts-glib-1.21-r2
deleted file mode 100644
index ffa14cba2e81..000000000000
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.21-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-util/gtk-doc >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applications
-EAPI=5
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_1.21 -> libaccounts-glib-1.21.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42bf2ab681e0c69660c18ce3be06d50e
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.23 b/metadata/md5-cache/net-libs/libaccounts-glib-1.23
index ad1035390040..03e79b277086 100644
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.23
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.23
@@ -4,10 +4,10 @@ DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applicatio
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_1.23 -> libaccounts-glib-1.23.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc5995fd92bb72f79898f54f4ce88405
+_md5_=842e422549e969a836b47391de6017e8
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.09 b/metadata/md5-cache/net-libs/liblockfile-1.09
index a436da6430d7..764f1076a46c 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.09
+++ b/metadata/md5-cache/net-libs/liblockfile-1.09
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=4
 HOMEPAGE=http://www.debian.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=08f44f306c590da489a066b125d04aa8
+_md5_=b27a924ab5243903711015d5d32467cf
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.13 b/metadata/md5-cache/net-libs/liblockfile-1.13
index eca11f0f1110..48ab7fad096c 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.13
+++ b/metadata/md5-cache/net-libs/liblockfile-1.13
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=6
 HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.13.orig.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4a6920f17b4f07c7018f58e72cca9b98
+_md5_=d887623b01a91b8b415e2d74938419fa
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.14 b/metadata/md5-cache/net-libs/liblockfile-1.14
index 300ad3a40d9e..5aed0a66d568 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.14
+++ b/metadata/md5-cache/net-libs/liblockfile-1.14
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=6
 HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4a6920f17b4f07c7018f58e72cca9b98
+_md5_=d887623b01a91b8b415e2d74938419fa
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
index faee11cfd27f..5dabbda60efc 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
@@ -4,9 +4,9 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz
-_md5_=ce50ef6a6b804b6a4262544a52c4ee4b
+_md5_=cffd3ea76ad59b033ee9786b7415c90d
diff --git a/metadata/md5-cache/net-libs/libnsl-1.2.0 b/metadata/md5-cache/net-libs/libnsl-1.2.0
index 7ae10e0791aa..63c5d28ff3da 100644
--- a/metadata/md5-cache/net-libs/libnsl-1.2.0
+++ b/metadata/md5-cache/net-libs/libnsl-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/libnsl
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
 SLOT=0/2
 SRC_URI=https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -> libnsl-1.2.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ffb44a580480d8bc9a9d47e4601d47c0
+_md5_=726933bf4d3741e50abab3b7d7ba325a
diff --git a/metadata/md5-cache/net-libs/nDPI-2.2 b/metadata/md5-cache/net-libs/nDPI-2.2
new file mode 100644
index 000000000000..8a744fe20f6e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nDPI-2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/json-c:= net-libs/libpcap >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
+EAPI=6
+HOMEPAGE=http://www.ntop.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/json-c:= net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/ntop/nDPI/archive/2.2.tar.gz -> nDPI-2.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1998f4f4d662db702a0349fadfcd0471
diff --git a/metadata/md5-cache/net-libs/neon-0.30.2 b/metadata/md5-cache/net-libs/neon-0.30.2
index 663ee3acbd46..72ee330d73a1 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.2
+++ b/metadata/md5-cache/net-libs/neon-0.30.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP and WebDAV client library
 EAPI=6
 HOMEPAGE=http://www.webdav.org/neon/
 IUSE=doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=GPL-2
 RDEPEND=expat? ( dev-libs/expat:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2: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(-)?] ) gnutls? ( app-misc/ca-certificates net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] pkcs11? ( dev-libs/pakchois:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( ssl? ( 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(-)?] ) !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(-)?] ) pkcs11? ( dev-libs/pakchois:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libproxy? ( net-libs/libproxy:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( virtual/libintl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0/27
 SRC_URI=http://www.webdav.org/neon/neon-0.30.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f936903c35438b1ece9d73649ae83e8d
+_md5_=328f031a12c54af2aaaccd90e62b97c7
diff --git a/metadata/md5-cache/net-libs/openslp-1.2.1-r3 b/metadata/md5-cache/net-libs/openslp-1.2.1-r3
index 7fcb43ad1291..08743571275d 100644
--- a/metadata/md5-cache/net-libs/openslp-1.2.1-r3
+++ b/metadata/md5-cache/net-libs/openslp-1.2.1-r3
@@ -3,11 +3,11 @@ DEPEND=dev-libs/openssl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0
 DESCRIPTION=An open-source implementation of Service Location Protocol
 EAPI=0
 HOMEPAGE=http://www.openslp.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-1.2.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13acaf5cc81a715c6db44fb1a7352a11
+_md5_=42c1d8881dc41203901d44b7ba22ab89
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r4 b/metadata/md5-cache/net-libs/openslp-2.0.0-r4
index 6aa25d34b8fc..3d852211a5a6 100644
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r4
+++ b/metadata/md5-cache/net-libs/openslp-2.0.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source implementation of Service Location Protocol
 EAPI=6
 HOMEPAGE=http://www.openslp.org/
 IUSE=libressl
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=971afb1f7d5663fa1ff7f2fd0a6ed51c
+_md5_=0d17224527787d9116e59217e62c8118
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r5 b/metadata/md5-cache/net-libs/openslp-2.0.0-r5
index 5847f7434b30..91a3bd8eaaa3 100644
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r5
+++ b/metadata/md5-cache/net-libs/openslp-2.0.0-r5
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source implementation of Service Location Protocol
 EAPI=6
 HOMEPAGE=http://www.openslp.org/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b9fa84e6cf3389fa92a69e58f47f723
+_md5_=95230634e1b16c562bb9d5fcb1abc14d
diff --git a/metadata/md5-cache/net-libs/signon-ui-0.15-r1 b/metadata/md5-cache/net-libs/signon-ui-0.15-r1
new file mode 100644
index 000000000000..5dd3a473103a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/signon-ui-0.15-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond net-libs/libproxy x11-libs/libnotify test? ( dev-qt/qttest:5 )
+DESCRIPTION=Online accounts signon UI
+EAPI=6
+HOMEPAGE=https://launchpad.net/signon-ui
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond net-libs/libproxy x11-libs/libnotify !<net-libs/libproxy-0.4.12[kde]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/signon-ui/trunk/0.15/+download/signon-ui-0.15.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4f48920761b39efa5c98e5c00fcc080f
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
index c66f1d1f0168..f3012f48aff7 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
@@ -3,7 +3,7 @@ DEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/
 DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.5.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ef902092bfbeffbee3b9c655544eeb1
+_md5_=a9b43a916ad55a01fe5d6e87c5a13587
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.6 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
new file mode 100644
index 000000000000..18ba75b5dbff
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c69997bc4d8fda09cc48406c03b31f5
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 4e1d79036501..db2b173757b1 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.11 b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.11
deleted file mode 100644
index 717db4ad1d15..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=6
-HOMEPAGE=http://www.cyrusimap.org/
-IUSE=afs berkdb clamav http kerberos mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-with-attribution
-RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
-REQUIRED_USE=afs? ( kerberos ) http? ( sqlite )
-SLOT=0
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.11.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95f36c4b2f86f835832bd63dd97a13ef
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3
deleted file mode 100644
index 0ed5c4983502..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) test? ( dev-util/cunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=6
-HOMEPAGE=http://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http jmap kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sphinx sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-with-attribution
-RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) jmap? ( http xapian ) sphinx? ( mysql )
-SLOT=0
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-3.0.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2f2cc899459716f7d1f611fbb0fea08
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3-r1
deleted file mode 100644
index 3a452669c5cd..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) test? ( dev-util/cunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=6
-HOMEPAGE=http://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http jmap kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sphinx sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-with-attribution
-RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) jmap? ( http xapian ) sphinx? ( mysql )
-SLOT=0
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-3.0.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=74d2dec3e9dde422932141778da68cd2
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.5 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.5
new file mode 100644
index 000000000000..b2985bb61855
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) test? ( dev-util/cunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=6
+HOMEPAGE=http://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http jmap kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sphinx sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-with-attribution
+RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) jmap? ( http xapian ) sphinx? ( mysql )
+SLOT=0
+SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-3.0.5.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=cb07190bb1b0be874dfcd21ffef1578b
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1
new file mode 100644
index 000000000000..83ff63898fab
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.33.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=http://www.dovecot.org/
+IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+REQUIRED_USE=ssl
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.33.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=13ce28d164b4e62738e72244d33492fd
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.0-r2 b/metadata/md5-cache/net-mail/dovecot-2.3.0-r2
new file mode 100644
index 000000000000..fd9d4ad18d24
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= virtual/pkgconfig
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=http://www.dovecot.org/
+IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.0.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.0.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.0.1.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ef2aa0c958b630271665da26c9b36a04
diff --git a/metadata/md5-cache/net-mail/mailbase-1 b/metadata/md5-cache/net-mail/mailbase-1
index e10d64b3d6af..fed838dc2092 100644
--- a/metadata/md5-cache/net-mail/mailbase-1
+++ b/metadata/md5-cache/net-mail/mailbase-1
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
 EAPI=0
 HOMEPAGE=https://www.gentoo.org/
 IUSE=pam
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d3c8e57b92e91ccbfe9293769d9890f2
+_md5_=75fb345a7bfe179f21ccd64d7f659fa5
diff --git a/metadata/md5-cache/net-mail/mailbase-1.1 b/metadata/md5-cache/net-mail/mailbase-1.1
index 046da84470d1..097dade977c8 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.1
+++ b/metadata/md5-cache/net-mail/mailbase-1.1
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
 EAPI=0
 HOMEPAGE=https://www.gentoo.org/
 IUSE=pam
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=02c08c90f869c69b779eb7dda3b2a8ac
+_md5_=9a0e5f5bb20e000fc498e2d359f25ff5
diff --git a/metadata/md5-cache/net-mail/mailfront-0.88 b/metadata/md5-cache/net-mail/mailfront-0.88
deleted file mode 100644
index 6657d5495f3e..000000000000
--- a/metadata/md5-cache/net-mail/mailfront-0.88
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst unpack
-DEPEND=>=dev-libs/bglibs-1.006 >=sys-apps/sed-4
-DESCRIPTION=Mail server network protocol front-ends
-EAPI=0
-HOMEPAGE=http://untroubled.org/mailfront/
-KEYWORDS=x86 ~sparc ~ppc
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/bglibs-1.006 net-libs/cvm virtual/qmail
-SLOT=0
-SRC_URI=http://untroubled.org/mailfront/archive/mailfront-0.88.tar.gz
-_eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=382af993ad5379bc7b4fee5933204440
diff --git a/metadata/md5-cache/net-mail/mailfront-1.12 b/metadata/md5-cache/net-mail/mailfront-1.12
deleted file mode 100644
index 2edccd8d7603..000000000000
--- a/metadata/md5-cache/net-mail/mailfront-1.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=config configure install postinst
-DEPEND=>=dev-libs/bglibs-1.106 >=net-libs/cvm-0.81
-DESCRIPTION=Mail server network protocol front-ends
-EAPI=2
-HOMEPAGE=http://untroubled.org/mailfront/
-KEYWORDS=~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/bglibs-1.106 >=net-libs/cvm-0.81 virtual/qmail net-libs/cvm
-SLOT=0
-SRC_URI=http://untroubled.org/mailfront/archive/mailfront-1.12.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=53e48a6960c349a6fbd7ed2330ec7536
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.3 b/metadata/md5-cache/net-mail/mailshears-0.0.3
deleted file mode 100644
index 02a0eb9b0066..000000000000
--- a/metadata/md5-cache/net-mail/mailshears-0.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Mangle your mail garden
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/mailshears.php
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/mailshears-0.0.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=67dd6ae6048671b9ec772598cc301e45
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.3-r1 b/metadata/md5-cache/net-mail/mailshears-0.0.3-r1
new file mode 100644
index 000000000000..3c10686d0741
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/pg-0.17[ruby_targets_ruby23] <dev-ruby/pg-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/pg-0.17[ruby_targets_ruby24] <dev-ruby/pg-1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Mangle your mail garden
+EAPI=6
+HOMEPAGE=http://michael.orlitzky.com/code/mailshears.xhtml
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/pg-0.17[ruby_targets_ruby23] <dev-ruby/pg-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/pg-0.17[ruby_targets_ruby24] <dev-ruby/pg-1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/mailshears-0.0.3.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=55c98de07ab696bd68d917ada7891264
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0 b/metadata/md5-cache/net-mail/queue-repair-0.9.0
deleted file mode 100644
index ffc10ff5e257..000000000000
--- a/metadata/md5-cache/net-mail/queue-repair-0.9.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A toolkit for dealing with the qmail queue directory structure
-EAPI=0
-HOMEPAGE=http://pyropus.ca/software/queue-repair/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5ea87e5efcb700fdfadaea5e76012583
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1 b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
index 266d762d3c3d..6dccdec50105 100644
--- a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
+++ b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6fa8e1c3592f4f58725547484b15b524
+_md5_=2aa025e9fde010ef1a1d8cf14c23918d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index fc8e26214123..df467df24599 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/asterisk-13.19.0-r1 b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
new file mode 100644
index 000000000000..3f477a0a6b5d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=6
+HOMEPAGE=http://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.19.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ec5e06ce2154ad98c1a744179476ff7f
diff --git a/metadata/md5-cache/net-misc/bsdwhois-1.43.2.1 b/metadata/md5-cache/net-misc/bsdwhois-1.43.2.1
index 6500d54e533b..3821f1c1f491 100644
--- a/metadata/md5-cache/net-misc/bsdwhois-1.43.2.1
+++ b/metadata/md5-cache/net-misc/bsdwhois-1.43.2.1
@@ -3,8 +3,8 @@ DESCRIPTION=FreeBSD Whois Client
 EAPI=4
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_BSD
-KEYWORDS=amd64 ~ppc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://utenti.gufi.org/~drizzt/codes/bsdwhois-1.43.2.1.tar.gz
-_md5_=0e452c3d1e3bbc9bc340e396fbb039e7
+_md5_=41ddef740e60f94d18725c20b6317232
diff --git a/metadata/md5-cache/net-misc/cmst-2017.03.18 b/metadata/md5-cache/net-misc/cmst-2017.03.18
deleted file mode 100644
index 4e9228c9ff27..000000000000
--- a/metadata/md5-cache/net-misc/cmst-2017.03.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4
-DESCRIPTION=Qt GUI for Connman with system tray icon
-EAPI=6
-HOMEPAGE=https://github.com/andrew-bibb/cmst
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/connman
-SLOT=0
-SRC_URI=https://github.com/andrew-bibb/cmst/archive/cmst-2017.03.18.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70f7948f2e13dfa0b2484a5c2c5b0cdd
diff --git a/metadata/md5-cache/net-misc/cmst-2018.01.06 b/metadata/md5-cache/net-misc/cmst-2018.01.06
new file mode 100644
index 000000000000..90679e0714bf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cmst-2018.01.06
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4
+DESCRIPTION=Qt GUI for Connman with system tray icon
+EAPI=6
+HOMEPAGE=https://github.com/andrew-bibb/cmst
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/connman
+SLOT=0
+SRC_URI=https://github.com/andrew-bibb/cmst/archive/cmst-2018.01.06.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca7218a87e6936ff7bef3eb3bd222ec4
diff --git a/metadata/md5-cache/net-misc/curl-7.58.0 b/metadata/md5-cache/net-misc/curl-7.58.0
new file mode 100644
index 000000000000..c8706cff21fd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.58.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A Client that groks URLs
+EAPI=6
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.58.0.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a3447950606d1a504534fa5564d82170
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.4 b/metadata/md5-cache/net-misc/dhcp-4.3.4
index 508404d067b9..7e1c839dbad7 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.4
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=5
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.4.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.4/dhcp-4.3.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=347a197c9d81cf22db7bdce7125ccd4f
+_md5_=e1a609d959ecf1f64972cfeb347e457d
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.5 b/metadata/md5-cache/net-misc/dhcp-4.3.5
index 9c8844fec217..d65dea0ffa76 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.5
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=5
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.5.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.5/dhcp-4.3.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=598aa521f6d47e14da231b709cb7c3a3
+_md5_=99a0f3f1e423387d729b92fb1d68fb09
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.6 b/metadata/md5-cache/net-misc/dhcp-4.3.6
index fc70fa0f2f50..93a887007fbc 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.6
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.6.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2b1bd859e4623e98469da019a0ede82f
+_md5_=4f3d8f2a74708ab94e5aca5f3a99803c
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.6-r1 b/metadata/md5-cache/net-misc/dhcp-4.3.6-r1
index 9d0494dd212f..903a60af0405 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.6-r1
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.6.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8c9c6da91f8e4ebfd3cf15ad3baac7fa
+_md5_=fd9c25336773cce49b2eac0fae93bd15
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.10.1 b/metadata/md5-cache/net-misc/dhcpcd-6.10.1
index b2c12f66a21a..5ceb47aef20d 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.10.1
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=5
 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 ~sparc-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-6.10.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0f7a3708467d8efe88f4182fa8497529
+_md5_=d6a292f3b63dd7659a4fb46e30f2baf0
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.1-r1 b/metadata/md5-cache/net-misc/dhcpcd-6.11.1-r1
index dd3df416d830..94f182fb5ed3 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.1-r1
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.1-r1
@@ -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 ~sparc-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-6.11.1.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ac8a371815d5006bfb47250f9e768ee
+_md5_=44632c1b1a92db1dc9d23e631ee96f35
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.3 b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
index 4920244e071a..c893795ac589 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.3
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
@@ -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 ~sparc-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-6.11.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fbb92aaa897d5cfba9b42563c604bcc3
+_md5_=49ea9dcecd326ad12a04671922d41144
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.5 b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
index 7fe66fbe2f77..4d1535142259 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.5
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
@@ -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 ~sparc-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-6.11.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97ac5e9e144bf4d3947bae43a0259920
+_md5_=c5bafe996b4d68ba339d03a66c08ac32
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0
index cda779baad97..742455fa3146 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0
@@ -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 ~sparc-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.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=33c0b8fd18c10d0a1e499069b43d4669
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_beta3 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_beta3
index a1b5b0de9536..981274e74f65 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_beta3
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_beta3
@@ -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 ~sparc-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.0-beta3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc1 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc1
index 3f5a34d6e276..d3a12a1c8635 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc1
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc1
@@ -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 ~sparc-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.0-rc1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc2 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc2
index 33f74e14333f..e1877c0ceb43 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc2
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc2
@@ -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 ~sparc-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.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc3 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc3
index 0b6d43eca7ef..14aa9b38628e 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc3
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc3
@@ -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 ~sparc-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.0-rc3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc4 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc4
index ef90f1cbb1f3..fcf69298a489 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc4
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0_rc4
@@ -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 ~sparc-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.0-rc4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9999 b/metadata/md5-cache/net-misc/dhcpcd-9999
index cb44d5d9d939..885a726517ee 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9999
+++ b/metadata/md5-cache/net-misc/dhcpcd-9999
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93fb44b025da513618fdada680cf79a8
+_md5_=3818a57e387e63034ce980999665afb1
diff --git a/metadata/md5-cache/net-misc/dropbox-40.3.44 b/metadata/md5-cache/net-misc/dropbox-40.3.44
deleted file mode 100644
index 065546c8b3bb..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-40.3.44
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=6
-HOMEPAGE=http://dropbox.com/
-IUSE=+librsync-bundled selinux X python_targets_python2_7
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-40.3.44.tar.gz ) amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-40.3.44.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f04e6b134d97ea2c80f7863ef6238b8
diff --git a/metadata/md5-cache/net-misc/dropbox-41.3.76 b/metadata/md5-cache/net-misc/dropbox-41.3.76
index 24027f3df264..786711001d03 100644
--- a/metadata/md5-cache/net-misc/dropbox-41.3.76
+++ b/metadata/md5-cache/net-misc/dropbox-41.3.76
@@ -4,7 +4,7 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=6
 HOMEPAGE=http://dropbox.com/
 IUSE=+librsync-bundled selinux X python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-41.3.76.tar.gz ) amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-41.3.76.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc3e4eda31cb5da2410101f823394c52
+_md5_=fefa9008ecc22c3c4d72d3697826e3e1
diff --git a/metadata/md5-cache/net-misc/dropbox-43.3.47 b/metadata/md5-cache/net-misc/dropbox-43.3.47
new file mode 100644
index 000000000000..e5989fa96dab
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-43.3.47
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=6
+HOMEPAGE=http://dropbox.com/
+IUSE=+librsync-bundled selinux X python_targets_python2_7 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_5
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-43.3.47.tar.gz ) amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-43.3.47.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d7297fe28824a2fe366e4a94816f3b3
diff --git a/metadata/md5-cache/net-misc/hath-0.4.1 b/metadata/md5-cache/net-misc/hath-0.4.1
deleted file mode 100644
index 376bbb492276..000000000000
--- a/metadata/md5-cache/net-misc/hath-0.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= >=dev-lang/ghc-8:= >=dev-haskell/cabal-1.8 test? ( dev-util/shelltestrunner )
-DESCRIPTION=Hath manipulates network blocks in CIDR notation
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/hath.xhtml
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= >=dev-lang/ghc-8:=
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/hath/0.4.1/hath-0.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=07d80e01d2c9fe9e6e1bdcf2b93ad207
diff --git a/metadata/md5-cache/net-misc/hath-0.4.2 b/metadata/md5-cache/net-misc/hath-0.4.2
new file mode 100644
index 000000000000..561dcd25c014
--- /dev/null
+++ b/metadata/md5-cache/net-misc/hath-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-util/shelltestrunner )
+DESCRIPTION=Hath manipulates network blocks in CIDR notation
+EAPI=6
+HOMEPAGE=http://michael.orlitzky.com/code/hath.xhtml
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= >=dev-lang/ghc-8.0.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hath/0.4.2/hath-0.4.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=edb542b27f697c1762e90ceb4fe9f1c6
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.1 b/metadata/md5-cache/net-misc/keychain-2.8.1
index 4d465b7e03f1..7608ee4065a5 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.1
+++ b/metadata/md5-cache/net-misc/keychain-2.8.1
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=manage ssh and GPG keys in a convenient and secure manner
 EAPI=5
 HOMEPAGE=http://www.funtoo.org/Keychain
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.1.tar.gz -> keychain-2.8.1.tar.gz
-_md5_=2bf87741bbffecc5d28f56dbcde1e806
+_md5_=e12ad1892f82de4445c61b7cbdb4adb7
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.2 b/metadata/md5-cache/net-misc/keychain-2.8.2
index e2a688c50d14..e8761efcef2a 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.2
+++ b/metadata/md5-cache/net-misc/keychain-2.8.2
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=manage ssh and GPG keys in a convenient and secure manner
 EAPI=5
 HOMEPAGE=http://www.funtoo.org/Keychain
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.2.tar.gz -> keychain-2.8.2.tar.gz
-_md5_=b81a1087a00a73c83f0703ae8b686579
+_md5_=7e5d920bab070326fd374126742a3bf8
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.3 b/metadata/md5-cache/net-misc/keychain-2.8.3
index b756716b1a48..bfdc05004d45 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.3
+++ b/metadata/md5-cache/net-misc/keychain-2.8.3
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 EAPI=6
 HOMEPAGE=http://www.funtoo.org/Keychain
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.3.tar.gz -> keychain-2.8.3.tar.gz
-_md5_=ca5452507cd23b94d0d30f5674de7965
+_md5_=c80e503a05c26f70c93b63d008aed6a6
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.4 b/metadata/md5-cache/net-misc/keychain-2.8.4
index ba3fb0af2b66..db81e3ff96c0 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.4
+++ b/metadata/md5-cache/net-misc/keychain-2.8.4
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 EAPI=6
 HOMEPAGE=http://www.funtoo.org/Keychain
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.4.tar.gz -> keychain-2.8.4.tar.gz
-_md5_=ca5452507cd23b94d0d30f5674de7965
+_md5_=c80e503a05c26f70c93b63d008aed6a6
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.33 b/metadata/md5-cache/net-misc/memcached-1.4.33
index 26fd9cc001e3..6cfc5e9e447e 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.33
+++ b/metadata/md5-cache/net-misc/memcached-1.4.33
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.4.33.tar.gz https://www.memcached.org/files/old/memcached-1.4.33.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=db407f7f652ccb8dc49fbbc14c4e1f7d
+_md5_=3c7ee4c550263b34e1b38b4f93b6be90
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.39 b/metadata/md5-cache/net-misc/memcached-1.4.39
index 54c060d74f24..d0040e1e3ec6 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.39
+++ b/metadata/md5-cache/net-misc/memcached-1.4.39
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.4.39.tar.gz https://www.memcached.org/files/old/memcached-1.4.39.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2182ad947f57b452daaf11328ebef75b
+_md5_=3ab973bcc94350b4b72cf70b8c14727c
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.1 b/metadata/md5-cache/net-misc/memcached-1.5.1
index 5619c596f0cf..a5742618d7ec 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.1
+++ b/metadata/md5-cache/net-misc/memcached-1.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.1.tar.gz https://www.memcached.org/files/old/memcached-1.5.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5e4c8ff452cb72e220efdb30906f5a02
+_md5_=741d0deaafc9b0176d3ad650a7855158
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.2 b/metadata/md5-cache/net-misc/memcached-1.5.2
index fd4482dd2a10..789cfc9aae7a 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.2
+++ b/metadata/md5-cache/net-misc/memcached-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.2.tar.gz https://www.memcached.org/files/old/memcached-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3267f3939892cf3ab932ec0824edb586
+_md5_=8df38658370af8b72153983a877502ea
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.3-r1 b/metadata/md5-cache/net-misc/memcached-1.5.3-r1
index 5105aa6dfc44..05b976917acb 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.3-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.5.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.3.tar.gz https://www.memcached.org/files/old/memcached-1.5.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ecea4ff48558f072e1ccb2d4aa340454
+_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.4 b/metadata/md5-cache/net-misc/memcached-1.5.4
index e6e93288c68d..3fb951645d8d 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.4
+++ b/metadata/md5-cache/net-misc/memcached-1.5.4
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.4.tar.gz https://www.memcached.org/files/old/memcached-1.5.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ecea4ff48558f072e1ccb2d4aa340454
+_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.2 b/metadata/md5-cache/net-misc/netifrc-0.2.2
index 2a75b908ee1d..b82c5e198615 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.2
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.2
@@ -3,10 +3,10 @@ DEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 kernel_linux? ( virtua
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=9d01d516edc0bfe98fb07475b3e5e580
+_md5_=07734400697d21ef27d7c77350da3920
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.3 b/metadata/md5-cache/net-misc/netifrc-0.2.3
index e20fb5d76cc5..66b38ab48158 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.3
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.3
@@ -3,10 +3,10 @@ DEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 kernel_linux? ( virtua
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=fe140db64b19fad9624c35a59285a547
+_md5_=1b3a8c0d2c3edb0bdb8e36db3bbc90ea
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.4 b/metadata/md5-cache/net-misc/netifrc-0.2.4
index ea954ec5229c..88e09ffd7ebe 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.4
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.4
@@ -3,10 +3,10 @@ DEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 kernel_linux? ( virtua
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=32536236338ecb5b9cbdb74fa079ad0a
+_md5_=c62b7f82898dab85975c2f397181584e
diff --git a/metadata/md5-cache/net-misc/netifrc-0.3.0 b/metadata/md5-cache/net-misc/netifrc-0.3.0
index 623eee475bd5..0c3266496e71 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.3.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.3.0
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.3.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1b5cd749732e11d06b00fbc8db7a063c
+_md5_=73ee3fbb1b6df73e3b9d053778d52b4a
diff --git a/metadata/md5-cache/net-misc/netifrc-0.3.1 b/metadata/md5-cache/net-misc/netifrc-0.3.1
index 06db700d0e8f..cd194672670e 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.3.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.3.1
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.3.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=4784a73543edb2ac833d2992016b1191
+_md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0 b/metadata/md5-cache/net-misc/netifrc-0.4.0
index c9d9cf28d108..4167452564b4 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=4784a73543edb2ac833d2992016b1191
+_md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1 b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
index f21fa2444182..5391a4f4cc3d 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=7cb355daf1c20713a0de2e1072b65b42
+_md5_=940c1f9a274b7d88359305ce3356d827
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.0 b/metadata/md5-cache/net-misc/netifrc-0.5.0
index 6732ff0700ad..a3a1def86cac 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.0
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=45de8d4c0112d0f5d9635689c82b096a
+_md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.1 b/metadata/md5-cache/net-misc/netifrc-0.5.1
index d00a1e2bd9af..f6ed2aa0258a 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.1
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=f704295bf40ec6c5f1c9133447984c49
+_md5_=3915ab596d9e5519e8db957bf045d026
diff --git a/metadata/md5-cache/net-misc/netifrc-0.6.0 b/metadata/md5-cache/net-misc/netifrc-0.6.0
index 7e71f7969648..d412d2d4ced2 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.6.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.6.0
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.6.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=45de8d4c0112d0f5d9635689c82b096a
+_md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/netifrc-9999 b/metadata/md5-cache/net-misc/netifrc-9999
index 9ed201a59932..ad06166e12b3 100644
--- a/metadata/md5-cache/net-misc/netifrc-9999
+++ b/metadata/md5-cache/net-misc/netifrc-9999
@@ -7,4 +7,4 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=45de8d4c0112d0f5d9635689c82b096a
+_md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1 b/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
index bc9e431fd1e4..c9d0efc57be7 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=5
 HOMEPAGE=http://www.ntp.org/
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p10.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p10-manpages.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=089a24358eced125a403ddf76f4fbd72
+_md5_=7d82168c8e6b07ed524a99b3556668a5
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.33 b/metadata/md5-cache/net-misc/nx-3.5.0.33
index dfa61d7b18fc..4ee8630237f5 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.33
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.33
@@ -4,10 +4,10 @@ DESCRIPTION=NX compression technology core libraries
 EAPI=6
 HOMEPAGE=http://www.x2go.org/doku.php/wiki:libs:nx-libs
 IUSE=elibc_glibc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2 >=media-libs/libpng-1.2.8:* >=sys-libs/zlib-1.2.3 virtual/jpeg:*
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.33-full.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=40d801627b7992807ad425ef8834431d
+_md5_=f7c14d3c1c83f51c628cf58ddf51cb85
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r3
deleted file mode 100644
index af0f42fc9dd9..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.5_p1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend test
-DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=5
-HOMEPAGE=http://www.openssh.org/
-IUSE=abi_mips_n32 audit bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f13ae20d72279cd5eb2c8f9f4142e206
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
new file mode 100644
index 000000000000..1f0851f3f024
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=5
+HOMEPAGE=http://www.openssh.org/
+IUSE=abi_mips_n32 audit bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
+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=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=191dfb54ffe73fdc9b9db75e7b95c7e2
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1 b/metadata/md5-cache/net-misc/openssh-7.6_p1
index aaef9addf8b0..ddbdbd83b962 100644
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1
@@ -4,11 +4,11 @@ DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=6
 HOMEPAGE=http://www.openssh.org/
 IUSE=abi_mips_n32 audit bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.6p1-hpnssh14v12.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e5984efa4b9510f138742cb13fca8fc3
+_md5_=7fd29e0d0ab6bf1ceefa45bda66f3178
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r1 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r1
deleted file mode 100644
index daba1a80ff03..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend test
-DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=6
-HOMEPAGE=http://www.openssh.org/
-IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d8bfbc5531de68d51e96c9e997fd672b
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r2 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r2
new file mode 100644
index 000000000000..070f3797f589
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=6
+HOMEPAGE=http://www.openssh.org/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
+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=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2711dc2217e5d04b6b1ec0631cb64e71
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r3
new file mode 100644
index 000000000000..0a4f422c3dff
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=6
+HOMEPAGE=http://www.openssh.org/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
+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=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1-hpnssh14v12-r1.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1+x509-11.1.diff.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2a87b6f68831b7b63f3c5afcbc46395d
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.2-r1 b/metadata/md5-cache/net-misc/quagga-1.2.2-r1
new file mode 100644
index 000000000000..e23030f36443
--- /dev/null
+++ b/metadata/md5-cache/net-misc/quagga-1.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/gawk sys-devel/libtool:2 test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
+EAPI=6
+HOMEPAGE=http://quagga.net/
+IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://nongnu/quagga/quagga-1.2.2.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b3ed3509800b6c26d6839fdfbdae11b4
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r1 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r1
deleted file mode 100644
index ba827676d7b3..000000000000
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=dev-lang/erlang-19.3[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-lang/elixir dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
-DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
-EAPI=6
-HOMEPAGE=http://www.rabbitmq.com/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 MPL-1.1
-RDEPEND=>=dev-lang/erlang-19.3[ssl]
-SLOT=0
-SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.2/rabbitmq-server-3.7.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c6545e204f1172567b135e79b4094a20
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r3 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r3
new file mode 100644
index 000000000000..d65e7c86325a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.2-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst setup
+DEPEND=>=dev-lang/erlang-19.3[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto <dev-lang/elixir-1.6.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=6
+HOMEPAGE=http://www.rabbitmq.com/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 MPL-1.1
+RDEPEND=>=dev-lang/erlang-19.3[ssl]
+SLOT=0
+SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.2/rabbitmq-server-3.7.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=fd3ddd8c2dec60838d61736a45a13dfe
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2-r2 b/metadata/md5-cache/net-misc/rsync-3.1.2-r2
index 00efdf803b2c..10b834d74270 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.2-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.1.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=6
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=91bbe1ff4912a278d06fecd6988c9acb
+_md5_=660281e6d1b8e78addc36b72278ec723
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 b/metadata/md5-cache/net-misc/rsync-3.1.3_pre1
index 384359b05cc0..f742c52dd605 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.3_pre1
+++ b/metadata/md5-cache/net-misc/rsync-3.1.3_pre1
@@ -9,4 +9,4 @@ RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.1.3pre1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ade8802b00cf8adad13271bb93c138d
+_md5_=d027c6fc2105cf362be8d9e36a770afd
diff --git a/metadata/md5-cache/net-misc/sslh-1.19 b/metadata/md5-cache/net-misc/sslh-1.19
new file mode 100644
index 000000000000..008d0e70e0e5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5 dev-lang/perl pcre? ( dev-libs/libpcre:= ) virtual/pkgconfig
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=6
+HOMEPAGE=http://www.rutschle.net/tech/sslh.shtml
+IUSE=caps pcre systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.rutschle.net/tech/sslh/sslh-v1.19.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=be6adbac606e52baac560cbfadf3f35d
diff --git a/metadata/md5-cache/net-misc/sslh-9999 b/metadata/md5-cache/net-misc/sslh-9999
index 3f3783532a28..c368e869d74c 100644
--- a/metadata/md5-cache/net-misc/sslh-9999
+++ b/metadata/md5-cache/net-misc/sslh-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install prepare unpack
 DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5 dev-lang/perl pcre? ( dev-libs/libpcre:= ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
 EAPI=6
@@ -9,4 +9,4 @@ RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-ap
 RESTRICT=test
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d65efe52e4541a2d84eff77df4a2574
+_md5_=be6adbac606e52baac560cbfadf3f35d
diff --git a/metadata/md5-cache/net-misc/wget-1.19.1-r2 b/metadata/md5-cache/net-misc/wget-1.19.1-r2
index 99567755e701..ac68169aa6b6 100644
--- a/metadata/md5-cache/net-misc/wget-1.19.1-r2
+++ b/metadata/md5-cache/net-misc/wget-1.19.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.19.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6d818cd8dba58bb926fb28286fa6974e
+_md5_=0bc67397f5fd864a6601a5fff3568681
diff --git a/metadata/md5-cache/net-misc/wget-1.19.2-r2 b/metadata/md5-cache/net-misc/wget-1.19.2-r2
deleted file mode 100644
index 29fb2c9f08e0..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.19.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.19.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=94f46aa58c1510d421d0e609e9df1d66
diff --git a/metadata/md5-cache/net-misc/wget-1.19.3 b/metadata/md5-cache/net-misc/wget-1.19.3
index 1e2bc2745482..60aa00d0d812 100644
--- a/metadata/md5-cache/net-misc/wget-1.19.3
+++ b/metadata/md5-cache/net-misc/wget-1.19.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.19.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc5679a7650ae646833fe27fe7d1f661
+_md5_=bf3fbdee070ac77dc95cd7f4f2e502b6
diff --git a/metadata/md5-cache/net-misc/wget-1.19.4 b/metadata/md5-cache/net-misc/wget-1.19.4
new file mode 100644
index 000000000000..988f9a465381
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.19.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+DESCRIPTION=Network utility to retrieve files from the WWW
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/wget/
+IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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-3
+RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://gnu/wget/wget-1.19.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bf3fbdee070ac77dc95cd7f4f2e502b6
diff --git a/metadata/md5-cache/net-misc/whois-5.2.20 b/metadata/md5-cache/net-misc/whois-5.2.20
index 4625f4c4f330..1792d29cfe60 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.20
+++ b/metadata/md5-cache/net-misc/whois-5.2.20
@@ -4,11 +4,11 @@ DESCRIPTION=improved Whois Client
 EAPI=6
 HOMEPAGE=https://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.20.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f74420a3974da3120cb9851df28f2fbf
+_md5_=15a1404467a5489c7c6d4a5953b79215
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1 b/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
index cec0ce1dd4cf..d5da69740af9 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-n
 REQUIRED_USE=nsplugin? ( !qt5 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e66d3b21e98648117cb769914dd63579
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.0.1 b/metadata/md5-cache/net-misc/x2goclient-4.1.0.1
index 11a2caf71c69..dadba3cd0cfd 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.0.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-n
 REQUIRED_USE=nsplugin? ( !qt5 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b314edb7ad1bf677082864786bbe2ddd
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.1.0 b/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
index 1626aa778902..1014466c050b 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=The X2Go Qt client
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=ldap
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b26be4e8b081108b01a0834a73631a2
+_md5_=9f1c47892c7b787b9fc3901d5663c7fe
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
index 17a6d3e67e1f..dd3a837c0a42 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
@@ -4,11 +4,11 @@ DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.22.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9064be8ca1ab168a66f61041ce4f79e1
+_md5_=8c8822e22c8fdfc450ec4d6d69e4b80b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.11.15 b/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
index 6c84422e0e6f..02ccd7d767e6 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
@@ -4,11 +4,11 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=6
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2017.11.15/youtube-dl-2017.11.15.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92ece5cbbf5fbb2167c7d1f3f31bd07a
+_md5_=c983e04ec721663f61d66b54731ad9b6
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index e30be75ef82a..cc29e2904708 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.44 b/metadata/md5-cache/net-nds/openldap-2.4.44
index e961e98fa808..83af2deeda4d 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.44
+++ b/metadata/md5-cache/net-nds/openldap-2.4.44
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs smbkrb5passwd kerberos kinit -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1080f13d26998397f6ae110e9acb1440
+_md5_=851a11851541af182bf0d7adfaf7b710
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.44-r1 b/metadata/md5-cache/net-nds/openldap-2.4.44-r1
index 101d531d20fe..cb927162a218 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.44-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.44-r1
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs smbkrb5passwd kerberos kinit pbkdf2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl ) pbkdf2? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c704c97ed05daa5140d637b569beba1b
+_md5_=871ae2344d806ccf03308982cd86051a
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.45 b/metadata/md5-cache/net-nds/openldap-2.4.45
index cbaa9a75f0fa..289f1ef10250 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.45
+++ b/metadata/md5-cache/net-nds/openldap-2.4.45
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl ) pbkdf2? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.45.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e950ea3511653d47f2dcc92a6cf46354
+_md5_=d91f6ab642b185adf622a82dfcdb2d3c
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.3-r1 b/metadata/md5-cache/net-nds/rpcbind-0.2.3-r1
deleted file mode 100644
index 46695dfd97a6..000000000000
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=portmap replacement which supports RPC over various protocols
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/rpcbind/
-IUSE=debug selinux systemd tcpd warmstarts
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
-SLOT=0
-SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=167a21b2f09ca669a0ac5a127aa91fe1
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2 b/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2
deleted file mode 100644
index 5882662d42fa..000000000000
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=portmap replacement which supports RPC over various protocols
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/rpcbind/
-IUSE=debug selinux systemd tcpd warmstarts
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
-SLOT=0
-SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=add720b3e5dd9bb2265eec05bd85a98b
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.4 b/metadata/md5-cache/net-nds/rpcbind-0.2.4
deleted file mode 100644
index cc29b12f09c9..000000000000
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libtirpc-1.0:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=portmap replacement which supports RPC over various protocols
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/rpcbind/
-IUSE=debug selinux systemd tcpd warmstarts
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=net-libs/libtirpc-1.0:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
-SLOT=0
-SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7aa0bc7b08194383186369824ebdc197
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index c223f5b54a0a..2a8b5b9b9881 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/liferea-1.12.1 b/metadata/md5-cache/net-news/liferea-1.12.1
new file mode 100644
index 000000000000..f22597f7eb9b
--- /dev/null
+++ b/metadata/md5-cache/net-news/liferea-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=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-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,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/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+EAPI=6
+HOMEPAGE=https://lzone.de/liferea/
+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 ~ppc ~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 ) 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-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,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/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0
+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/lwindolf/liferea/releases/download/v1.12.1/liferea-1.12.1.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c7e91d27f808c5a1d8a0b17537ebfe3
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index ffad15f04426..36cfdf8c6238 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.15.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
index f9b96aeba27d..3f468b9d4b8b 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
@@ -11,4 +11,4 @@ REQUIRED_USE=http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) l10n_am
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad244d276595b703ec5431187ab79c5f
+_md5_=de1b19f4d46ca1375db54bdc962dcbdf
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.15.1 b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
index 57ce3766a3b9..14743510c498 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f38aede8c61ebb7c0adef3fffcd85230
+_md5_=c4ced6793dd9960e91002f7de56ba2a1
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
index fa9987452356..8d3d70dcbabc 100644
--- a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
@@ -3,12 +3,12 @@ DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] )
 DESCRIPTION=P2P communications protocol
 EAPI=6
 HOMEPAGE=https://bitmessage.org/
-IUSE=libressl ncurses opencl qt4 sound python_targets_python2_7
+IUSE=libressl ncurses opencl sound python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( media-sound/gst123 media-sound/alsa-utils media-sound/mpg123 ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=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[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( media-sound/gst123 media-sound/alsa-utils media-sound/mpg123 ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Bitmessage/PyBitmessage/archive/v0.6.2.tar.gz -> pybitmessage-0.6.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a46f2019705a86137a16f402d92819d4
+_md5_=3ae22dec27632607d5e6e182583edceb
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12 b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
new file mode 100644
index 000000000000..72d910e06f8e
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Resilient, fast and scalable file synchronization tool
+EAPI=6
+HOMEPAGE=https://getsync.com/
+IUSE=pax_kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/tmpfiles
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_i386.deb )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1e5e802533a40cacda3cbb23364c463f
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index b46881e5316b..db4987ee46bf 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=68cc7c565f0febf83581d2a9b16f2046
+_md5_=29098e2ad0dd30e6f9e15d567611fea2
diff --git a/metadata/md5-cache/net-p2p/vuze-5.6.0.0 b/metadata/md5-cache/net-p2p/vuze-5.6.0.0
deleted file mode 100644
index 28fb028995c5..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-5.6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* app-arch/unzip dev-util/desktop-file-utils >=virtual/jdk-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=BitTorrent client in Java, formerly called Azureus
-EAPI=5
-HOMEPAGE=http://www.vuze.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2 BSD
-PDEPEND=~net-p2p/vuze-coreplugins-5.6.0.0
-RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5600/Vuze_5600_source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5d058bdcb68098c3845631023aa9e5f3
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
index f48efe59c349..ed28e5a90d83 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* app-arch/unzip dev-util/desktop-file-utils >=virtual/jdk-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=BitTorrent client in Java, formerly called Azureus
 EAPI=5
@@ -11,4 +11,4 @@ RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0a94a1c6679949c1f29929d996216b57
+_md5_=a63e7baf5cb47e3aa8719129e5408bad
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 966b10b699cc..e46eb28d083c 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cnijfilter2-5.20 b/metadata/md5-cache/net-print/cnijfilter2-5.20
new file mode 100644
index 000000000000..ad33e10ddc81
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IJ Printer Driver
+EAPI=6
+HOMEPAGE=https://www.canon.it/
+KEYWORDS=~amd64 ~x86
+LICENSE=Canon-IJ
+RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/0/0100006900/01/cnijfilter2-source-5.20-1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=40beb934a235b1c6efc6bfb85d853664
diff --git a/metadata/md5-cache/net-print/cups-filters-1.17.9 b/metadata/md5-cache/net-print/cups-filters-1.17.9
index b499e9cf9d6a..dc26bc51a32a 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.17.9
+++ b/metadata/md5-cache/net-print/cups-filters-1.17.9
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.17.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=744e2ddf4c709103523fc489788e3dcb
+_md5_=a95c87e1a136868ab795ab37406ba85b
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
deleted file mode 100644
index 262e14ec851c..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=37358152724ae74ec67fb67b5d9d26dd
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20160504 b/metadata/md5-cache/net-print/foomatic-db-4.0.20160504
deleted file mode 100644
index 53d7edd9e2a5..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20160504
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20160504.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17b5c40b4b85f6eb4ef68bd442cd5e55
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20161101 b/metadata/md5-cache/net-print/foomatic-db-4.0.20161101
deleted file mode 100644
index d99d32f253b2..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20161101
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20161101.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17b5c40b4b85f6eb4ef68bd442cd5e55
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20180126 b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
new file mode 100644
index 000000000000..cc0b398da658
--- /dev/null
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
+EAPI=6
+HOMEPAGE=http://www.linuxprinting.org/foomatic.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20180126.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=d5ff43a592e281736da6d09dc0dfddaa
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
deleted file mode 100644
index fec93b0f4232..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=63bc3f1cbbe69b1a3406ae7f533ec778
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20160504 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20160504
deleted file mode 100644
index 50e4ac3b9d76..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20160504
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20160504.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f24df8df313e23fea9a1a3804b084c0e
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101
deleted file mode 100644
index d1511c8eceed..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20161101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f24df8df313e23fea9a1a3804b084c0e
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
index b050b7ef6e29..c028243e1a42 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20170331.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d8e0e3592dccc852aa3e9b1633da2a71
+_md5_=17d3a401f9e2eeeb94125bd9c78de1f5
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
new file mode 100644
index 000000000000..20f23753632c
--- /dev/null
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=linuxprinting.org PPD files for postscript printers
+EAPI=6
+HOMEPAGE=http://www.linuxprinting.org/foomatic.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20180126.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7f5a5c3827e0ee392c9d6ceaf16946ce
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index fee98020cef8..f4c0c0847ce1 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.27-r1 b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
new file mode 100644
index 000000000000..0809b10f5911
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A full-featured web proxy cache
+EAPI=6
+HOMEPAGE=http://www.squid-cache.org/
+IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
+SLOT=0
+SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e03202ac44803bda624058a384c19c55
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 5725808549f1..358aa1411bab 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.3 b/metadata/md5-cache/net-vpn/openvpn-2.4.3
index 2a349068841a..9ff9f183bc5c 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.3
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=http://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.3.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.3/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d1bb1c110ea28738fe554200dbd09166
+_md5_=1cf6092848ea941dbf699496cc8c0e45
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.3-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.3-r1
index 589cbe837550..56349217991c 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.3-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=http://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.3.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.3/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=76a2ec474f54b5e5306147defb6a704a
+_md5_=fe91bc5b44479b53079c68476bffbb19
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.4 b/metadata/md5-cache/net-vpn/openvpn-2.4.4
index 767d2a89f896..3f734729f2d3 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.4
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=http://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.4.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.4/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1ccb897c175b419f1b0b4a48e34c4f57
+_md5_=f8b542e05184147e1bf7ce3e937cffbb
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1 b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
index 6cf26dffadf9..310bce7ba927 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, suppor
 EAPI=5
 HOMEPAGE=http://www.strongswan.org/
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.6.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ef98404ea11d104a332d4e054df9030c
+_md5_=87ac8ffd8e75bdb8b37f9dd94647419b
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.3.1_alpha b/metadata/md5-cache/net-vpn/tor-0.3.3.1_alpha
new file mode 100644
index 000000000000..c9a715e0174d
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.3.1_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=6
+HOMEPAGE=http://www.torproject.org/
+IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.3.1-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.3.1-alpha.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cd694e8a035f87f025418b23923429d8
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 43dbb299330d..f15c96c3c3ff 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/bluez-5.48-r1 b/metadata/md5-cache/net-wireless/bluez-5.48-r1
new file mode 100644
index 000000000000..9ad9dc0b794d
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.48-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) virtual/pkgconfig test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=6
+HOMEPAGE=http://www.bluez.org
+IUSE=alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
+SLOT=0/3
+SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.48.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=2f54c064c960caa838690ab997d4aff9
diff --git a/metadata/md5-cache/net-wireless/iw-4.14 b/metadata/md5-cache/net-wireless/iw-4.14
new file mode 100644
index 000000000000..7a9a1083866c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iw-4.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/libnl:= virtual/pkgconfig
+DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack
+EAPI=6
+HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/iw
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+RDEPEND=dev-libs/libnl:=
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/iw/iw-4.14.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e99d20e329a44e75663afc9e991f7fbd
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 9ec12bea52fd..7434d3f5edf9 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2 b/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2
deleted file mode 100644
index 1921b12a6a0d..000000000000
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 dev-util/ninja >=dev-util/cmake-3.7.2
-DESCRIPTION=Fast and usable calculator for power users
-EAPI=5
-HOMEPAGE=http://speedcrunch.org/
-IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://github.com/speedcrunch/SpeedCrunch/archive/0.11.tar.gz -> speedcrunch-0.11.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0afec8d7b57c14e590f913aeb7f7b74
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
index 9250517b6fad..bb4e48583464 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and usable calculator for power users
 EAPI=6
 HOMEPAGE=http://speedcrunch.org/
 IUSE=doc l10n_ar l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_en-US l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_he l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sv l10n_tr l10n_uz l10n_vi l10n_zh-CN
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qthelp:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e76fd29155f0861c3703bdfcf3056283
+_md5_=7d654d13232bb858d525a91e92b7265f
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 4add1e0e602b..c7bca2af0609 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/klayout-0.25 b/metadata/md5-cache/sci-electronics/klayout-0.25
deleted file mode 100644
index a2a9cff290ea..000000000000
--- a/metadata/md5-cache/sci-electronics/klayout-0.25
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
-EAPI=6
-HOMEPAGE=http://www.klayout.de/
-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 elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=http://www.klayout.org/downloads/source/klayout-0.25.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=222dd0ab8077b62f37865362de9d41f9
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.25-r2 b/metadata/md5-cache/sci-electronics/klayout-0.25-r2
new file mode 100644
index 000000000000..78eae85f61e8
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/klayout-0.25-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib 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(+)?] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
+EAPI=6
+HOMEPAGE=http://www.klayout.de/
+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 elibc_FreeBSD ruby_targets_ruby23
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib 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(+)?] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=http://www.klayout.org/downloads/source/klayout-0.25.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=af0c6011a97461684ecab629b12e7820
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index f1de9f21c826..25d9303ba0a3 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=6
 HOMEPAGE=http://www.klayout.de/
 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 elibc_FreeBSD ruby_targets_ruby22
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib 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(+)?] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6a1accb4fe1100734c55f8f8c6e5c7a8
+_md5_=ee4060995be9072bc532224d5ad9d26a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 86faeab7ba07..1d4872e077c5 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/chemkit-0.1-r2 b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
index 7874abe90c13..b18633df4a5c 100644
--- a/metadata/md5-cache/sci-libs/chemkit-0.1-r2
+++ b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) 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(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) 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(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Library for chemistry applications
 EAPI=6
 HOMEPAGE=http://www.chemkit.org/
-IUSE=examples python qt4 test python_targets_python2_7 test
+IUSE=examples python test python_targets_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD PSF-2.2
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) 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(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 )
-REQUIRED_USE=python_targets_python2_7 test? ( python qt4 )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/chemkit/chemkit-0.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=652f09f8bb04714caba7252a16d48028
+_md5_=811a9d22b9cf670fce86c09991851f42
diff --git a/metadata/md5-cache/sci-libs/plplot-5.11.1-r1 b/metadata/md5-cache/sci-libs/plplot-5.11.1-r1
deleted file mode 100644
index c04eea5b4385..000000000000
--- a/metadata/md5-cache/sci-libs/plplot-5.11.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) pdl? ( dev-perl/PDL dev-perl/XML-DOM ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qhull? ( media-libs/qhull:0= ) qt4? ( dev-qt/qtgui:4= dev-qt/qtsvg:4= ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.5 dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-2.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Multi-language scientific plotting library
-EAPI=5
-HOMEPAGE=http://plplot.sourceforge.net/
-IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test threads tk truetype wxwidgets X python_targets_python2_7 test elibc_FreeBSD java
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) pdl? ( dev-perl/PDL dev-perl/XML-DOM ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qhull? ( media-libs/qhull:0= ) qt4? ( dev-qt/qtgui:4= dev-qt/qtsvg:4= ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
-SLOT=0/12
-SRC_URI=mirror://sourceforge/plplot/plplot-5.11.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f2a9a3cbe350666a7c80acd73231b80
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2-r1 b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
new file mode 100644
index 000000000000..c5ec8b43d928
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=hdf5? ( sci-libs/hdf5 ) qt5? ( dev-qt/qtgui:5 ) virtual/fortran
+DESCRIPTION=A mesh and field I/O library and scientific database
+EAPI=5
+HOMEPAGE=https://wci.llnl.gov/simulation/computer-codes/silo
+IUSE=hdf5 +silex static-libs qt5 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=hdf5? ( sci-libs/hdf5 ) qt5? ( dev-qt/qtgui:5 ) virtual/fortran
+REQUIRED_USE=silex? ( qt5 )
+SLOT=0
+SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6948d595cd9e98a0169caa766d915e73
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0 b/metadata/md5-cache/sci-libs/vtk-8.1.0
new file mode 100644
index 000000000000..232f11ac3d6f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The Visualization Toolkit
+EAPI=6
+HOMEPAGE=https://www.vtk.org/
+IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD LGPL-2
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	webapp	a76ebd3cb5649737496e8238992dd7ca	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad10efd22190080507d410226a5df85e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 45f76f424912..def49e8fc3fa 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.7 b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
new file mode 100644
index 000000000000..23d4db6bc20e
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=virtual/pkgconfig
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=6
+HOMEPAGE=http://mersenne.org/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
+SLOT=0
+SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b7.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v294b7.linux32.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2c2a188bc87115453c6654c35ee7e402
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 13f1cdf7af52..68a1fc8389f0 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.0.6 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.6
index 09e0e857e1fc..1c6731dee330 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.6
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=6
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~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 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=902844ac384f01b6fbcc9c7aef6e6282
+_md5_=1128eabff8d602e0187a6edeb53a4b2f
diff --git a/metadata/md5-cache/sci-visualization/xyscan-3.3.1-r1 b/metadata/md5-cache/sci-visualization/xyscan-3.3.1-r1
deleted file mode 100644
index ac5b799224be..000000000000
--- a/metadata/md5-cache/sci-visualization/xyscan-3.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=Tool for extracting data points from graphs
-EAPI=6
-HOMEPAGE=http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/
-IUSE=l10n_fr
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/3.31/xyscan-3.31-src.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d9ba58673e21697e4e1f10c8dc9fa1f3
diff --git a/metadata/md5-cache/sci-visualization/xyscan-4.3.0 b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
new file mode 100644
index 000000000000..ffdb92217e3f
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DESCRIPTION=Tool for extracting data points from graphs
+EAPI=6
+HOMEPAGE=http://rhig.physics.yale.edu/~ullrich/software/xyscan/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.30/xyscan-4.30-src.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=86f10e0a1e2fa9c4462e6244a068c372
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 372611216d19..4020c1e44ffc 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/baselayout-2.3 b/metadata/md5-cache/sys-apps/baselayout-2.3
index 2f0fde21054e..aa5fe9e7922f 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.3
+++ b/metadata/md5-cache/sys-apps/baselayout-2.3
@@ -3,9 +3,9 @@ DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
 IUSE=build kernel_linux
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~williamh/dist/baselayout-2.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ad2fba39fd9d84e37b05c8f692ef1a99
+_md5_=b04306e2e6bc1c8a61eee331ac74041b
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
index 08ec422a9d5f..bbfb4578b0f9 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 IUSE=build kernel_linux
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=edd18a21faea0529687209d0ebf5f7a3
+_md5_=f0578cd58d34143dcec2904ef2d7f2c2
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index 946b72ef9a9c..2fea4e14f10d 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -7,4 +7,4 @@ IUSE=build usrmerge kernel_linux
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=08c52ca50ffd12a9e16592955d2b4c75
+_md5_=62a88a91d7a29087029c487d95ac5883
diff --git a/metadata/md5-cache/sys-apps/busybox-1.25.1 b/metadata/md5-cache/sys-apps/busybox-1.25.1
index 7c9d1b74396c..d8cedc2fc7ab 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.25.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.25.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.25.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ede4245755e9b1585b42f998459f490
+_md5_=dc5fe296c1b3dd56b18f2d57b629ebc3
diff --git a/metadata/md5-cache/sys-apps/busybox-1.26.2-r1 b/metadata/md5-cache/sys-apps/busybox-1.26.2-r1
index 688120de3bbe..6e955ad37df2 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.26.2-r1
+++ b/metadata/md5-cache/sys-apps/busybox-1.26.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.26.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=45e7d99df1d8f8450c359130489d92de
+_md5_=3d75337951a6846a90362391762d0636
diff --git a/metadata/md5-cache/sys-apps/busybox-1.27.2 b/metadata/md5-cache/sys-apps/busybox-1.27.2
index 692d8b79649e..ec52e62f45d0 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.27.2
+++ b/metadata/md5-cache/sys-apps/busybox-1.27.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.27.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc37d7f830a7e7bf4b24851967721df5
+_md5_=bd74b400569517727a7e1d567d2072d2
diff --git a/metadata/md5-cache/sys-apps/busybox-1.28.0 b/metadata/md5-cache/sys-apps/busybox-1.28.0
new file mode 100644
index 000000000000..9327e2fe5c0f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/busybox-1.28.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Utilities for rescue and embedded systems
+EAPI=5
+HOMEPAGE=https://www.busybox.net/
+IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !<sys-apps/openrc-0.13 )
+REQUIRED_USE=pam? ( !static )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.busybox.net/downloads/busybox-1.28.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e947e12ce8994c7a1c495be352b01aea
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 707bdf20183e..a0e3992674a0 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2dc35c6ff07637c7e0048cc94a9e0938
+_md5_=e947e12ce8994c7a1c495be352b01aea
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.7 b/metadata/md5-cache/sys-apps/debianutils-4.7
index c35af91d2436..8cf04f526c17 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.7
+++ b/metadata/md5-cache/sys-apps/debianutils-4.7
@@ -3,9 +3,9 @@ DESCRIPTION=A selection of tools from Debian
 EAPI=5
 HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
 IUSE=kernel_linux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2 SMAIL
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=789a64de57e1bc0211b6aa9a3e32ae36
+_md5_=fb84a965d991a48a0baca7d3a0d4c838
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.8.3 b/metadata/md5-cache/sys-apps/debianutils-4.8.3
index aadeaf4e0883..3a1e911c6bab 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.8.3
+++ b/metadata/md5-cache/sys-apps/debianutils-4.8.3
@@ -3,9 +3,9 @@ DESCRIPTION=A selection of tools from Debian
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
 IUSE=kernel_linux static
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2 SMAIL
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ce792726c5e18d224d75b53f775d36b
+_md5_=e6632fdc20ef6e635422d09cca22e435
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.8.4 b/metadata/md5-cache/sys-apps/debianutils-4.8.4
index 4c4851de0615..8905c47d82b6 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.8.4
+++ b/metadata/md5-cache/sys-apps/debianutils-4.8.4
@@ -3,9 +3,9 @@ DESCRIPTION=A selection of tools from Debian
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
 IUSE=+installkernel static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2 SMAIL
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b036eee385c3157f6205c7367cc587f7
+_md5_=9dc9ffd1ea752f49717e7999bc3694c0
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.3 b/metadata/md5-cache/sys-apps/diffutils-3.3
index 49daddaaf48a..12d3cb4e1685 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.3
+++ b/metadata/md5-cache/sys-apps/diffutils-3.3
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.3.tar.xz mirror://gnu/diffutils/diffutils-3.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=eeff9fadeeb40e38b9cfde795960e37d
+_md5_=93db8389b3fc03647c36e55c5696bbb6
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.5 b/metadata/md5-cache/sys-apps/diffutils-3.5
index 849e961f3441..c274a8cf6951 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.5
+++ b/metadata/md5-cache/sys-apps/diffutils-3.5
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.5.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a1b9452e934c01d32fece640891df0e4
+_md5_=9ad36ffff9f06195b89f06389722d7c1
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.6 b/metadata/md5-cache/sys-apps/diffutils-3.6
index b2991ce3db88..1106e1576d9f 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.6
+++ b/metadata/md5-cache/sys-apps/diffutils-3.6
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.6.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc53106871a911a93bac7c345ac62862
+_md5_=da57de843bed392d9b2262555bcf962e
diff --git a/metadata/md5-cache/sys-apps/ed-1.13 b/metadata/md5-cache/sys-apps/ed-1.13
index 8730a1a42420..8ba84c216c30 100644
--- a/metadata/md5-cache/sys-apps/ed-1.13
+++ b/metadata/md5-cache/sys-apps/ed-1.13
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ed/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://fossies.org/linux/privat/ed-1.13.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1f328ea22f04a70fe7b3e4fbdde10267
+_md5_=ff2997433db5c20e5e7546aa8a3b4d6c
diff --git a/metadata/md5-cache/sys-apps/ed-1.14.1a b/metadata/md5-cache/sys-apps/ed-1.14.1a
index 130e5531b2a2..509e4bc093c3 100644
--- a/metadata/md5-cache/sys-apps/ed-1.14.1a
+++ b/metadata/md5-cache/sys-apps/ed-1.14.1a
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://fossies.org/linux/privat/ed-1.14.1a.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=98ec8cd3c780e0410b0e5fac227c267a
+_md5_=d46693cdbb9665499ee74046d2c80b82
diff --git a/metadata/md5-cache/sys-apps/ed-1.14.2 b/metadata/md5-cache/sys-apps/ed-1.14.2
index 571039ae0454..21fe3c23e2d5 100644
--- a/metadata/md5-cache/sys-apps/ed-1.14.2
+++ b/metadata/md5-cache/sys-apps/ed-1.14.2
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://fossies.org/linux/privat/ed-1.14.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd2dc4c3f656604af80ee7560e83791c
+_md5_=2960289be280b759926cc531db20e193
diff --git a/metadata/md5-cache/sys-apps/file-5.32 b/metadata/md5-cache/sys-apps/file-5.32
index 02c49206a56f..034556a45861 100644
--- a/metadata/md5-cache/sys-apps/file-5.32
+++ b/metadata/md5-cache/sys-apps/file-5.32
@@ -4,11 +4,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=6
 HOMEPAGE=https://www.darwinsys.com/file/
 IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=python? ( 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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.32.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf9df3a682388cb8557e3a7d263b489f
+_md5_=d4a40ac352752532cd712afec68b9865
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 955970f31505..7a071cf6217a 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -9,4 +9,4 @@ RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_py
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75476a9218dec50753f7bf27175420a3
+_md5_=5a37473c5aacd233f60aa769545c550e
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.18 b/metadata/md5-cache/sys-apps/findutils-4.5.18
index 3ced51e06bf2..9af73b7700b4 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.18
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.18
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utilities for finding files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/findutils/
 IUSE=debug nls selinux static test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.18.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=65460720ae334f0c653e67cf7ad9379c
+_md5_=a94e8e582453f92b553dce2489bcc099
diff --git a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1 b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
index b7ee9052ebb8..4ea6faffecff 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utilities for finding files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/findutils/
 IUSE=nls selinux static test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=accfe4898e210c1c22c8301ac8894774
+_md5_=3683b6d389ffce1977a4a199778d8f77
diff --git a/metadata/md5-cache/sys-apps/fwupdate-10 b/metadata/md5-cache/sys-apps/fwupdate-10
new file mode 100644
index 000000000000..7d58e4892203
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupdate-10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
+DEPEND=dev-libs/popt >=sys-libs/efivar-32-r1 >=sys-libs/libsmbios-2.3.2 sys-boot/gnu-efi
+DESCRIPTION=Tools for using the ESRT and UpdateCapsule() to apply firmware updates
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/fwupdate
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/popt >=sys-libs/efivar-32-r1 >=sys-libs/libsmbios-2.3.2
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/fwupdate/archive/10.tar.gz -> fwupdate-10.tar.gz
+_eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0aef7863bf286d428f5f7f22f0e1f2cf
diff --git a/metadata/md5-cache/sys-apps/fwupdate-8 b/metadata/md5-cache/sys-apps/fwupdate-8
deleted file mode 100644
index bbfabaad6751..000000000000
--- a/metadata/md5-cache/sys-apps/fwupdate-8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm pretend
-DEPEND=dev-libs/popt sys-libs/efivar >=sys-libs/libsmbios-2.3.2 sys-boot/gnu-efi
-DESCRIPTION=Tools for using the ESRT and UpdateCapsule() to apply firmware updates
-EAPI=6
-HOMEPAGE=https://github.com/rhinstaller/fwupdate
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/popt sys-libs/efivar >=sys-libs/libsmbios-2.3.2
-SLOT=0
-SRC_URI=https://github.com/rhinstaller/fwupdate/archive/8.tar.gz -> fwupdate-8.tar.gz
-_eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=7fb172d64fbe81aad917dfa0676389e5
diff --git a/metadata/md5-cache/sys-apps/gawk-3.1.8 b/metadata/md5-cache/sys-apps/gawk-3.1.8
index 2698be9391eb..f7bbd924aa28 100644
--- a/metadata/md5-cache/sys-apps/gawk-3.1.8
+++ b/metadata/md5-cache/sys-apps/gawk-3.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=2
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=nls
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!>=virtual/awk-1
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-3.1.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=39bbd3e2be6b26f854caa97a7a7fcee6
+_md5_=b695605fc295d4028e07482a6f137585
diff --git a/metadata/md5-cache/sys-apps/gawk-4.0.2 b/metadata/md5-cache/sys-apps/gawk-4.0.2
index c0323422a970..07d9d00d8ae5 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.0.2
+++ b/metadata/md5-cache/sys-apps/gawk-4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=nls readline
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/baselayout-2.0.1 readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.0.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7b9829167cf2ad05299e7eba7d66dce9
+_md5_=c64fc6845bd43ccbee22b5ac3f84bc7d
diff --git a/metadata/md5-cache/sys-apps/gawk-4.1.3 b/metadata/md5-cache/sys-apps/gawk-4.1.3
index 0b8e02d4f419..df4365109800 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.1.3
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=38403712af21ff368f9505aeb7b80992
+_md5_=2224f4d87dc609ef756c055f436ea342
diff --git a/metadata/md5-cache/sys-apps/gawk-4.1.4 b/metadata/md5-cache/sys-apps/gawk-4.1.4
index e73b3d23e485..c6c9a797f29f 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.1.4
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1d9886d0dffbe00f0c43256d63cd39b1
+_md5_=19039e4124efa1b2727f5c7f5f5737ff
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.0 b/metadata/md5-cache/sys-apps/gawk-4.2.0
index 48d238c301e7..f196bd16a0ee 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.2.0
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.2.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7a78e0fdca8d85e9891a7084bd7ac218
+_md5_=297e36234eda5430525afae825d69881
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.12 b/metadata/md5-cache/sys-apps/gentoo-functions-0.12
index 4645df497186..951a4bdc7c25 100644
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.12
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-0.12
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=base functions required by all Gentoo systems
 EAPI=5
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=GPL-2
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-functions/archive/0.12.tar.gz -> gentoo-functions-0.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7058dadce78ca277bc2458c6931d2cb5
+_md5_=6be05bae16e487b32407f64588bf6ec9
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-9999 b/metadata/md5-cache/sys-apps/gentoo-functions-9999
index 41c868c75158..179d248907ea 100644
--- a/metadata/md5-cache/sys-apps/gentoo-functions-9999
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://www.gentoo.org
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=447d985781d499411cb0d20f5ffcf5af
+_md5_=f4e1c58c8085b9e2244d0b3d2137aa47
diff --git a/metadata/md5-cache/sys-apps/grep-2.27-r1 b/metadata/md5-cache/sys-apps/grep-2.27-r1
index 590a67db3e7d..876261f6870b 100644
--- a/metadata/md5-cache/sys-apps/grep-2.27-r1
+++ b/metadata/md5-cache/sys-apps/grep-2.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/grep/
 IUSE=nls pcre static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-2.27.tar.xz mirror://gentoo/grep-2.27.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=231901dc6403ff7caf9916d484cd301a
+_md5_=7d9ab3655418c5fa197667221eb6b680
diff --git a/metadata/md5-cache/sys-apps/grep-3.0 b/metadata/md5-cache/sys-apps/grep-3.0
index 895c15f376b7..46bf7a1c5f23 100644
--- a/metadata/md5-cache/sys-apps/grep-3.0
+++ b/metadata/md5-cache/sys-apps/grep-3.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/grep/
 IUSE=nls pcre static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.0.tar.xz mirror://gentoo/grep-3.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a63f08b9e2700cef7bd9464e3e155540
+_md5_=3d3d6ae8680010f3243a536dd2f6d899
diff --git a/metadata/md5-cache/sys-apps/grep-3.1 b/metadata/md5-cache/sys-apps/grep-3.1
index dd3eeda5e89a..e4c27ceb9fe9 100644
--- a/metadata/md5-cache/sys-apps/grep-3.1
+++ b/metadata/md5-cache/sys-apps/grep-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/grep/
 IUSE=nls pcre static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.1.tar.xz mirror://gentoo/grep-3.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2104511175fb7080d0642e4befe01475
+_md5_=4cc0e1bfc81ffee4dbd1d3023578619f
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.2 b/metadata/md5-cache/sys-apps/groff-1.22.2
index 30e4e29199f6..89663e4a76f7 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.2
+++ b/metadata/md5-cache/sys-apps/groff-1.22.2
@@ -4,10 +4,10 @@ DESCRIPTION=Text formatter used for man pages
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/groff/groff.html
 IUSE=examples X l10n_ja
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.2.tar.gz l10n_ja? ( https://dev.gentoo.org/~naota/patch/groff-1.22.1-japanese.patch.bz2 )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=782e8dcc5eed1705908e8e3ea8562037
+_md5_=6ca7ea2992e715d4dd0c46fe05e334c2
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.3 b/metadata/md5-cache/sys-apps/groff-1.22.3
index f6869840558e..6cfe7f83a3be 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.3
+++ b/metadata/md5-cache/sys-apps/groff-1.22.3
@@ -4,10 +4,10 @@ DESCRIPTION=Text formatter used for man pages
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/groff/groff.html
 IUSE=examples X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b25888cbcb6a8a263932e47296d94de6
+_md5_=3285c8310d16a1c772829c0d3e96b7de
diff --git a/metadata/md5-cache/sys-apps/hd-idle-1.05 b/metadata/md5-cache/sys-apps/hd-idle-1.05
new file mode 100644
index 000000000000..11e93e6873ac
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hd-idle-1.05
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Utility for spinning down hard disks after a period of idle time
+EAPI=6
+HOMEPAGE=http://hd-idle.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hd-idle/hd-idle-1.05.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=27872296f9ed3ccc3049a3e52dc945be
diff --git a/metadata/md5-cache/sys-apps/help2man-1.46.6 b/metadata/md5-cache/sys-apps/help2man-1.46.6
index 2a07f6948d29..610a499f3eb0 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.46.6
+++ b/metadata/md5-cache/sys-apps/help2man-1.46.6
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.46.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fe217b962b3b36906edfbcd59e8a51f3
+_md5_=18480de67d39bf7ae81008431a2065c5
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.4 b/metadata/md5-cache/sys-apps/help2man-1.47.4
index 8965f371e341..ea99523b1122 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.4
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc8fa723b47d4f8e3acb72cad289069c
+_md5_=1d8f648da6ac323dae34b37a110981a6
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.5 b/metadata/md5-cache/sys-apps/help2man-1.47.5
index 55fc86b517fe..5775e7c83e9f 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.5
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.5
@@ -4,9 +4,9 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.5.tar.xz
-_md5_=9566c8c2b9c0794622aba5c764b535cd
+_md5_=78d8c2ee1864e8e79210775b842c367e
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-3.0.8 b/metadata/md5-cache/sys-apps/ipmiutil-3.0.8
new file mode 100644
index 000000000000..c53d94ac39b4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmiutil-3.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/openssl-1:0= virtual/os-headers >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=IPMI Management Utilities
+EAPI=6
+HOMEPAGE=http://ipmiutil.sourceforge.net/
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-1:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-3.0.8.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=37a166af0d3f42d8f60b78b450f3c492
diff --git a/metadata/md5-cache/sys-apps/kbd-1.15.5-r1 b/metadata/md5-cache/sys-apps/kbd-1.15.5-r1
deleted file mode 100644
index 9b4185e2c838..000000000000
--- a/metadata/md5-cache/sys-apps/kbd-1.15.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=pam? ( virtual/pam )
-DESCRIPTION=Keyboard and console utilities
-EAPI=4
-HOMEPAGE=http://freshmeat.net/projects/kbd/
-IUSE=nls pam
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-SRC_URI=ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=45ff72340815cefa11698b739dc6e08c
diff --git a/metadata/md5-cache/sys-apps/kbd-2.0.3 b/metadata/md5-cache/sys-apps/kbd-2.0.3
index b26d0fd3271f..0f8676f1d961 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.0.3
+++ b/metadata/md5-cache/sys-apps/kbd-2.0.3
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) app-arch/gzip
 SLOT=0
-SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-2.0.3.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3ef3f743e2673a332fe741797bd02ce0
+_md5_=e491ddb0cb0ca696e222abbeaca007b5
diff --git a/metadata/md5-cache/sys-apps/kbd-2.0.4 b/metadata/md5-cache/sys-apps/kbd-2.0.4
index a981d126f516..91f496f778ce 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.0.4
+++ b/metadata/md5-cache/sys-apps/kbd-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Keyboard and console utilities
 EAPI=5
 HOMEPAGE=http://kbd-project.org/
 IUSE=nls pam test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) app-arch/gzip
 SLOT=0
-SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9aeab4f560ff20b63dd74595b58e90c2
+_md5_=a367a670fc7f5a33156df3eba90f674a
diff --git a/metadata/md5-cache/sys-apps/kbd-9999 b/metadata/md5-cache/sys-apps/kbd-9999
index 2e8f004cfa96..6005d83cb7be 100644
--- a/metadata/md5-cache/sys-apps/kbd-9999
+++ b/metadata/md5-cache/sys-apps/kbd-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) app-arch/gzip
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f0ed736d407cb15af3ceb29f836659da
+_md5_=e36fe9bee37388429066e335c67963cc
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
index 75cca6dafc06..31e2834df69b 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
@@ -10,5 +10,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.16.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d63ac65d8fa84ba16dcfd8e02ebc3c4f
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=224d9b9e43bc7b263f1518053738133a
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index 4fc0ec5c04c1..b492b67e7352 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=04a2996a0cda54222da3f786c43bae73
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=74771ea9079dbda966b469f947762fcd
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4 b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
index 2b48b4a8956d..343f11a5f5b4 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
@@ -4,9 +4,9 @@ DESCRIPTION=Linux Key Management Utilities
 EAPI=5
 HOMEPAGE=https://people.redhat.com/dhowells/keyutils/
 IUSE=static static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://people.redhat.com/dhowells/keyutils/keyutils-1.5.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=11e87cdd6256f04b79e6f1adc5deec4d
+_md5_=ec2e4f110a88887ea7c615ec536d5c5d
diff --git a/metadata/md5-cache/sys-apps/less-487 b/metadata/md5-cache/sys-apps/less-487
index 14d5db8d0370..fc074bccc7a2 100644
--- a/metadata/md5-cache/sys-apps/less-487
+++ b/metadata/md5-cache/sys-apps/less-487
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz
-_md5_=f7286d17f7aa46c2f61f89530dee8d6c
+_md5_=d7b25729dbda641ca0601c3f72416d73
diff --git a/metadata/md5-cache/sys-apps/less-520 b/metadata/md5-cache/sys-apps/less-520
index faaa860d5afe..39e657db692b 100644
--- a/metadata/md5-cache/sys-apps/less-520
+++ b/metadata/md5-cache/sys-apps/less-520
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=6
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-520.tar.gz
-_md5_=166713ba356bc8fec1a17352d52eaf58
+_md5_=b8d42a8262da5e4d7abf2d2611cff5a7
diff --git a/metadata/md5-cache/sys-apps/less-529 b/metadata/md5-cache/sys-apps/less-529
index 52ab743b0ec7..2a872419141c 100644
--- a/metadata/md5-cache/sys-apps/less-529
+++ b/metadata/md5-cache/sys-apps/less-529
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=6
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-529.tar.gz
-_md5_=86b3961ba5b770f02f6bbcc2f16676ba
+_md5_=185d7fb0cbd5811f09baa914fe17d613
diff --git a/metadata/md5-cache/sys-apps/man-1.6g b/metadata/md5-cache/sys-apps/man-1.6g
index 4b55d78a4ece..32a97cca3782 100644
--- a/metadata/md5-cache/sys-apps/man-1.6g
+++ b/metadata/md5-cache/sys-apps/man-1.6g
@@ -4,10 +4,10 @@ DESCRIPTION=Standard commands to read man pages
 EAPI=2
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
 IUSE=+lzma nls selinux
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools ) !sys-apps/man-db !<app-arch/lzma-4.63 lzma? ( app-arch/xz-utils ) selinux? ( sec-policy/selinux-makewhatis )
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ae1b9a6bb2775a4283e6cbe528c1eda1
+_md5_=25b5fcd4a2cffe25a36091165a1804f1
diff --git a/metadata/md5-cache/sys-apps/man-1.6g-r1 b/metadata/md5-cache/sys-apps/man-1.6g-r1
index 26921a122568..d030500e0ce9 100644
--- a/metadata/md5-cache/sys-apps/man-1.6g-r1
+++ b/metadata/md5-cache/sys-apps/man-1.6g-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard commands to read man pages
 EAPI=4
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
 IUSE=+lzma nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools ) !sys-apps/man-db !<app-arch/lzma-4.63 lzma? ( app-arch/xz-utils ) selinux? ( sec-policy/selinux-makewhatis )
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c5bd17c62f47df61be17322bd452bd9f
+_md5_=e3acb19623b4bcced3fe7cd6b17eae8e
diff --git a/metadata/md5-cache/sys-apps/man2html-1.6g b/metadata/md5-cache/sys-apps/man2html-1.6g
index 5d65ac95ab07..6bb08aaf5d89 100644
--- a/metadata/md5-cache/sys-apps/man2html-1.6g
+++ b/metadata/md5-cache/sys-apps/man2html-1.6g
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Standard commands to read man pages
 EAPI=5
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!sys-apps/man
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f2f5455206fc94b792196a9343d2cb69
+_md5_=248354d87250206da41c001e81fea104
diff --git a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3 b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
index 4870c1d304fd..6b25f4eaf9c0 100644
--- a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
+++ b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
@@ -3,9 +3,9 @@ DESCRIPTION=Miscellaneous files
 EAPI=6
 HOMEPAGE=https://savannah.gnu.org/projects/miscfiles/
 IUSE=minimal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2 unicode
 RDEPEND=!<sys-freebsd/freebsd-share-7.2-r1
 SLOT=0
 SRC_URI=mirror://gnu/miscfiles/miscfiles-1.5.tar.gz https://dev.gentoo.org/~whissi/dist/miscfiles/UnicodeData-10.0.0.txt.xz
-_md5_=757a455410d2a61b87d133b9e3e95559
+_md5_=4b1dce9d2cd5fcf79d0c9ad5eec179ad
diff --git a/metadata/md5-cache/sys-apps/openrc-0.28 b/metadata/md5-cache/sys-apps/openrc-0.28
index c95612d34ef0..a5faf5a38301 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.28
+++ b/metadata/md5-cache/sys-apps/openrc-0.28
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.28.tar.gz -> openrc-0.28.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e83c20825f11e9673f45fc6f68eb5e34
+_md5_=8e4c376e2c7935ef350c7322cd88c28f
diff --git a/metadata/md5-cache/sys-apps/openrc-0.32.1 b/metadata/md5-cache/sys-apps/openrc-0.32.1
index 1d17bb30b2ad..9f288d41825f 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.32.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.32.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.32.1.tar.gz -> openrc-0.32.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=50bad9e44a21e37e8cbb74cecb2e2ca1
+_md5_=33877ba4398bd11def3da03566b0b158
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.11 b/metadata/md5-cache/sys-apps/openrc-0.34.11
index 96896bf2e89d..d8bc4ab6455b 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.34.11
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.11
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.34.11.tar.gz -> openrc-0.34.11.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=21a58d833b1b86ddd087827c058a5336
+_md5_=491208907f35209377075ef03f0eae66
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 8b60eabed800..99d2a63b92a6 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -9,4 +9,4 @@ PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b3822e4a82516512cfcdf5b58bd2a292
+_md5_=5d298bec615fe5e614d8855cdd58eeca
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.13 b/metadata/md5-cache/sys-apps/portage-2.3.13
index c51354b6bbfd..25cc1eb324b1 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.13
+++ b/metadata/md5-cache/sys-apps/portage-2.3.13
@@ -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 +ipc +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.13.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.13.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb25fe067a79dc6198d1d35f8d8617fb
+_md5_=9b649025a0088465d04a38de5143457d
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.19-r1 b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
index 48c006230559..11f2d68c0fac 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.19-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.19-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 +ipc +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 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(-)] ) ) 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.19.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.19.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=317b2b28c7af573916c0fac4f6871b6d
+_md5_=b2f01b6eff19a98875d14151e8548c2a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.6 b/metadata/md5-cache/sys-apps/portage-2.3.6
index 4ea381be3659..5921ad518f3d 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.6
+++ b/metadata/md5-cache/sys-apps/portage-2.3.6
@@ -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 +ipc +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.6.tar.bz2 https://dev.gentoo.org/~dolsen/releases/portage/portage-2.3.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a320c5e92fe98b8e3fbae9052b239137
+_md5_=030b798e79145983f4269d295388a744
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.8 b/metadata/md5-cache/sys-apps/portage-2.3.8
index d82ac68b8a45..49789054fd62 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.8
+++ b/metadata/md5-cache/sys-apps/portage-2.3.8
@@ -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 +ipc +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f22d45a4f477dd0cbd2fb883ac26f38f
+_md5_=1185660bdebc508b93738bde149a51cd
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 752171ffae0f..5708bb2cf137 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -3,11 +3,11 @@ DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_tar
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc +ipc +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=build doc epydoc +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
 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(-)] ) ) 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(-)]
+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(-)] ) ) 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 rsync-verify? ( >=app-portage/gemato-10 app-crypt/gentoo-keys ) selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0460e3d9109b1caf852e3543f860ed9c
+_md5_=988020f993194a35351614463948a36f
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r3 b/metadata/md5-cache/sys-apps/sandbox-2.10-r3
index 602a4fd6b703..709652f88007 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r3
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r3
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5af5c50d4d8dfc45cc9af51dbf4fffa6
+_md5_=9f7a43355af426c8b652ba1bc2aee702
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r4 b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
index a9560dd5e736..0dde4a7a6d44 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=25fbfa75cbe6c6b7da1bd59c8a69d63d
+_md5_=798fb135844d3386ae0f3903ea2ee723
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.12 b/metadata/md5-cache/sys-apps/sandbox-2.12
index dca322503f1a..c6dcbc94e046 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.12
+++ b/metadata/md5-cache/sys-apps/sandbox-2.12
@@ -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 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c3e5ad7aa633c1bce7a66f1b8a3c5427
+_md5_=584a0dc1da0f071a204d0f6137503ca7
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.2 b/metadata/md5-cache/sys-apps/sed-4.2.2
index fc28bd5b7f11..e127ebd61e8b 100644
--- a/metadata/md5-cache/sys-apps/sed-4.2.2
+++ b/metadata/md5-cache/sys-apps/sed-4.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Super-useful stream editor
 EAPI=5
 HOMEPAGE=http://sed.sourceforge.net/
 IUSE=acl nls selinux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.2.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7d4d5c0631d3ab2f349045b199ae9469
+_md5_=7b6cb33860f13b60892a63831daa1f51
diff --git a/metadata/md5-cache/sys-apps/sed-4.3-r1 b/metadata/md5-cache/sys-apps/sed-4.3-r1
index 89bb1613e83f..50ea0b30fd50 100644
--- a/metadata/md5-cache/sys-apps/sed-4.3-r1
+++ b/metadata/md5-cache/sys-apps/sed-4.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Super-useful stream editor
 EAPI=5
 HOMEPAGE=http://sed.sourceforge.net/
 IUSE=acl nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2acb10f0e63d2e1a014fe7c8a66e2a1d
+_md5_=b33e54c011752905394bdc38eb255a62
diff --git a/metadata/md5-cache/sys-apps/sed-4.4 b/metadata/md5-cache/sys-apps/sed-4.4
index 082661c1def0..233c3f4343df 100644
--- a/metadata/md5-cache/sys-apps/sed-4.4
+++ b/metadata/md5-cache/sys-apps/sed-4.4
@@ -4,10 +4,10 @@ DESCRIPTION=Super-useful stream editor
 EAPI=5
 HOMEPAGE=http://sed.sourceforge.net/
 IUSE=acl nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1bdc6db364261e56692b676b14b08821
+_md5_=035414426e25edb8b86cf21907f069e4
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
index 6af5d61fd31e..0e22e05464b4 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r5
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -4,7 +4,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	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	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ef9b6db90b254ae365032c65bb58d9a5
+_md5_=2ca63c655f6c8a7aa68412f0df3f8c8b
diff --git a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1 b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
index eb4f742565c2..6768e82c20b4 100644
--- a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
+++ b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
@@ -3,10 +3,10 @@ DESCRIPTION=TCP Wrappers
 EAPI=4
 HOMEPAGE=ftp://ftp.porcupine.org/pub/security/index.html
 IUSE=ipv6 netgroups static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=tcp_wrappers_license
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-22.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b3ccd98415fb802cb665058c44228f96
+_md5_=876de989c2a96dc00185668ba91bf93d
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.1 b/metadata/md5-cache/sys-apps/texinfo-6.1
index 3ab7c6b81099..d32bf1d1722f 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.1
+++ b/metadata/md5-cache/sys-apps/texinfo-6.1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=80ab89a85c1773f1afa2756b95d96849
+_md5_=03abad89fc4d1748291251379377cc7b
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.3 b/metadata/md5-cache/sys-apps/texinfo-6.3
index ad4b805e3b00..fb81f9c96a98 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.3
+++ b/metadata/md5-cache/sys-apps/texinfo-6.3
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d8a87a785b21791611b1d61c3c72dbf
+_md5_=03abad89fc4d1748291251379377cc7b
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.4 b/metadata/md5-cache/sys-apps/texinfo-6.4
index bd614fb87da5..09f964eb9b54 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.4
+++ b/metadata/md5-cache/sys-apps/texinfo-6.4
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=59638d108f158b1e34958c3d0a598f2c
+_md5_=10e2577c231cd359da0452233d4a80a9
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.5 b/metadata/md5-cache/sys-apps/texinfo-6.5
index 3e33c47cb961..3fa4e08e6a12 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.5
+++ b/metadata/md5-cache/sys-apps/texinfo-6.5
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d720e228ec40a64b6a6bf2f77c3917d3
+_md5_=427cf5257aa766ea479c6d8f7a43f28c
diff --git a/metadata/md5-cache/sys-apps/tuxonice-userui-1.1-r2 b/metadata/md5-cache/sys-apps/tuxonice-userui-1.1-r2
deleted file mode 100644
index 0ab40d7e42c7..000000000000
--- a/metadata/md5-cache/sys-apps/tuxonice-userui-1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=fbsplash? ( media-libs/freetype:2= media-libs/libmng:0= media-libs/libpng:0= virtual/jpeg:0= )
-DESCRIPTION=User Interface for TuxOnIce
-EAPI=5
-HOMEPAGE=http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/Tuxonice-Userui
-IUSE=fbsplash
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=fbsplash? ( media-libs/freetype:2= media-libs/libmng:0= media-libs/libpng:0= virtual/jpeg:0= )
-SLOT=0
-SRC_URI=http://tuxonice.net/files/tuxonice-userui-1.1.tar.gz -> tuxonice-userui-1.1.tar mirror://debian/pool/main/t/tuxonice-userui/tuxonice-userui_1.1-2~exp1.debian.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97a8aed981476480a34ba934c43fe5cf
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.30.2 b/metadata/md5-cache/sys-apps/util-linux-2.30.2
index bbcb01245dc7..d98a7849ca5d 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.30.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.30.2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2 !<sys-apps/s390-tools-1.36.1-r1
+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] ) !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.3-r2 !<sys-apps/s390-tools-1.36.1-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.30/util-linux-2.30.2.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ae765f525dc470c4c20142e7b5f45cbf
+_md5_=f005eb7d64d92ec8a755856ff42db56a
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31-r1 b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
index cf1947e2cac5..5b722142e550 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.31-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1 !<sys-apps/s390-tools-1.36.1-r1
+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 !<sys-apps/s390-tools-1.36.1-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6409867759e2b99d1c6b1509fce2cd96
+_md5_=a87c8d495f32c97d0662bb2c32d7550f
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31.1 b/metadata/md5-cache/sys-apps/util-linux-2.31.1
index 4a5377f4ad5b..c32411545526 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.31.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1 !<sys-apps/s390-tools-1.36.1-r1
+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 !<sys-apps/s390-tools-1.36.1-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d9874de4750aa497712677f5bf77717a
+_md5_=acab5767cdb375e1fca561d598ce68e4
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 020f624cca48..f78ebf609960 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=761aef43ca1959a2cdad2df0cf14499e
+_md5_=fd86af722518e334ae68c69cea2207d0
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
index 095a38b39fa7..cc294a54d026 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r2
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=5
 HOMEPAGE=http://www.xinetd.org/
 IUSE=perl rpc tcpd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=94f4347dbe7278e6d22c8e6a2eedaaeb
+_md5_=efe9059a0312b1125a62507b3dc50bad
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
index 3475b20635a0..957ffdd38fa1 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=5
 HOMEPAGE=http://www.xinetd.org/ https://github.com/xinetd-org/xinetd
 IUSE=perl rpc tcpd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ccdaa7a2af286a90cf632bcf39bd71b
+_md5_=74ec3c070bcdd1352b57ecb0487252c3
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 90949c3a8d80..d9350655fb4c 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-235.2 b/metadata/md5-cache/sys-auth/elogind-235.2
deleted file mode 100644
index b5ff72b54985..000000000000
--- a/metadata/md5-cache/sys-auth/elogind-235.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=The systemd project's logind, extracted to a standalone package
-EAPI=6
-HOMEPAGE=https://github.com/elogind/elogind
-IUSE=+acl debug doc +pam +policykit selinux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=CC0-1.0 LGPL-2.1+ public-domain
-PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
-RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
-SLOT=0
-SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1f9cd794ae120aa2d140afb71d60f67
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.11 b/metadata/md5-cache/sys-auth/nss-mdns-0.11
new file mode 100644
index 000000000000..b60640973c20
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Name Service Switch module for Multicast DNS
+EAPI=6
+HOMEPAGE=https://github.com/lathiat/nss-mdns
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.11/nss-mdns-0.11.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f855c5438c8d2e0b8eeef20fd14c8dd8
diff --git a/metadata/md5-cache/sys-auth/openpam-20140912 b/metadata/md5-cache/sys-auth/openpam-20140912
index 4c8ca6f8527d..202c7b2fc93e 100644
--- a/metadata/md5-cache/sys-auth/openpam-20140912
+++ b/metadata/md5-cache/sys-auth/openpam-20140912
@@ -4,11 +4,11 @@ DESCRIPTION=Open source PAM library
 EAPI=5
 HOMEPAGE=http://www.openpam.org/
 IUSE=debug vim-syntax abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20140912.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3eadbca13785214ae4a6e13024f90451
+_md5_=4e07fa8f4b8654d8cb0fa2d62941e11d
diff --git a/metadata/md5-cache/sys-auth/openpam-20140912-r1 b/metadata/md5-cache/sys-auth/openpam-20140912-r1
index 1d026e6ca040..f6f704c233c8 100644
--- a/metadata/md5-cache/sys-auth/openpam-20140912-r1
+++ b/metadata/md5-cache/sys-auth/openpam-20140912-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Open source PAM library
 EAPI=5
 HOMEPAGE=http://www.openpam.org/
 IUSE=debug vim-syntax abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20140912.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f9ddbede237b978daf7d3c1234d92aaa
+_md5_=c481a3487c38158cd96b61593f402612
diff --git a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1 b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
index b298194231a3..7e8312ad7564 100644
--- a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Create per-user private temporary directories during login
 EAPI=4
 HOMEPAGE=http://www.openwall.com/pam/
 IUSE=selinux +prevent-removal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=virtual/pam selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3faf887ff0d36cab82918b560c971a6a
+_md5_=d5bb8fec5960e599ce22b385973e6956
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
index 437ded6d424a..908c6081d37c 100644
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
+++ b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
@@ -3,10 +3,10 @@ DEPEND=virtual/pam
 DESCRIPTION=Password strength checking for PAM aware password changing programs
 EAPI=0
 HOMEPAGE=http://www.openwall.com/passwdqc/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1877ebf1111be4c2c6648efa892a244a
+_md5_=f419706d0811cba7815b33e940fab79e
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
index 18215a7c46e7..be114897f4a3 100644
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
+++ b/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
@@ -3,8 +3,8 @@ DEPEND=sys-auth/passwdqc[pam]
 DESCRIPTION=Stub ebuild to help migrate to newer package name
 EAPI=5
 HOMEPAGE=http://www.openwall.com/passwdqc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=sys-auth/passwdqc[pam]
 SLOT=0
-_md5_=7dd81599ab2ee3a5724b06c70e9a3334
+_md5_=0d77dbb2d9631fcac6d7adef29bd83d4
diff --git a/metadata/md5-cache/sys-auth/pambase-20101024-r2 b/metadata/md5-cache/sys-auth/pambase-20101024-r2
index 0cac56de27a5..962c564da266 100644
--- a/metadata/md5-cache/sys-auth/pambase-20101024-r2
+++ b/metadata/md5-cache/sys-auth/pambase-20101024-r2
@@ -4,11 +4,11 @@ DESCRIPTION=PAM base configuration files
 EAPI=4
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=debug +cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-0.99.9.0-r1 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) cracklib? ( >=sys-libs/pam-0.99[cracklib] ) consolekit? ( >=sys-auth/consolekit-0.3[pam] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] ) selinux? ( >=sys-libs/pam-0.99[selinux] ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) mktemp? ( sys-auth/pam_mktemp ) pam_ssh? ( sys-auth/pam_ssh ) sha512? ( >=sys-libs/pam-1.0.1 ) pam_krb5? ( || ( >=sys-libs/pam-1.1.0 sys-auth/openpam ) >=sys-auth/pam_krb5-4.3 ) !<sys-freebsd/freebsd-pam-modules-6.2-r1 !<sys-libs/pam-0.99.9.0-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/pambase/pambase-20101024.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ed228c9b926eb343aed798a7721783ad
+_md5_=fb5b55737bda661de4803fc7fe504682
diff --git a/metadata/md5-cache/sys-auth/pambase-20120417-r3 b/metadata/md5-cache/sys-auth/pambase-20120417-r3
index b4fa3961aafb..0e47c307dc02 100644
--- a/metadata/md5-cache/sys-auth/pambase-20120417-r3
+++ b/metadata/md5-cache/sys-auth/pambase-20120417-r3
@@ -4,11 +4,11 @@ DESCRIPTION=PAM base configuration files
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( >=sys-auth/consolekit-0.4.5_p2012[pam] ) cracklib? ( >=sys-libs/pam-1.1.3[cracklib] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) >=sys-auth/pam_krb5-4.3 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) selinux? ( >=sys-libs/pam-1.1.3[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( >=sys-apps/systemd-44-r1[pam] ) !<sys-apps/shadow-4.1.5-r1 !<sys-freebsd/freebsd-pam-modules-6.2-r1 !<sys-libs/pam-0.99.9.0-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/pambase/pambase-20120417.tar.bz2 https://dev.gentoo.org/~phajdan.jr/pambase/pambase-20120417.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=df0718ba51031890426cd02a53266007
+_md5_=efed3d1e69bbab15845928503bfdc110
diff --git a/metadata/md5-cache/sys-auth/pambase-20140313 b/metadata/md5-cache/sys-auth/pambase-20140313
index 90b0350c6cc5..5f16abf34537 100644
--- a/metadata/md5-cache/sys-auth/pambase-20140313
+++ b/metadata/md5-cache/sys-auth/pambase-20140313
@@ -4,11 +4,11 @@ DESCRIPTION=PAM base configuration files
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( >=sys-auth/consolekit-0.4.6[pam] ) cracklib? ( >=sys-libs/pam-1.1.3[cracklib] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) >=sys-auth/pam_krb5-4.3 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) selinux? ( >=sys-libs/pam-1.1.3[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( >=sys-apps/systemd-204[pam] ) !<sys-apps/shadow-4.1.5-r1 !<sys-freebsd/freebsd-pam-modules-6.2-r1 !<sys-libs/pam-0.99.9.0-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/pambase-20140313.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a69c752683213353ea7272549d4c9bed
+_md5_=468869acebb66d4a419fe90458743b70
diff --git a/metadata/md5-cache/sys-auth/pambase-20150213 b/metadata/md5-cache/sys-auth/pambase-20150213
index c96bebfc2404..5ee425096f06 100644
--- a/metadata/md5-cache/sys-auth/pambase-20150213
+++ b/metadata/md5-cache/sys-auth/pambase-20150213
@@ -4,11 +4,11 @@ DESCRIPTION=PAM base configuration files
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit +cracklib debug gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( >=sys-auth/consolekit-0.4.6[pam] ) cracklib? ( sys-libs/pam[cracklib] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) >=sys-auth/pam_krb5-4.3 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( >=sys-apps/systemd-204[pam] ) !<sys-apps/shadow-4.1.5-r1 !<sys-freebsd/freebsd-pam-modules-6.2-r1 !<sys-libs/pam-0.99.9.0-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vapier/dist/pambase-20150213.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c58e78a3c79da2a68d29d5123a77f1ad
+_md5_=769849e281fa1977a7aa474d72e044d3
diff --git a/metadata/md5-cache/sys-auth/pambase-20150213-r1 b/metadata/md5-cache/sys-auth/pambase-20150213-r1
index c76117cbf6d7..e9550d466446 100644
--- a/metadata/md5-cache/sys-auth/pambase-20150213-r1
+++ b/metadata/md5-cache/sys-auth/pambase-20150213-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PAM base configuration files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( sys-auth/consolekit[pam] ) cracklib? ( sys-libs/pam[cracklib] ) elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) sys-auth/pam_krb5 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( sys-auth/pam_passwdqc ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( sys-apps/systemd[pam] )
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vapier/dist/pambase-20150213.tar.xz
-_md5_=9bb3fb230d664785daa20883f2047616
+_md5_=c6d0fcfb0858622e79620492d10eebf5
diff --git a/metadata/md5-cache/sys-auth/passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/passwdqc-1.3.0
index bec53df3b768..d495c58802ad 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-1.3.0
+++ b/metadata/md5-cache/sys-auth/passwdqc-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=5
 HOMEPAGE=http://www.openwall.com/passwdqc/
 IUSE=pam utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=pam? ( virtual/pam !<sys-auth/pam_passwdqc-1.3.0 )
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-1.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0c123c40784571ff216a98c2ea070c81
+_md5_=eb29fb75534ecc924d3ee774b7110781
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 7ec2dae686b0..facc8419473c 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/blktrace-1.2.0 b/metadata/md5-cache/sys-block/blktrace-1.2.0
new file mode 100644
index 000000000000..470d4034ff4f
--- /dev/null
+++ b/metadata/md5-cache/sys-block/blktrace-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=dev-libs/libaio sys-kernel/linux-headers doc? ( virtual/latex-base || ( >=app-text/texlive-core-2014 app-text/dvipdfm ) )
+DESCRIPTION=show detailed info about what is happening on a block device io queue
+EAPI=6
+HOMEPAGE=http://git.kernel.dk/cgit/blktrace/
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a744ed521c5510041155a41e43ca351a
diff --git a/metadata/md5-cache/sys-block/megactl-0.4.1-r1 b/metadata/md5-cache/sys-block/megactl-0.4.1-r1
deleted file mode 100644
index 51925435cff7..000000000000
--- a/metadata/md5-cache/sys-block/megactl-0.4.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=LSI MegaRAID control utility
-EAPI=2
-HOMEPAGE=https://sourceforge.net/projects/megactl/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/megactl/megactl-0.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e835ee49c0e7d48608bf089cdcb4cab
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8254af09e131..fc4b89b3c890 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.2
new file mode 100644
index 000000000000..630e20d8420c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.2
new file mode 100644
index 000000000000..b2c93857501f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.2
new file mode 100644
index 000000000000..78fc20bb7ffd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.2
new file mode 100644
index 000000000000..82ebe462154b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.2 b/metadata/md5-cache/sys-cluster/kubectl-1.9.2
new file mode 100644
index 000000000000..6f9293c6164c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.2 b/metadata/md5-cache/sys-cluster/kubelet-1.9.2
new file mode 100644
index 000000000000..27891e6ea56a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.2.tar.gz -> kubernetes-1.9.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
deleted file mode 100644
index db3601932744..000000000000
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Pacemaker CRM
-EAPI=5
-HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl cman heartbeat smtp snmp static-libs python_targets_python2_7
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.12.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2e3885ce9ab36b05c20fdd6c4737fc6b
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.14 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.14
deleted file mode 100644
index 5d723045a154..000000000000
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Pacemaker CRM
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl cman heartbeat smtp snmp static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.14.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=742e2b22c1b2fd688d1634ad211c249e
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index 72c8c57fe208..adad4cdb1cd7 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=OpenVZ ConTainers control utility
 EAPI=5
 HOMEPAGE=http://openvz.org/
 IUSE=+ploop +vzmigrate
-KEYWORDS=amd64 ~ppc64 x86 -amd64-fbsd -sparc-fbsd -x86-fbsd
+KEYWORDS=amd64 ~ppc64 x86 -amd64-fbsd -x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 ploop? ( >=sys-cluster/ploop-1.13 sys-block/parted sys-fs/quota dev-libs/libxml2 ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk ) virtual/udev sys-apps/attr
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=008f040332c9e3e4f56a5c6983f66a9d
+_md5_=767cf1c299446e147d8b21c0991b4749
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 14c28c315e13..d8d65d24476c 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/autoconf-2.13 b/metadata/md5-cache/sys-devel/autoconf-2.13
index 8d819ee09089..d8a4ba681f3b 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.13
+++ b/metadata/md5-cache/sys-devel/autoconf-2.13
@@ -4,10 +4,10 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=userland_BSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/texinfo-4.3 =sys-devel/m4-1.4* dev-lang/perl >=sys-devel/autoconf-wrapper-13
 SLOT=2.1
 SRC_URI=mirror://gnu/autoconf/autoconf-2.13.tar.gz
 _eclasses_=toolchain-autoconf	f81999e77b1ca74160d9370a7ce9c6cf
-_md5_=4cf28585a432579ceeb5f509e0529a94
+_md5_=5c9299a362ffd3147641183ea1bc0f5b
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69-r4 b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
index 2d3fa4f38cc1..640b73492c27 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r4
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.69:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=2.69
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=toolchain-autoconf	f81999e77b1ca74160d9370a7ce9c6cf
-_md5_=bc7e5a07ba484e7621333b4b79d7bb12
+_md5_=9f2d11fc676699064dedbbad2149dbdb
diff --git a/metadata/md5-cache/sys-devel/autoconf-9999 b/metadata/md5-cache/sys-devel/autoconf-9999
index fac376ca2f05..c9aebf459a86 100644
--- a/metadata/md5-cache/sys-devel/autoconf-9999
+++ b/metadata/md5-cache/sys-devel/autoconf-9999
@@ -9,4 +9,4 @@ PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-9999:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=9999
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	toolchain-autoconf	f81999e77b1ca74160d9370a7ce9c6cf
-_md5_=ab5eec4a874023200a0e657299a87436
+_md5_=d9156623a46588b8aa4ec395ff639b43
diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-13 b/metadata/md5-cache/sys-devel/autoconf-wrapper-13
index 339b92769d47..02058c95b2f8 100644
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-13
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-13
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=wrapper for autoconf to manage multiple autoconf versions
 EAPI=0
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d789b97b5bb16bf61ec63442596e8f24
+_md5_=438c861ad3de9a529aa4394a2a2b1987
diff --git a/metadata/md5-cache/sys-devel/automake-1.10.3-r2 b/metadata/md5-cache/sys-devel/automake-1.10.3-r2
index db63f3b0fc64..62a9dc8d3b22 100644
--- a/metadata/md5-cache/sys-devel/automake-1.10.3-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.10.3-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.10
 SRC_URI=mirror://gnu/automake/automake-1.10.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e5189496196d77ec31230fcff29de0dd
+_md5_=97f3cfa18fcaf1c9bed24002f56b23d5
diff --git a/metadata/md5-cache/sys-devel/automake-1.11.6-r2 b/metadata/md5-cache/sys-devel/automake-1.11.6-r2
index f6345aa1629c..5c97ab01e4e2 100644
--- a/metadata/md5-cache/sys-devel/automake-1.11.6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.11.6-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.11
 SRC_URI=mirror://gnu/automake/automake-1.11.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ddf54d8cb2e547c297a9a63d85798e1
+_md5_=6d985d193a04a31b44deb63bf965a702
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6 b/metadata/md5-cache/sys-devel/automake-1.12.6
index e250f246dbfa..dbe95b7cc416 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6a41811b7ab6c434394301dc57d98d5c
+_md5_=e2230be9b0fcdc2782a996b896ef5a97
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6-r1 b/metadata/md5-cache/sys-devel/automake-1.12.6-r1
index e04ce39147d1..1135e6854c57 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=84befe7cdb7b13bd14a64bb1ddd2d3f2
+_md5_=dcf57b31729780d863e070c5c986a5d9
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r1 b/metadata/md5-cache/sys-devel/automake-1.13.4-r1
index 539b23a6c7c6..0eeb28543698 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a9f27e5e7ff638546b36eb0167ddd478
+_md5_=c39265a3946c1c41c9fcb039c8034907
diff --git a/metadata/md5-cache/sys-devel/automake-1.14.1-r1 b/metadata/md5-cache/sys-devel/automake-1.14.1-r1
index 045bdff2f892..3e9cd396530c 100644
--- a/metadata/md5-cache/sys-devel/automake-1.14.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.14.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.14
 SRC_URI=mirror://gnu/automake/automake-1.14.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.14.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c19d8f21412235044e6c7b73fc3756fb
+_md5_=280fef76ed6d64c629e78a2fd34703f4
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r1 b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
index 7883611e3909..63d245501d79 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:*
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a6d2fc3950c9fb2239703cbb309b9d76
+_md5_=0efb3af745e16fe16cc5e71b41bce553
diff --git a/metadata/md5-cache/sys-devel/automake-1.4_p6-r2 b/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
index d73b4dcfcecf..5f483d382cea 100644
--- a/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.4
 SRC_URI=mirror://gnu/automake/automake-1.4-p6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=93b01ca15fd6a220b8df968a858a00e5
+_md5_=ac538bcd49e80e195673ccfb5c5c62d3
diff --git a/metadata/md5-cache/sys-devel/automake-1.5-r2 b/metadata/md5-cache/sys-devel/automake-1.5-r2
index 0cf79a810cc3..d9179b8544a9 100644
--- a/metadata/md5-cache/sys-devel/automake-1.5-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.5-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.5
 SRC_URI=mirror://gnu/automake/automake-1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4bf74ec990d018db3258dab0afb305b1
+_md5_=47d437221366474c0599f85754939cac
diff --git a/metadata/md5-cache/sys-devel/automake-1.6.3-r2 b/metadata/md5-cache/sys-devel/automake-1.6.3-r2
index 5a2ac4cbbf19..f5d273c54345 100644
--- a/metadata/md5-cache/sys-devel/automake-1.6.3-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.6.3-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.6
 SRC_URI=mirror://gnu/automake/automake-1.6.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b57a823b72a9ae5aa481c9e870c171d0
+_md5_=d82b29ec1866a44b7a979af9282c73af
diff --git a/metadata/md5-cache/sys-devel/automake-1.7.9-r3 b/metadata/md5-cache/sys-devel/automake-1.7.9-r3
index 8845f2199e64..d626169deb27 100644
--- a/metadata/md5-cache/sys-devel/automake-1.7.9-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.7.9-r3
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.7
 SRC_URI=mirror://gnu/automake/automake-1.7.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a1215f4def86dacfac7da84c9b2bc7a0
+_md5_=4d4395841007ecf75771a2cb17d5372b
diff --git a/metadata/md5-cache/sys-devel/automake-1.8.5-r5 b/metadata/md5-cache/sys-devel/automake-1.8.5-r5
index 521e7a0d7bd8..c0af677321f0 100644
--- a/metadata/md5-cache/sys-devel/automake-1.8.5-r5
+++ b/metadata/md5-cache/sys-devel/automake-1.8.5-r5
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.8
 SRC_URI=mirror://gnu/automake/automake-1.8.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=19d745f9b1e0a7637abe20ab92547125
+_md5_=6a5a4b1e39f3d0ceb8db6a6fb1d40ca0
diff --git a/metadata/md5-cache/sys-devel/automake-1.9.6-r4 b/metadata/md5-cache/sys-devel/automake-1.9.6-r4
index 6c21a2d8b3fd..9011d3d3c7b2 100644
--- a/metadata/md5-cache/sys-devel/automake-1.9.6-r4
+++ b/metadata/md5-cache/sys-devel/automake-1.9.6-r4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 >
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
 SLOT=1.9
 SRC_URI=mirror://gnu/automake/automake-1.9.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4e3ba760f0f128c3ba5dfb31aa2bf6f7
+_md5_=518da895c2ed26d9950bee8f6f5ae5d9
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index 610eb8fed71d..79a8c0fd0c86 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=9999
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb2dea6d5f23dcdcc7601ec62a203f45
+_md5_=57731dd18578f2657c8cf256b01c7294
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-10 b/metadata/md5-cache/sys-devel/automake-wrapper-10
index 9edbb89086f3..2d9e3b5df919 100644
--- a/metadata/md5-cache/sys-devel/automake-wrapper-10
+++ b/metadata/md5-cache/sys-devel/automake-wrapper-10
@@ -2,7 +2,7 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=wrapper for automake to manage multiple automake versions
 EAPI=4
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=0
-_md5_=c082bb3a4e850ed8b8b8778ab1dec3e2
+_md5_=b73b973d236ede41122abda01c46d79f
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 616e8ee56563..59a724722cf7 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Handy console-based calculator utility
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
 IUSE=libedit readline static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5c30b405fd6077c97ef090ed6aebb0d0
+_md5_=6a8706c73e9d7aaad6389eb2cd95bbd8
diff --git a/metadata/md5-cache/sys-devel/bc-1.07.1-r1 b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
index 98e6c3783b3c..95db6e50ae37 100644
--- a/metadata/md5-cache/sys-devel/bc-1.07.1-r1
+++ b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Handy console-based calculator utility
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
 IUSE=libedit readline static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
 SLOT=0
 SRC_URI=mirror://gnu/bc/bc-1.07.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=38df0107b4b75691ad4444b0aab66444
+_md5_=b03220cf7f70c96563fc7272a12eff7a
diff --git a/metadata/md5-cache/sys-devel/binutils-2.25.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
index d97d03ccac43..01e93cca6f80 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=4
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla zlib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
 SLOT=2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.25.1-patches-1.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6b6b35ff56af59982f2c6fdffa8414b5
+_md5_=2620a73e812a3571d5ae12f3c99a619d
diff --git a/metadata/md5-cache/sys-devel/binutils-2.26.1 b/metadata/md5-cache/sys-devel/binutils-2.26.1
index 5644cf4dbe6f..b2c7c82cc5e5 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.26.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.26.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.26.1
 SRC_URI=mirror://gnu/binutils/binutils-2.26.1.tar.bz2 mirror://gentoo/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.26.1-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f1f8c0d541091501e2d049f6668be0bf
+_md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.27-r1 b/metadata/md5-cache/sys-devel/binutils-2.27-r1
index 33f3854dbacf..2363b80dec21 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.27-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.27-patches-1.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3fc99d09f5cfce3fd507c28254c8905c
+_md5_=22bf9ba2542cb6513941873b9fdfd6b4
diff --git a/metadata/md5-cache/sys-devel/binutils-2.28.1 b/metadata/md5-cache/sys-devel/binutils-2.28.1
index 14f6984063a4..5684946fa31e 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.28.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f1f8c0d541091501e2d049f6668be0bf
+_md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
index 9d26eeed73c1..daeaacafd7d1 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fb9f3fd89d5b4cd5c96511e1b5c24c31
+_md5_=63caa4f6c6d10749dde5b4a4e97e3820
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5-r4 b/metadata/md5-cache/sys-devel/binutils-config-5-r4
index c11ab6f98352..a439f9c07ab3 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5-r4
+++ b/metadata/md5-cache/sys-devel/binutils-config-5-r4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=Utility to change the binutils version being used
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<app-admin/eselect-1.4.5
 SLOT=0
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=bf90e0351a7038c2f8f5bcce4c3dc20b
+_md5_=6f9dc1af8d9c2b2e5dde7c0c89f9e297
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.1-r1 b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
index f0671af54f07..3470bf47fa26 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=Utility to change the binutils version being used
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<app-admin/eselect-1.4.5 !<sys-devel/binutils-2.25.1
 SLOT=0
 _eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=bce956d7d6ea5b67e299055beec7de48
+_md5_=f665716e21166394277f1a5c476765bd
diff --git a/metadata/md5-cache/sys-devel/bison-2.4.3 b/metadata/md5-cache/sys-devel/bison-2.4.3
index e02cbc5aaaed..fb53b09ad036 100644
--- a/metadata/md5-cache/sys-devel/bison-2.4.3
+++ b/metadata/md5-cache/sys-devel/bison-2.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A yacc-compatible parser generator
 EAPI=2
 HOMEPAGE=https://www.gnu.org/software/bison/bison.html
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.4.3.tar.bz2 https://dev.gentoo.org/~mgorny/dist/bison-2.4.3-patchset.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4a681479d0ad986280abc35836ffa1b9
+_md5_=c2e81e9450433962e365e9094fd58578
diff --git a/metadata/md5-cache/sys-devel/bison-2.7.1 b/metadata/md5-cache/sys-devel/bison-2.7.1
index e74d03c2c573..5113663adb9c 100644
--- a/metadata/md5-cache/sys-devel/bison-2.7.1
+++ b/metadata/md5-cache/sys-devel/bison-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=nls static test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.7.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9403469b5e2d53c608d9351f9f37bce2
+_md5_=e835795e1b05f2f1d883362de9a209e1
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.4-r1 b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
index 90c18c368d9a..b61560bee734 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.4-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz https://dev.gentoo.org/~mgorny/dist/bison-3.0.4-patchset.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=29fc57d11271d2d588ddff06367447d8
+_md5_=2de6eb1a1e58808d4e8e65285da06f62
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r10 b/metadata/md5-cache/sys-devel/distcc-3.1-r10
index a733f754a513..dfd18f4eaa2f 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r10
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r10
@@ -4,7 +4,7 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=5
 HOMEPAGE=http://distcc.org/
 IUSE=avahi gtk hardened ipv6 selinux xinetd python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gtk? ( x11-libs/gtk+:2 ) !net-misc/pump >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://distcc.googlecode.com/files/distcc-3.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d3c9761019d6b4fbb4e9a12f04c233bc
+_md5_=ecb4230028a98e9d19bdc6badbf05e2b
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4
index 5f6b64b9caf8..772bad3316c3 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=5
 HOMEPAGE=http://distcc.org/
 IUSE=crossdev gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=342abf547e0a907a319b1a0b7ddfad94
+_md5_=66dd21276b58fa4481ce20f6e6d89159
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.1 b/metadata/md5-cache/sys-devel/flex-2.6.1
index 1fe37df4cd02..10cd1cb70e3e 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=5
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2ec43ac0eab5ab69df1adc10bca90659
+_md5_=5c9a19524fab2c6f0080647c7d03d58e
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3 b/metadata/md5-cache/sys-devel/flex-2.6.3
index ea7af582ba30..9320dcddb31c 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=5
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5198ba7ec4c0b3e176f445a4f8e4e932
+_md5_=d7a7726f08ab72db580f0225a6a945d1
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3-r1 b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
index f32c2b4437f0..c402d4104f06 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=5
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=534da78e4a5a98f7af7a9bb0bedbcde2
+_md5_=00817578a0dea130b881c3b87db74d90
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4 b/metadata/md5-cache/sys-devel/flex-2.6.4
index bf8f51e42af4..6458d271a6ed 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=5
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=03712e8fd659a1c8ad0950a485cbace5
+_md5_=46354111201fb6d1fa85a63f8633bb5d
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
index 72f3ea099b6e..ebf684618f56 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=6
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf040b71469d22cd5d3c5bb1438eec43
+_md5_=02b88877ed306bf0db98f0be6e2ba4f6
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 169e34bfbbb3..fb47f7121b22 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug d doc gcj awt hardened multilib objc pgo objc-gc mudflap libssp objc++ +nls +nptl +cxx +fortran
-KEYWORDS=-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	8da217a2ca5d1f78bf5cce638f392fd6	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d2b6a7ada9a05741d707db6fa3633dac
+_md5_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index 2cb8bf5a479e..9e48b5e137d2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc mudflap libssp objc++ +nls +nptl +cxx +fortran +openmp
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	8da217a2ca5d1f78bf5cce638f392fd6	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6feb8d4b6b63e3ef610aab5ec9f9ec34
+_md5_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0 b/metadata/md5-cache/sys-devel/gcc-7.3.0
new file mode 100644
index 000000000000..08e36a75c0f8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RESTRICT=strip
+SLOT=7.3.0
+SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	8da217a2ca5d1f78bf5cce638f392fd6	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2a0fa59e46c31e14376a767eee89ba04
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
index 1ee51d5c533d..548728fe0e52 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=utility to manage compilers
 EAPI=5
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=d10b67e9a01e43a64cfde63bfd0a746e
+_md5_=f6d2084dc99bff7f3d53d2e39bfeedaa
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
index 840b0c550cea..045c6ddcb5cd 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Utility to manage compilers
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.9.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/gcc-config-1.9.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af7a18fc175993f4adc960b058e96a1f
+_md5_=edd9d685da1b0dee6db26c875c0c0b77
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.9.1 b/metadata/md5-cache/sys-devel/gcc-config-1.9.1
index fccf77941fcb..f6f817c8d45f 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.9.1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.9.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Utility to manage compilers
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.9.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/gcc-config-1.9.1.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=14c1edda5535524755c7174189855bb9
+_md5_=fa16f4e1ccc7f37fd2e7063f4a12d654
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index facbdc200f93..cb68a57cb6ef 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=14c1edda5535524755c7174189855bb9
+_md5_=fa16f4e1ccc7f37fd2e7063f4a12d654
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.8.1 b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
index 13e135d29e43..96b294645b4d 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.8.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU locale utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6c70784bdcd7f66b2fb723217c014a4d
+_md5_=40a3d99a752dd36d41f393399f439cab
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20161104 b/metadata/md5-cache/sys-devel/gnuconfig-20161104
index 34b7b3fec688..e1d32740f76a 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20161104
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20161104
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/gnuconfig-20161104.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=422279a9282635c296ee2b4afe5ab4b6
+_md5_=0c2d91fffdc691e0a51593e13355c873
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20170101 b/metadata/md5-cache/sys-devel/gnuconfig-20170101
index 1f2490248e59..533573e95773 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20170101
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20170101
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/gnuconfig-20170101.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f023f3ad94a73e50f8baccb09b68eeab
+_md5_=aee970fd330749542730b7fc9e7e36b0
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20180101 b/metadata/md5-cache/sys-devel/gnuconfig-20180101
index d4a318df004a..83d27cddd652 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20180101
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20180101
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/gnuconfig-20180101.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f5e8d6fe0746da3498de67d7d4b49ddd
+_md5_=24086e46ebf952a59bb4521a42f6842f
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-99999999 b/metadata/md5-cache/sys-devel/gnuconfig-99999999
index 7a648fdb183d..9a4a284b83f1 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-99999999
+++ b/metadata/md5-cache/sys-devel/gnuconfig-99999999
@@ -6,4 +6,4 @@ HOMEPAGE=https://savannah.gnu.org/projects/config
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f5e8d6fe0746da3498de67d7d4b49ddd
+_md5_=24086e46ebf952a59bb4521a42f6842f
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
index 70ec365b9d89..5aa939d0ba1f 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=4f23913a77871b628590e5efacb67228
+_md5_=f707d70081f868743b846e9a714d8a42
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
index cbde7a87d6fa..2c1dd5358e2a 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=fb0d107d729b5b77f7e5b5b00efb054f
+_md5_=763f558978276d0f8934b93eda146fed
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
index dfa55cf5765d..bcce335d652c 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=bb40d83754c861e0ec8621f8ef8e7388
+_md5_=6b62464385043abab5502871cb3c7f21
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index 4ee11ec77572..7281f759b298 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=8e645dba5ef4be935b57b9f5a0972610
+_md5_=e943f0473d6691e4a8e85e672458aec9
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.17 b/metadata/md5-cache/sys-devel/m4-1.4.17
index 3a0eecde5076..d4443f772319 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.17
+++ b/metadata/md5-cache/sys-devel/m4-1.4.17
@@ -4,9 +4,9 @@ DESCRIPTION=GNU macro processor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/m4/m4.html
 IUSE=examples
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.17.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bad4115e0edf066aeb0b4f9203694774
+_md5_=253a0a3e9cf2a75ecd7b939a3d8ec008
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.18 b/metadata/md5-cache/sys-devel/m4-1.4.18
index 5f09f588ed87..d50931c6d8fd 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.18
+++ b/metadata/md5-cache/sys-devel/m4-1.4.18
@@ -4,9 +4,9 @@ DESCRIPTION=GNU macro processor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/m4/m4.html
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.18.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd845dbae2f2f7572a688bc38f0d2dce
+_md5_=c65b946d9ebf3cf030866b6ed1fbfc36
diff --git a/metadata/md5-cache/sys-devel/make-3.81-r2 b/metadata/md5-cache/sys-devel/make-3.81-r2
index 0a3b59c1d0dd..62b07f33ae23 100644
--- a/metadata/md5-cache/sys-devel/make-3.81-r2
+++ b/metadata/md5-cache/sys-devel/make-3.81-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=nls static
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.81.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a7134b28012184e3b9b63bc379ea30db
+_md5_=61a5d268083b2a3dfcef625bcd868f05
diff --git a/metadata/md5-cache/sys-devel/make-3.82-r4 b/metadata/md5-cache/sys-devel/make-3.82-r4
index c01fabbb2977..8621b8ec7e9e 100644
--- a/metadata/md5-cache/sys-devel/make-3.82-r4
+++ b/metadata/md5-cache/sys-devel/make-3.82-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=2
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.82.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0773eca0d16e3a7876b4fd3b914ead01
+_md5_=f47f3992e4cba3f0674d0fe27ac8b174
diff --git a/metadata/md5-cache/sys-devel/make-4.0-r1 b/metadata/md5-cache/sys-devel/make-4.0-r1
index 8116139c7720..a273b20d4d41 100644
--- a/metadata/md5-cache/sys-devel/make-4.0-r1
+++ b/metadata/md5-cache/sys-devel/make-4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=efcbb5192be65a61eb71f2037fd17140
+_md5_=984be547ac9f0c121300e36580ec935a
diff --git a/metadata/md5-cache/sys-devel/make-4.1-r1 b/metadata/md5-cache/sys-devel/make-4.1-r1
index 505ce73cab32..467772f36688 100644
--- a/metadata/md5-cache/sys-devel/make-4.1-r1
+++ b/metadata/md5-cache/sys-devel/make-4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cc6e2c5598962fbe0e7647ef9f329416
+_md5_=84e7393c7bbd5b12c132472e25a58c47
diff --git a/metadata/md5-cache/sys-devel/make-4.2.1 b/metadata/md5-cache/sys-devel/make-4.2.1
index 281983f8c81a..77a82017af38 100644
--- a/metadata/md5-cache/sys-devel/make-4.2.1
+++ b/metadata/md5-cache/sys-devel/make-4.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a495a480d405773ac0082595daa8fe58
+_md5_=2ee0c01de6e938b61c65056bd13f71bb
diff --git a/metadata/md5-cache/sys-devel/make-4.2.1-r1 b/metadata/md5-cache/sys-devel/make-4.2.1-r1
index f4a0aa93e5b6..29ccb11d862d 100644
--- a/metadata/md5-cache/sys-devel/make-4.2.1-r1
+++ b/metadata/md5-cache/sys-devel/make-4.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ba61fd38dbce25c5c09eb24d4fef7b5e
+_md5_=45eb8f92374ebdf4255555a2a3456a95
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.5 b/metadata/md5-cache/sys-devel/patch-2.7.5
index 9042a050a749..eb91e7e2abe3 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.5
+++ b/metadata/md5-cache/sys-devel/patch-2.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to apply diffs to files
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 IUSE=static test xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fac18c7eafe46abec2c806bd8a07506d
+_md5_=cf4183dea2b5ce251d6d892cbe24bca3
diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz
index 85f0fdbb4243..4dac5d479949 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/boot0-11.1 b/metadata/md5-cache/sys-freebsd/boot0-11.1
index a8dbfcb5b0f6..6411a36fb79c 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-11.1
+++ b/metadata/md5-cache/sys-freebsd/boot0-11.1
@@ -4,9 +4,9 @@ DESCRIPTION=FreeBSD's bootloader
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=bzip2 ieee1394 tftp zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b8eabfceeb94c4ee471f1da86fca2de7
+_md5_=e0de92bbcd0b82521d621733363468f9
diff --git a/metadata/md5-cache/sys-freebsd/boot0-8.2 b/metadata/md5-cache/sys-freebsd/boot0-8.2
deleted file mode 100644
index 68ed6bd59ce5..000000000000
--- a/metadata/md5-cache/sys-freebsd/boot0-8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND==sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-lib-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's bootloader
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=bzip2 ieee1394 tftp zfs profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-sys-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=04612a4e419fc7b231fd811e8dfd9afa
diff --git a/metadata/md5-cache/sys-freebsd/boot0-9.1 b/metadata/md5-cache/sys-freebsd/boot0-9.1
index 2e9a4afeac9f..57f804716780 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-9.1
+++ b/metadata/md5-cache/sys-freebsd/boot0-9.1
@@ -4,9 +4,9 @@ DESCRIPTION=FreeBSD's bootloader
 EAPI=2
 HOMEPAGE=http://www.freebsd.org/
 IUSE=bzip2 ieee1394 tftp zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sys-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fa207a30364e8c7a288e29fa47361ffa
+_md5_=fae7ecc7c309e457c359231bc556aa58
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1
index f78722d5a6dc..0c83598aeecc 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD /bin tools
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-11.1* >=dev-libs/libedit-20120311.3.0-r1 sys-libs/ncurses:0= sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ef357bf73d0c095d66bb54f4d614e98c
+_md5_=cd2a0577d7287c887f3adbc3394f3f7f
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2
deleted file mode 100644
index e61099140d0e..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2* dev-libs/libedit sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8 =sys-freebsd/freebsd-mk-defs-8.2* >=sys-devel/flex-2.5.31-r2 virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD /bin tools
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-lib-8.2* dev-libs/libedit sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d8fbd9ee7ffc2b906bd2e27a3fb16cbf
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-bin-9.1
index 8077a87690e4..8c3d27840b61 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-9.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-9.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD /bin tools
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.1* >=dev-libs/libedit-20120311.3.0-r1 sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4dd2f0762850a81840d866839f24afd6
+_md5_=95b285ee2d119176661634894fafbd39
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2
deleted file mode 100644
index 639b9aef3776..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2* =sys-freebsd/freebsd-libexec-8.2* build? ( sys-apps/baselayout ) dev-libs/libedit dev-libs/libelf =sys-freebsd/freebsd-mk-defs-8.2* !build? ( =sys-freebsd/freebsd-sources-8.2* ) virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD CDDL (opensolaris/zfs) extra software
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=build profile
-KEYWORDS=~x86-fbsd
-LICENSE=CDDL GPL-2
-RDEPEND==sys-freebsd/freebsd-lib-8.2* =sys-freebsd/freebsd-libexec-8.2* build? ( sys-apps/baselayout ) dev-libs/libedit dev-libs/libelf
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-cddl-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-sys-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-include-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d3bdf9269037529f45fdb6bc97fa90de
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2
deleted file mode 100644
index 19e0164265b3..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==sys-freebsd/freebsd-sources-8.2* =sys-freebsd/freebsd-mk-defs-8.2* !dev-util/dialog virtual/pmake virtual/pmake
-DESCRIPTION=Contributed sources for FreeBSD
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD GPL-2+ libodialog
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=81b42de8b758d5f73be0d45d9a1a0aeb
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1
index 6fb8eb3c3b8d..359ccafc1c52 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1
@@ -4,9 +4,9 @@ DESCRIPTION=Contributed sources for FreeBSD
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2+ libodialog
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-gnu-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1547781fa6e5966a2b100f05d7234b3c
+_md5_=263407d575357839e9eeb883b28fdcfc
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1
index 314306fdae8d..5d8d7a3956b2 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's base system libraries
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=atm bluetooth ssl hesiod ipv6 kerberos usb netware build headers-only zfs pam xinetd userland_GNU userland_BSD profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2 zfs? ( CDDL )
 RDEPEND=ssl? ( dev-libs/openssl:0= ) hesiod? ( net-dns/hesiod ) kerberos? ( app-crypt/heimdal ) pam? ( virtual/pam ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-11.1* ) >=dev-libs/expat-2.0.1 >=dev-util/dialog-1.2.20150225 !sys-freebsd/freebsd-libexec !sys-libs/libutempter !dev-libs/libelf !dev-libs/libexecinfo !dev-libs/libiconv !sys-freebsd/freebsd-headers =sys-freebsd/freebsd-share-11.1* xinetd? ( sys-apps/xinetd ) >=virtual/libiconv-0-r2
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8173125733ee68591ac40b18724265a9
+_md5_=6f59533be3d298e7907d91b334da8975
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1
deleted file mode 100644
index 074181ee6352..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb ) userland_GNU? ( sys-apps/mtree ) >=dev-libs/expat-2.0.1 !sys-freebsd/freebsd-headers >=sys-devel/flex-2.5.31-r2 =sys-freebsd/freebsd-sources-8.2* !bootstrap? ( app-arch/bzip2 ) =sys-freebsd/freebsd-mk-defs-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's base system libraries
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=atm bluetooth ssl hesiod ipv6 kerberos usb netware build bootstrap headers-only profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb ) userland_GNU? ( sys-apps/mtree ) >=dev-libs/expat-2.0.1 !sys-freebsd/freebsd-headers
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-crypto-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b8f7f4dd0a9b257a6ac2f57a41717335
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
index 7934f91fff31..7e3c8ab32a7a 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's base system libraries
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=atm bluetooth ssl hesiod ipv6 kerberos usb netware build headers-only zfs userland_GNU userland_BSD profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( app-crypt/heimdal ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.1* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter !sys-freebsd/freebsd-headers
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-crypto-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 )
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6d9590e6efabab0a349aa900f1dd922c
+_md5_=f119a2b4c271684d36487adce2be5589
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2
deleted file mode 100644
index 3bf18eaa3150..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) =sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-sources-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD libexec things
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=pam ssl kerberos ipv6 nis xinetd profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c8b0f5930404dc38955b173b756101fb
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1
deleted file mode 100644
index 9634c95d8985..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) =sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-sources-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD libexec things
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=pam ssl kerberos ipv6 nis xinetd profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=95cab7540d247f72f2ae83fa61cbc4c8
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
index b625ea791daf..60802512c82b 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD libexec things
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=pam ssl kerberos ipv6 nis xinetd profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.1* >=sys-freebsd/freebsd-lib-9.1-r11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0f441947d8559dd34d62e132698dc9ef
+_md5_=b01384f8a9ecea8157d6f7bdf5e76d7b
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
index 449c052b713d..8c0ef4c0a0d1 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=Makefile definitions used for building and installing libraries and
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_GNU profile
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=190738a78af61ed732272edde6b65596
+_md5_=57d45589197a33aeb91b1b3d1e31cc25
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..9b78ccc77807
--- /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	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f10a00caa64eb4acc8593e28ea856c4d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1
index fafdf321596e..5b7ee052fc3e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's PAM authentication modules
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=kerberos nis profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl:0= virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2c7deb0ffc4a8cd61d6a98b5d911cd8c
+_md5_=7cb5b08b909a6de9dad4abff681fae20
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2
deleted file mode 100644
index 3e76d1a6c78f..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 ) =sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-sources-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's PAM authentication modules
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=kerberos nis profile
-KEYWORDS=~x86-fbsd ~sparc-fbsd
-LICENSE=BSD
-RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-lib-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f4c8df3832ec246c890d656cf6a09b6f
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
index 92f84ebcb074..debe2c35097f 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's PAM authentication modules
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=kerberos nis profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bc350b319443a7b7cd953a15d902fe8c
+_md5_=144a8ab7e03b44358aea42d5ac99134b
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2
deleted file mode 100644
index fe0d3ebbf04f..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=net-libs/libpcap dev-libs/libevent sys-freebsd/freebsd-mk-defs =sys-freebsd/freebsd-sources-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's base system libraries
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=profile
-KEYWORDS=~x86-fbsd
-LICENSE=BSD
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=99977a3a5ad75197fbc83e5c82db723d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2
deleted file mode 100644
index 5440b96925e1..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=sys-devel/flex >=app-arch/libarchive-2.7.1[static-libs] dev-libs/libedit[static-libs] app-arch/xz-utils[static-libs] sys-libs/ncurses[static-libs] virtual/pkgconfig =sys-freebsd/freebsd-lib-8.2*[atm?,netware?] =sys-freebsd/freebsd-sources-8.2* =sys-freebsd/freebsd-mk-defs-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's rescue binaries
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=atm netware nis zfs profile
-KEYWORDS=~x86-fbsd
-LICENSE=BSD zfs? ( CDDL )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-rescue-8.2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dcad7fd69ddc5aebca6b45d34aec85a5
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1
index 98b311b6d46e..3573560cc908 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD sbin utils
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=atm ipfilter +pf ipv6 build ssl +cxx netware zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-11.1*[ipv6?,atm?,netware?] zfs? ( =sys-freebsd/freebsd-cddl-11.1* ) >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl:0= ) >=dev-libs/libedit-20120311.3.0-r1 sys-libs/readline:0= || ( sys-process/cronie sys-process/vixie-cron ) atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c6203a25a36312df2d26d452eadac6ac
+_md5_=36cf6b3c9dcdf80c89f4257e1573b8db
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1
deleted file mode 100644
index f5c873e8578e..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-8.2* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) dev-libs/libedit sys-libs/readline || ( sys-process/cronie sys-process/vixie-cron ) atm? ( net-analyzer/bsnmp ) !build? ( =sys-freebsd/freebsd-sources-8.2* ) =sys-freebsd/freebsd-mk-defs-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD sbin utils
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=atm ipfilter +pf ipv6 build ssl +cxx netware profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-lib-8.2*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-8.2* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) dev-libs/libedit sys-libs/readline || ( sys-process/cronie sys-process/vixie-cron ) atm? ( net-analyzer/bsnmp )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c53876613603b87c439fcd0122456dcc
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.1
index 64be7e4bdba9..ce011c248b0f 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD sbin utils
 EAPI=2
 HOMEPAGE=http://www.freebsd.org/
 IUSE=atm ipfilter +pf ipv6 build ssl +cxx netware profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-9.1* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) >=dev-libs/libedit-20120311.3.0-r1 sys-libs/readline || ( sys-process/cronie sys-process/vixie-cron ) atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 )
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=063c85a7d95feb0bac16f9f18f8f2188
+_md5_=e3212f9cadf3305cf21da71ba1a0b948
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
index a52144962bbe..3f258ee7684f 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1
@@ -4,11 +4,11 @@ DESCRIPTION=FreeBSD shared tools/files
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=doc usb zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=59e848a5801cad4fb8a90fee5d954357
+_md5_=1c2429fe7daf8f02c6d26536541d56cd
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-share-8.2
deleted file mode 100644
index ff3be464d0b0..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND==sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-sources-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD shared tools/files
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=doc isdn profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=sys-apps/miscfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-share-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5e13f0e5282b7d1fa696594de576b2d4
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-share-9.1
index 0f72a8d3182f..d393b54a7145 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-9.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-9.1
@@ -4,11 +4,11 @@ DESCRIPTION=FreeBSD shared tools/files
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=doc profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=58874f38d3ed1486204e3b6a0d5fbcc2
+_md5_=248be5c0f1995477e353a385b4d556a7
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2 b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
index d6d994da82e6..75fd6af58afb 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2
@@ -4,11 +4,11 @@ DESCRIPTION=FreeBSD kernel sources
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=+build-kernel debug dtrace zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD dtrace? ( CDDL ) zfs? ( CDDL )
 RDEPEND=dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-11.1* !sys-freebsd/virtio-kmod !sys-fs/fuse4bsd !<sys-freebsd/freebsd-sources-9.2_beta1
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz https://security.freebsd.org/patches/SA-17:08/ptrace.patch -> freebsd-sources-SA-1708-ptrace.patch https://security.freebsd.org/patches/SA-17:10/kldstat.patch -> freebsd-sources-SA-1710-kldstat.patch https://security.freebsd.org/patches/EN-17:07/vnet.patch -> freebsd-sources-EN-1707-vnet.patch https://security.freebsd.org/patches/EN-17:08/pf.patch -> freebsd-sources-EN-1708-pf.patch
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ccffb0305515fceb9ffeefa02138bafd
+_md5_=2cde27dba3836cdf37ee4942551167d9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r2 b/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r2
deleted file mode 100644
index 231f34fd7635..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD kernel sources
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=symlink profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
-RESTRICT=strip binchecks
-SLOT=8.2-r2
-SRC_URI=mirror://gentoo/freebsd-sys-8.2.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5ed0b3955aada0deaf4761a9b135eb46
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3
index 126470fdf305..7945a445a2f7 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=FreeBSD kernel sources
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=symlink profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-mk-defs-9.1*
 RESTRICT=strip binchecks
 SLOT=9.1
 SRC_URI=mirror://gentoo/freebsd-sys-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=351bf7cd15c02de41021bc518a28a544
+_md5_=d417dc1febdc349eb0f73aed9efc39d1
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
index 7ec4853089b9..09979007de44 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
@@ -4,11 +4,11 @@ DESCRIPTION=FreeBSD kernel sources
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=symlink profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-mk-defs-9.1*
 RESTRICT=strip binchecks
 SLOT=9.1
 SRC_URI=mirror://gentoo/freebsd-sys-9.1.tar.bz2 https://dev.gentoo.org/~naota/patch/freebsd-sources-9.1-en-13-03.patch
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dc64792cbcbc0242288ec6c7aae46649
+_md5_=1343519b2472f4b820265b5148c32439
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
index 4f87dcde88ab..8fab134887c0 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's base system source for /usr/bin
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( dev-libs/openssl:0= ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9:0= !sys-process/fuser-bsd !dev-util/csup !dev-libs/libiconv !sys-freebsd/freebsd-contrib >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bdb173e81da5b44e4c9854b616aaecac
+_md5_=28c7ea70286108df38d3584e3f302aec
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1
deleted file mode 100644
index c7bf8f5bcbdf..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !dev-util/csup sys-devel/flex !build? ( =sys-freebsd/freebsd-sources-8.2* ) =sys-freebsd/freebsd-mk-defs-8.2* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's base system source for /usr/bin
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD zfs? ( CDDL )
-RDEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9ef6f379bcf2e154a2a3bcf8a596015c
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
index f5c58758677e..d4ad0e79b942 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's base system source for /usr/bin
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 )
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d2cb51280ead8520d967464f9e3c7a8
+_md5_=637d589c33e5061915ead5dc4a88c3af
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
index 2871bc3f2abd..573a9777f8e4 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD's base system source for /usr/bin
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs profile abi_x86_32 abi_x86_64 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-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 )
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b754e7052c16318b15eb9075131f02f5
+_md5_=0f6bf44f4be3a5d11e3700270d317e86
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
index 8df157aaa8a5..5e8fcc2f2ed8 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD /usr/sbin tools
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,netware?] build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl:0 ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap kerberos? ( app-crypt/heimdal )
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=23e5be173a8d81728d450d0e8c0b37a9
+_md5_=3572a894ee787c75f51e419cc289b264
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2
deleted file mode 100644
index a7f7a9d7bb40..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-8.2* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) dev-libs/libelf dev-libs/libedit net-libs/libpcap =sys-freebsd/freebsd-mk-defs-8.2* =sys-freebsd/freebsd-ubin-8.2* !build? ( =sys-freebsd/freebsd-sources-8.2* ) sys-apps/texinfo sys-devel/flex virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD /usr/sbin tools
-EAPI=2
-HOMEPAGE=http://www.freebsd.org/
-IUSE=acpi atm audit bluetooth floppy ipv6 minimal netware nis pam ssl usb build profile
-KEYWORDS=~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-8.2* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) dev-libs/libelf dev-libs/libedit net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-8.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 )
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b63622cab8e2c2db64d4c90444f20057
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.1-r1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.1-r1
index fbe3e0c428ed..db8d8fe69fca 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.1-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeBSD /usr/sbin tools
 EAPI=2
 HOMEPAGE=http://www.freebsd.org/
 IUSE=acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build profile
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-9.1* =sys-freebsd/freebsd-contrib-9.1* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog dev-libs/libelf >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap kerberos? ( app-crypt/heimdal )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 )
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d6039ffcae8c449f8376111badf20a23
+_md5_=961cc411f36b2c237edfc9b0ae7da18d
diff --git a/metadata/md5-cache/sys-freebsd/ubin-wrappers-0 b/metadata/md5-cache/sys-freebsd/ubin-wrappers-0
index f3767d1749da..1a814644062b 100644
--- a/metadata/md5-cache/sys-freebsd/ubin-wrappers-0
+++ b/metadata/md5-cache/sys-freebsd/ubin-wrappers-0
@@ -3,7 +3,7 @@ DESCRIPTION=/usr/bin wrapper scripts for FreeBSD script compatibility
 EAPI=5
 HOMEPAGE=https://www.gentoo.org
 IUSE=userland_BSD userland_GNU
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 SLOT=0
-_md5_=563c075b17c106bb0e0fa92f516e1d40
+_md5_=6e8e57c897c5a9f038d0cb6eef54507a
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c51e3e01279b..df986a311a31 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/cryptsetup-2.0.1 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.1
new file mode 100644
index 000000000000..22e5637f6912
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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(+)?] ) virtual/pkgconfig static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=6
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~arm64 ~mips ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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(+)?] )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) 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 ) ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4bc2e272819281460b6726d90a473e18
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.2 b/metadata/md5-cache/sys-fs/encfs-1.9.2
index 5ffdd8baf3c7..05d30b28102d 100644
--- a/metadata/md5-cache/sys-fs/encfs-1.9.2
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of encrypted filesystem in user-space using FUSE
 EAPI=6
 HOMEPAGE=https://vgough.github.io/encfs/
 IUSE=libressl nls
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) dev-libs/tinyxml2:0/3 sys-fs/fuse:= sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vgough/encfs/archive/v1.9.2.tar.gz -> encfs-1.9.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1dcf850879037af37155065411555e8d
+_md5_=ca408352fde79667b14cfc80646e77f5
diff --git a/metadata/md5-cache/sys-fs/udev-236 b/metadata/md5-cache/sys-fs/udev-236
index 751a7b26204a..041d5314c44d 100644
--- a/metadata/md5-cache/sys-fs/udev-236
+++ b/metadata/md5-cache/sys-fs/udev-236
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux abi_x86_32 abi_x86_64 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=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49d5120d481a510f86f302f39ac9ca4e
+_md5_=b870faadae4df55eb7fa4cbc1dd5e54c
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.5-r1 b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
index 9683eba99116..9683eba99116 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.0.5-r1
+++ b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1 b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
index b0603734772a..46b92c264536 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd
-KEYWORDS=amd64 arm ~arm64 ia64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.14[cryptsetup,lvm?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/archive/udisks-2.7.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af0ed708f0dffd5b300136c5681ce943
+_md5_=30e3b0bd0c9aca741ed1dce9c6a990ae
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.12.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.12.0
deleted file mode 100644
index 8d753780c9ba..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=xfs filesystem utilities
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/xfs/
-IUSE=libedit nls readline static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.12.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ac5ffde8cbdab935bb88dc184d78677
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.13.1 b/metadata/md5-cache/sys-fs/xfsprogs-4.13.1
deleted file mode 100644
index 3c4324aab6e3..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=xfs filesystem utilities
-EAPI=6
-HOMEPAGE=http://oss.sgi.com/projects/xfs/
-IUSE=libedit nls readline static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.13.1.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d57c7f68bba4875fce7cee8c5b527ed
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.5.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
deleted file mode 100644
index dde60596a6d1..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=xfs filesystem utilities
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/xfs/
-IUSE=libedit nls readline static static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.5.0.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-4.5.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77e65a3e06ac3106ed3dfabe309b3e97
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.9.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
index 1c2610b92a5a..4d826efa0066 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
-SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.9.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.9.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd45fed576fd9a441d34727e1a545b35
+_md5_=8158afa2018562fb0b3edf04083b145b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b87222a59569..1b81236700ef 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/dracut-046-r1 b/metadata/md5-cache/sys-kernel/dracut-046-r1
index d6a964fc306e..43cc448e711e 100644
--- a/metadata/md5-cache/sys-kernel/dracut-046-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-046-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Generic initramfs generation tool
 EAPI=6
 HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=debug selinux
-KEYWORDS=~alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >=app-shells/bash-4.0:0 || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] ) sys-apps/coreutils[xattr(-)] >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut ) !net-analyzer/arping
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-046.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=526bb7174f3e8aef43ca7152611ff685
+_md5_=579429906b557c9fe3aecbdc105785fe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.15
new file mode 100644
index 000000000000..6e7a4d0b6ff6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-20.base.tar.xz mirror://gentoo/genpatches-4.14-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-20.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=731cc6c5a0d31258c8cfb984a2e0d6e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.113 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.113
new file mode 100644
index 000000000000..e4c1d71372a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.113
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.113
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-117.base.tar.xz mirror://gentoo/genpatches-4.4-117.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-117.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=07b26b8e3ab886238722f51b83f0d066
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.78 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.78
new file mode 100644
index 000000000000..1553508397c0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.78
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-81.base.tar.xz mirror://gentoo/genpatches-4.9-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-81.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b583adb3f26b5d749fda42f5014d2b00
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9
new file mode 100644
index 000000000000..bb93d0cd7488
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.15_rc9
+SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc9/v4.14 -> patch-4.15-rc9.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20171206 b/metadata/md5-cache/sys-kernel/linux-firmware-20171206
deleted file mode 100644
index 74456e304df6..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20171206
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=6
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=savedconfig savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
-RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3.tar.gz -> linux-firmware-20171206.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=7c3a5e74b651fb15ff33a62d3f852918
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180103 b/metadata/md5-cache/sys-kernel/linux-firmware-20180103
deleted file mode 100644
index 82de70b03ce3..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20180103
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=6
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=savedconfig savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
-RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78.tar.gz -> linux-firmware-20180103.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=ec1aea2549007b52147fa484692eb43f
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180119 b/metadata/md5-cache/sys-kernel/linux-firmware-20180119
new file mode 100644
index 000000000000..c9f01631cd73
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20180119
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=Linux firmware files
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=savedconfig savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
+RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-2a713be25a44bd6cec90d8affc54b246a2ca9c7b.tar.gz -> linux-firmware-20180119.tar.gz mirror://gentoo/microcode_amd_fam17h.tar.gz https://dev.gentoo.org/~whissi/dist/linux-firmware/microcode_amd_fam17h.tar.gz
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_md5_=04fc79c1f522c3ae838698b86e3503f0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.48 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.48
deleted file mode 100644
index 37999e0be2ad..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.48
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.48.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.49 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.49
new file mode 100644
index 000000000000..16762738167d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.49
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.49
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.49.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.14
deleted file mode 100644
index 1619d46c0b45..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.14.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.15 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.15
new file mode 100644
index 000000000000..44428c320979
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.15.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.112 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.112
deleted file mode 100644
index 2f0197ac5d81..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.112
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.112
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.112.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.113 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.113
new file mode 100644
index 000000000000..4a7f71e73a84
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.113
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.113
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.113.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.77 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.77
deleted file mode 100644
index e2255d9bb8a6..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.77
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.77
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.77.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.78 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.78
new file mode 100644
index 000000000000..22db9660c4e3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.78
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index dec23cef1f60..ade888c1e28d 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/binutils-libs-2.25.1-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
index d3cd219ff117..e1db7d39acc3 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d4701eb2a3bf41042b5e55987cbd63a0
+_md5_=ab47fc0416595d9287ff1694959847c4
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.27 b/metadata/md5-cache/sys-libs/binutils-libs-2.27
index 8b540f6d0a69..ee63cd76d9dc 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.27
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.27
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=750601bdf686aae8962ed71a8a6bc20a
+_md5_=a1b5b17f0bb7b4c59d060bdb95e262f2
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.28.1 b/metadata/md5-cache/sys-libs/binutils-libs-2.28.1
index 4e507957360e..1a8b633130d5 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.28.1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.28.1
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8eb4262f9f0fb95515ad52679df722ab
+_md5_=e48c401e8e3f27024cecac76b774a43e
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
index e88b0d5dae78..8752e22b03b0 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=0
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=794494eec4502fe4a3fbcf94f5a14d27
+_md5_=d098d4f0f32bb8c333e4822f24cf765b
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1 b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
index 4606dd1e384d..556b98182249 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=0
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=677e7b6d1fe3496ecbb2bf687274d2f2
+_md5_=26cb1a2692d8c12a387f2459a4f98cd0
diff --git a/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/metadata/md5-cache/sys-libs/db-4.6.21_p4
index ef93725a029c..5fb00f14f6b1 100644
--- a/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -4,10 +4,10 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=0
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9b8e82858d568390417df663546cc0f5
+_md5_=0a93cb43beab7578c37ee37100dc84c9
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p4 b/metadata/md5-cache/sys-libs/db-4.7.25_p4
index 1b5298d6d91f..673d38df672d 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p4
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p4
@@ -4,10 +4,10 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=0
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test rpc doc test examples elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=80793157f95edcf0d39f3b2c870a575e
+_md5_=9cc91d346a3a9a72dd2efc3f4a8ec3d9
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r2 b/metadata/md5-cache/sys-libs/db-4.8.30-r2
index 75cb89e5a377..0e7a24ea6998 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r2
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a25a997b76250ac3f1c9571e348fed65
+_md5_=71b8e3646d82abe6ea653a2c2ab7e3cd
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29-r1 b/metadata/md5-cache/sys-libs/db-5.1.29-r1
index 727c62d36426..65c29b127281 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b426b3ff47720bfb3a7a6d0a8fc34ede
+_md5_=2bfa0148296b271ba4656d8f7be74386
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index 56018a6945f4..064cd72ab53b 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=483ad09ea214c07dc348bc808c0a3d56
+_md5_=25be504779782decd58554614e0aee6d
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r3 b/metadata/md5-cache/sys-libs/db-5.3.28-r3
index be697bdea968..d0802b52efe4 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r3
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1f61bc7615c63606051ca8ba7f6693ec
+_md5_=54f231213401e86c393b1d1e10865469
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35 b/metadata/md5-cache/sys-libs/db-6.0.35
index e572d6a63061..84422b7c24ed 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35
+++ b/metadata/md5-cache/sys-libs/db-6.0.35
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=aa2015fb4df019293f31d540d6282ed6
+_md5_=78761ce33e9bbaa5bb02dab0d6b9de96
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35-r1 b/metadata/md5-cache/sys-libs/db-6.0.35-r1
index 854d63eec896..477891411891 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35-r1
+++ b/metadata/md5-cache/sys-libs/db-6.0.35-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5ba299041e536618e32ebc79dab43721
+_md5_=8b7095f1b05538b252fa4d5660a1ed65
diff --git a/metadata/md5-cache/sys-libs/db-6.1.29 b/metadata/md5-cache/sys-libs/db-6.1.29
index a7587328a604..07aa48049f08 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.29
+++ b/metadata/md5-cache/sys-libs/db-6.1.29
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.29.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2042bde6807db6f9f3a4c2a47f2f934d
+_md5_=a130bc2aeb7e7dce7c13cde23ccdddc4
diff --git a/metadata/md5-cache/sys-libs/db-6.1.29-r1 b/metadata/md5-cache/sys-libs/db-6.1.29-r1
index dd60a148e856..7e4683ae0a13 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-6.1.29-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.29.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3329e6bc9a3850ab32111b90feba040b
+_md5_=4031e96866c9862e001c932cefd9ff3a
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23 b/metadata/md5-cache/sys-libs/db-6.2.23
index 1e95ff044991..918b7b7c1d68 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.23
+++ b/metadata/md5-cache/sys-libs/db-6.2.23
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e8cc23a92618dd753af5c4c3543335ce
+_md5_=74ccee998b3f4d6904a9100203be2173
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23-r1 b/metadata/md5-cache/sys-libs/db-6.2.23-r1
index 5c3bff9e481a..6077ee9253f8 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.23-r1
+++ b/metadata/md5-cache/sys-libs/db-6.2.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d042ca252f09e8d92c2335547fd95eff
+_md5_=8c902de5fc7f7ef609c9feb1f509788d
diff --git a/metadata/md5-cache/sys-libs/db-6.2.32 b/metadata/md5-cache/sys-libs/db-6.2.32
index 116275fa5b8f..1195dd4707be 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.32
+++ b/metadata/md5-cache/sys-libs/db-6.2.32
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9c4635c5d56a1f162b926ddc15ab92a5
+_md5_=2966a5e6c88bd719282fa7420c25888e
diff --git a/metadata/md5-cache/sys-libs/db-6.2.32-r1 b/metadata/md5-cache/sys-libs/db-6.2.32-r1
index 89381f083bdf..8f34ea9e8cb3 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.32-r1
+++ b/metadata/md5-cache/sys-libs/db-6.2.32-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0e239efb6b1fe6cbe1bab7c9c9b0e148
+_md5_=e871e9134c4d3bf7d277421f8c42e93d
diff --git a/metadata/md5-cache/sys-libs/efivar-32 b/metadata/md5-cache/sys-libs/efivar-32
new file mode 100644
index 000000000000..4dbdc6159fa3
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/efivar-32
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
+DESCRIPTION=Tools and library to manipulate EFI variables
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efivar
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt
+SLOT=0/1
+SRC_URI=https://github.com/rhinstaller/efivar/archive/32/efivar-32.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=39a8cff6b9ce05027100b2b93adb6702
diff --git a/metadata/md5-cache/sys-libs/efivar-32-r1 b/metadata/md5-cache/sys-libs/efivar-32-r1
new file mode 100644
index 000000000000..c5c19a198b9b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/efivar-32-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
+DESCRIPTION=Tools and library to manipulate EFI variables
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efivar
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt
+SLOT=0/1
+SRC_URI=https://github.com/rhinstaller/efivar/archive/32/efivar-32.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4e20311cab4e101068a81cca39b76cd0
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.11 b/metadata/md5-cache/sys-libs/gdbm-1.11
index d9c597281b78..06bce6c70d19 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.11
+++ b/metadata/md5-cache/sys-libs/gdbm-1.11
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gdbm/gdbm-1.11.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b2cb311c94394c4293040accdee44cc6
+_md5_=f492a86094506fbae8d2dd343b67c981
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.13-r2 b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
index 1f296da10ac0..2b6c3dddaed2 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.13-r2
+++ b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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-3
 RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.13
 SRC_URI=mirror://gnu/gdbm/gdbm-1.13.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8c0322f3161b51fcb5a5ac3f274d4491
+_md5_=4070c24d86b51efaebea715d8e9a0b82
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.14.1 b/metadata/md5-cache/sys-libs/gdbm-1.14.1
index 580fe19708fe..d24ed01e273b 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.14.1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.14.1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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-3
 RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/5
 SRC_URI=mirror://gnu/gdbm/gdbm-1.14.1.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=337f432879a8b8d24f3ab8c10499fddd
+_md5_=f102631b6bfeee007c5424d2ca477292
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 73f017629ae1..e36c1f2868aa 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	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=30224d9db479cf0f8e9a630717abf8ef
+_md5_=63bfc42db1929ff41839af0e0958236c
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.14-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.14-r1
index c2aac12e49d3..878bae1295b3 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.14-r1
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/libblockdev
 IUSE=bcache +cryptsetup dmraid doc lvm kbd test 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=~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) kbd? ( >=sys-apps/kmod-19 ) 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(+)?]
 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/rhinstaller/libblockdev/archive/2.14-1.tar.gz -> libblockdev-2.14-1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=78bf27f3971f71a1d50ef02c67ecf005
+_md5_=1a6df29e6372c1cb10bf4c3a784503e9
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9-r101 b/metadata/md5-cache/sys-libs/ncurses-5.9-r101
index eade631695eb..5a3525d0add3 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9-r101
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9-r101
@@ -4,10 +4,10 @@ DESCRIPTION=console display library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
 IUSE=gpm tinfo unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-libs/ncurses-6:0
 SLOT=5/5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9af0b39966ad7a9f13393cc4ad61b777
+_md5_=f7b9ef4cc0a6cb7f9ea57240608d97be
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.0-r1 b/metadata/md5-cache/sys-libs/ncurses-6.0-r1
index e194900180fe..3584963dd4ea 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.0-r1
+++ b/metadata/md5-cache/sys-libs/ncurses-6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=console display library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
 IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1 !app-emulation/emul-linux-x86-baselibs
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b31fd3c88bdedbb6ece4d98811c8efe9
+_md5_=8082e13b612c82bd91ebd353b826c207
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.0-r2 b/metadata/md5-cache/sys-libs/ncurses-6.0-r2
index d827a960c2c2..b79715b042dd 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.0-r2
+++ b/metadata/md5-cache/sys-libs/ncurses-6.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=console display library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
 IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1 !app-emulation/emul-linux-x86-baselibs
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9fca749e0b8f913ab24cd8b57da2a3ec
+_md5_=6614b9c3b3e6aea2157b79ed5a95e11c
diff --git a/metadata/md5-cache/sys-libs/readline-5.2_p14 b/metadata/md5-cache/sys-libs/readline-5.2_p14
index ce6c751ad8d4..de277b286f61 100644
--- a/metadata/md5-cache/sys-libs/readline-5.2_p14
+++ b/metadata/md5-cache/sys-libs/readline-5.2_p14
@@ -4,10 +4,10 @@ DESCRIPTION=Another cute console display library
 EAPI=5
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=5
 SRC_URI=mirror://gnu/readline/readline-5.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-001 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-002 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-003 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-004 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-005 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-006 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-007 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-008 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-009 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-010 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-011 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-012 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-013 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-014 mirror://gnu/readline/readline-5.2-patches/readline52-001 mirror://gnu/readline/readline-5.2-patches/readline52-002 mirror://gnu/readline/readline-5.2-patches/readline52-003 mirror://gnu/readline/readline-5.2-patches/readline52-004 mirror://gnu/readline/readline-5.2-patches/readline52-005 mirror://gnu/readline/readline-5.2-patches/readline52-006 mirror://gnu/readline/readline-5.2-patches/readline52-007 mirror://gnu/readline/readline-5.2-patches/readline52-008 mirror://gnu/readline/readline-5.2-patches/readline52-009 mirror://gnu/readline/readline-5.2-patches/readline52-010 mirror://gnu/readline/readline-5.2-patches/readline52-011 mirror://gnu/readline/readline-5.2-patches/readline52-012 mirror://gnu/readline/readline-5.2-patches/readline52-013 mirror://gnu/readline/readline-5.2-patches/readline52-014
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f283329a70795cc745234dbabde275fc
+_md5_=105081e8d23b3812f92139f59819017c
diff --git a/metadata/md5-cache/sys-libs/readline-6.3_p8-r3 b/metadata/md5-cache/sys-libs/readline-6.3_p8-r3
index 7e9067d176cf..16b15e5fc11f 100644
--- a/metadata/md5-cache/sys-libs/readline-6.3_p8-r3
+++ b/metadata/md5-cache/sys-libs/readline-6.3_p8-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Another cute console display library
 EAPI=5
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3b7326e8501b5564972146d19f64b1f4
+_md5_=1392775cc44fed0ab2c297b27178ba0e
diff --git a/metadata/md5-cache/sys-libs/readline-7.0_p3 b/metadata/md5-cache/sys-libs/readline-7.0_p3
index 35ea94904277..00900b0076e8 100644
--- a/metadata/md5-cache/sys-libs/readline-7.0_p3
+++ b/metadata/md5-cache/sys-libs/readline-7.0_p3
@@ -4,10 +4,10 @@ DESCRIPTION=Another cute console display library
 EAPI=5
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/7
 SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fb497b3ceaefa67f0ccd4bfe7c1d221a
+_md5_=be45db4fd4258d28ac4df0d6c95dfcd4
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.0 b/metadata/md5-cache/sys-libs/slang-2.3.0
index ac7f7826f62f..9d1d5ab33983 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.0
+++ b/metadata/md5-cache/sys-libs/slang-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-platform library designed to allow a developer to create robus
 EAPI=5
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cjk? ( >=dev-libs/oniguruma-5.9.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.0.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d105f7ca5f9ab0d97712efe11fc67081
+_md5_=566a579cd13616930409281a525974ef
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.1a b/metadata/md5-cache/sys-libs/slang-2.3.1a
index 05bc0d97caf5..fe30a79e6157 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.1a
+++ b/metadata/md5-cache/sys-libs/slang-2.3.1a
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-platform library designed to allow a developer to create robus
 EAPI=6
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cjk? ( >=dev-libs/oniguruma-5.9.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.1a.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.1a.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b869344b012adaa542b83966c094f70
+_md5_=d4731a4db2c47ded5468ad91f12b32bc
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2017a b/metadata/md5-cache/sys-libs/timezone-data-2017a
deleted file mode 100644
index 2c90d777c0da..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2017a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=5
-HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
-IUSE=nls leaps_timezone elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2017a.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2017a.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ee083e46015a02b0a9d4b192cae6ee5e
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2017b b/metadata/md5-cache/sys-libs/timezone-data-2017b
deleted file mode 100644
index 3ffda49f4395..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2017b
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=5
-HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
-IUSE=nls leaps_timezone elibc_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2017b.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2017b.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ae14b221943af4ac73ecd2f4a1ab700
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2017c b/metadata/md5-cache/sys-libs/timezone-data-2017c
index 53b4f2c48b95..d294407608ab 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2017c
+++ b/metadata/md5-cache/sys-libs/timezone-data-2017c
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=6
 HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
 IUSE=nls leaps_timezone elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2017c.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2017c.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9a588375b53b5c42246858532b7306ba
+_md5_=bb31d2aa74470b125522769475f23db6
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2018c b/metadata/md5-cache/sys-libs/timezone-data-2018c
new file mode 100644
index 000000000000..5677b897820f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2018c
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=6
+HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
+IUSE=nls leaps_timezone elibc_FreeBSD
+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 public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2018c.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2018c.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f3dbbeff62de553a632da79e9936efab
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11 b/metadata/md5-cache/sys-libs/zlib-1.2.11
index e06f2d7c7493..a1e2fb3ae19d 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11
@@ -4,10 +4,10 @@ DESCRIPTION=Standard (de)compression library
 EAPI=5
 HOMEPAGE=https://zlib.net/
 IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<dev-libs/libxml2-2.7.7
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8eb65aaa6a3bcad18635f50c2b97b017
+_md5_=f3a58b684f677ac8218d1f64ab4a01b0
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
index 1f82d321c83b..d34b093bc1ce 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard (de)compression library
 EAPI=5
 HOMEPAGE=https://zlib.net/
 IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<dev-libs/libxml2-2.7.7
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0186c196562a25e9388ee71692f76852
+_md5_=900a4cc48f037d4d73c7fdf3ec1aeddc
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 0026734c0096..4cbb6426a8ab 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/powertop-2.8 b/metadata/md5-cache/sys-power/powertop-2.8
index f57869fef737..1202326e152b 100644
--- a/metadata/md5-cache/sys-power/powertop-2.8
+++ b/metadata/md5-cache/sys-power/powertop-2.8
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/powertop/powertop-2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7d0c3432cb3ca178f32d264ead0470aa
+_md5_=524c21a9c7f78e77908a371f206a2308
diff --git a/metadata/md5-cache/sys-power/powertop-2.9 b/metadata/md5-cache/sys-power/powertop-2.9
new file mode 100644
index 000000000000..bf7a3d739b3e
--- /dev/null
+++ b/metadata/md5-cache/sys-power/powertop-2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=tool that helps you find what software is using the most power
+EAPI=6
+HOMEPAGE=https://01.org/powertop/
+IUSE=nls unicode X
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
+SLOT=0
+SRC_URI=https://01.org/sites/default/files/downloads/powertop/powertop-v2.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dbdf6a91e6e250cdaf139dc8fbb5af1b
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index b510b9e11b90..d77a4e2a677b 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5ba2ed299d192eb12fd28f0589c7f0d4
+_md5_=c015e4d583202eef3c92ae133e6e66f6
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c28e807e3edc..8f8520902294 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/criu-2.12.1 b/metadata/md5-cache/sys-process/criu-2.12.1
deleted file mode 100644
index 386a576379bc..000000000000
--- a/metadata/md5-cache/sys-process/criu-2.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python setproctitle python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-2.12.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=42a42846c5a32eed1fd5f12eb12bcd32
diff --git a/metadata/md5-cache/sys-process/criu-2.12.1-r1 b/metadata/md5-cache/sys-process/criu-2.12.1-r1
new file mode 100644
index 000000000000..4fa697dc2138
--- /dev/null
+++ b/metadata/md5-cache/sys-process/criu-2.12.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
+DESCRIPTION=utility to checkpoint/restore a process tree
+EAPI=6
+HOMEPAGE=http://criu.org/
+IUSE=python setproctitle python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.openvz.org/criu/criu-2.12.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=85686523c0503176971bb8e01e81a5f2
diff --git a/metadata/md5-cache/sys-process/criu-2.5 b/metadata/md5-cache/sys-process/criu-2.5
deleted file mode 100644
index 57f2ab0f889b..000000000000
--- a/metadata/md5-cache/sys-process/criu-2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python setproctitle python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-2.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2c32cb025c499946f3556e04af8f97c2
diff --git a/metadata/md5-cache/sys-process/criu-2.5-r1 b/metadata/md5-cache/sys-process/criu-2.5-r1
new file mode 100644
index 000000000000..959953109fc2
--- /dev/null
+++ b/metadata/md5-cache/sys-process/criu-2.5-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
+DESCRIPTION=utility to checkpoint/restore a process tree
+EAPI=6
+HOMEPAGE=http://criu.org/
+IUSE=python setproctitle python_targets_python2_7
+KEYWORDS=amd64 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.openvz.org/criu/criu-2.5.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0e36ba18eed33a5e33340864aebba738
diff --git a/metadata/md5-cache/sys-process/criu-3.4 b/metadata/md5-cache/sys-process/criu-3.4
deleted file mode 100644
index 9b494a27fd0e..000000000000
--- a/metadata/md5-cache/sys-process/criu-3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python setproctitle python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-3.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3742919d4d78f051273566ffced33210
diff --git a/metadata/md5-cache/sys-process/criu-3.4-r1 b/metadata/md5-cache/sys-process/criu-3.4-r1
new file mode 100644
index 000000000000..2a24c62011f3
--- /dev/null
+++ b/metadata/md5-cache/sys-process/criu-3.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
+DESCRIPTION=utility to checkpoint/restore a process tree
+EAPI=6
+HOMEPAGE=http://criu.org/
+IUSE=python setproctitle python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.openvz.org/criu/criu-3.4.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=eb3bc9b7da585f41599515e154cf5e45
diff --git a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6 b/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
index 5e1f6eed08f5..999583f52414 100644
--- a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
+++ b/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install setup
 DESCRIPTION=base for all cron ebuilds
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=68bd7dff5394b53dd7b5bf1687e04cbb
+_md5_=8f150bd10d7881ac65927f970c7b3557
diff --git a/metadata/md5-cache/sys-process/fuser-bsd-1142334561 b/metadata/md5-cache/sys-process/fuser-bsd-1142334561
index 70f35a5f6224..78de024923c7 100644
--- a/metadata/md5-cache/sys-process/fuser-bsd-1142334561
+++ b/metadata/md5-cache/sys-process/fuser-bsd-1142334561
@@ -3,10 +3,10 @@ DEPEND=sys-freebsd/freebsd-mk-defs virtual/pmake
 DESCRIPTION=fuser(1) utility for *BSD
 EAPI=2
 HOMEPAGE=http://mbsd.msk.ru/stas/fuser.html
-KEYWORDS=~sparc-fbsd ~x86-fbsd
+KEYWORDS=~x86-fbsd
 LICENSE=BSD
 RDEPEND=virtual/libc !sys-process/psmisc
 SLOT=0
 SRC_URI=http://mbsd.msk.ru/dist/fuser-1142334561.tar.bz2 mirror://gentoo/fuser-bsd-patches-1.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fc0133a5070fd64c20baadb53dba50be
+_md5_=26fd69c03dbff5dc1c22b7de2778bfaf
diff --git a/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4 b/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
index ff9fb79fead7..0b99c9b90454 100644
--- a/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
+++ b/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
@@ -3,10 +3,10 @@ DEPEND=sys-freebsd/freebsd-mk-defs virtual/pmake
 DESCRIPTION=pidof(1) utility for *BSD
 EAPI=5
 HOMEPAGE=http://people.freebsd.org/~novel/pidof.html
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=!sys-process/psmisc
 SLOT=0
 SRC_URI=mirror://gentoo/pidof-bsd-20050501.tar.gz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ad78be3325d133ba2e3213d760f8a26b
+_md5_=4829629a5663d2e17ba0d6c430161605
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
index a5d1a76e64b0..2ef9dcc7c8df 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=5
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
 IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),python_single_target_pypy3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) 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/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6083d4caa553078cf1d654c8cdd758fb
+_md5_=4c15bb32c026044c62f73523af6590cc
diff --git a/metadata/md5-cache/sys-process/time-1.7.2 b/metadata/md5-cache/sys-process/time-1.7.2
index e3b53371dee4..fdcdd1cae51f 100644
--- a/metadata/md5-cache/sys-process/time-1.7.2
+++ b/metadata/md5-cache/sys-process/time-1.7.2
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0
 DESCRIPTION=Displays info about resources used by a program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/directory/time.html
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://git.savannah.gnu.org/cgit/time.git/snapshot/time-1.7.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b0bbd80b83d1e5665785e25a5316a018
+_md5_=b3fa2b99c8c570c9681a6409836fde3c
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r14 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r14
index c8da128ff29c..9343b7f38ce8 100644
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r14
+++ b/metadata/md5-cache/sys-process/vixie-cron-4.1-r14
@@ -4,10 +4,10 @@ DESCRIPTION=Paul Vixie's cron daemon, a fully featured crond implementation
 EAPI=0
 HOMEPAGE=ftp://ftp.isc.org/isc/cron/
 IUSE=selinux pam debug
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD-2 BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
 _eclasses_=cron	f1612f73abbd36aca8b193e1e2cac6d5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=32b753e7f9f29d7d7a10f32263a423f2
+_md5_=3d4091ea2bf7df152c7ec2ffc33c3480
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r15 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
index b6d2737d489b..72b603301873 100644
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
+++ b/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
@@ -4,10 +4,10 @@ DESCRIPTION=Paul Vixie's cron daemon, a fully featured crond implementation
 EAPI=0
 HOMEPAGE=ftp://ftp.isc.org/isc/cron/
 IUSE=selinux pam debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD-2 BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
 _eclasses_=cron	f1612f73abbd36aca8b193e1e2cac6d5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6cd6db149b375305cd2cbbfa26109bac
+_md5_=1c4c2ed2f7710727edaaa3563e1b5dca
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 34dda3d4e3b0..c17abbc489b3 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/awk-0 b/metadata/md5-cache/virtual/awk-0
index 9736a8b99826..81ba705c816a 100644
--- a/metadata/md5-cache/virtual/awk-0
+++ b/metadata/md5-cache/virtual/awk-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+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 ~x86-macos
 RDEPEND=|| ( sys-apps/gawk sys-apps/mawk sys-apps/nawk sys-apps/busybox )
 SLOT=0
-_md5_=5cd5eda05435e1abcfd686e5833d07d2
+_md5_=ec582c8a566a0a3e43ed59e5cf72aa5b
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index 4817cd569845..6a1b3ca439aa 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+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 ~x86-macos
 RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
 SLOT=0
-_md5_=dbc0b9fd24a15231328a4c29d423d634
+_md5_=2cf6481ee6019876d040c00ca7a11e63
diff --git a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r1 b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r1
deleted file mode 100644
index 3448efcc0ae2..000000000000
--- a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+
-EAPI=5
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 amd64-linux x86-linux
-RDEPEND=|| ( =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
-SLOT=0
-_md5_=78d41e55b758dc8b407105cf9daab65a
diff --git a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2 b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
new file mode 100644
index 000000000000..7386bbbb71b8
--- /dev/null
+++ b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+
+EAPI=5
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 amd64-linux x86-linux
+RDEPEND=|| ( =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
+SLOT=0
+_md5_=931d8edfe2b273e98cfb4a8609b55304
diff --git a/metadata/md5-cache/virtual/cron-0 b/metadata/md5-cache/virtual/cron-0
index a032b1482e32..b017d6d3cf8e 100644
--- a/metadata/md5-cache/virtual/cron-0
+++ b/metadata/md5-cache/virtual/cron-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for cron
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 RDEPEND=|| ( sys-process/vixie-cron sys-process/bcron sys-process/cronie sys-process/dcron sys-process/fcron )
 SLOT=0
-_md5_=c2d9755135454dc8865446c2cb9ef2bf
+_md5_=ae3cc6dfc50e99cbb79afafaa57c75c0
diff --git a/metadata/md5-cache/virtual/cron-0-r1 b/metadata/md5-cache/virtual/cron-0-r1
index 6937a73796d1..540a029c6e80 100644
--- a/metadata/md5-cache/virtual/cron-0-r1
+++ b/metadata/md5-cache/virtual/cron-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for cron
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( sys-process/cronie sys-process/vixie-cron sys-process/bcron sys-process/dcron sys-process/fcron sys-process/systemd-cron )
 SLOT=0
-_md5_=3718d81fb6209f6acd77fb96de05a7cf
+_md5_=1a20458a197249415d5081cccced6887
diff --git a/metadata/md5-cache/virtual/dev-manager-0 b/metadata/md5-cache/virtual/dev-manager-0
deleted file mode 100644
index 6e6d41d2b533..000000000000
--- a/metadata/md5-cache/virtual/dev-manager-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the device filesystem manager
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-RDEPEND=|| ( virtual/udev sys-apps/busybox[mdev] sys-fs/devfsd sys-fs/static-dev sys-freebsd/freebsd-sbin )
-SLOT=0
-_md5_=005f95aadb5fc2d53c799ea15d1fc572
diff --git a/metadata/md5-cache/virtual/dev-manager-0-r1 b/metadata/md5-cache/virtual/dev-manager-0-r1
new file mode 100644
index 000000000000..6077bc59ab6c
--- /dev/null
+++ b/metadata/md5-cache/virtual/dev-manager-0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for the device filesystem manager
+EAPI=5
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+RDEPEND=|| ( virtual/udev sys-apps/busybox[mdev] sys-fs/devfsd sys-fs/static-dev sys-freebsd/freebsd-sbin )
+SLOT=0
+_md5_=a24cf3a7b33753549990e73a3a0f321c
diff --git a/metadata/md5-cache/virtual/editor-0 b/metadata/md5-cache/virtual/editor-0
index 6b902e4c22fa..9371928c00d9 100644
--- a/metadata/md5-cache/virtual/editor-0
+++ b/metadata/md5-cache/virtual/editor-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for editor
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/efte app-editors/elvis app-editors/emacs app-editors/emacs-vcs app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/ne app-editors/neovim app-editors/ng app-editors/nvi app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] sys-apps/ed )
 SLOT=0
-_md5_=fd8a093d2f76a398cce4f8cc22016bf1
+_md5_=3821790c9e05f3d0d44764b290f5d308
diff --git a/metadata/md5-cache/virtual/eject-0 b/metadata/md5-cache/virtual/eject-0
deleted file mode 100644
index 9789117a9e81..000000000000
--- a/metadata/md5-cache/virtual/eject-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the eject command
-EAPI=6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )
-SLOT=0
-_md5_=cefee5607cec25a51291410e13374a56
diff --git a/metadata/md5-cache/virtual/eject-0-r1 b/metadata/md5-cache/virtual/eject-0-r1
new file mode 100644
index 000000000000..d6420ed21df1
--- /dev/null
+++ b/metadata/md5-cache/virtual/eject-0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for the eject command
+EAPI=6
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+RDEPEND=|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )
+SLOT=0
+_md5_=feb40dd642f05bd1f36ab04839ff3f31
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 1fc32f2d0ff8..9618dab2fe2f 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual package to choose between gamin and fam
 EAPI=5
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-admin/fam-2.7.0-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0d110a0dfa3d2a328fdcc785a50ef4fd
+_md5_=b3cbddd883fe803b504022df4d423873
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r2 b/metadata/md5-cache/virtual/httpd-basic-0-r2
index a44eb238e547..b4e5566127ea 100644
--- a/metadata/md5-cache/virtual/httpd-basic-0-r2
+++ b/metadata/md5-cache/virtual/httpd-basic-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for static HTML-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=68f2297beb6913caa80867993681acc0
+_md5_=37ec295664526d3f9fbf45a6c4f6c338
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r1 b/metadata/md5-cache/virtual/httpd-cgi-0-r1
index d89b0246fcbc..74d131114c83 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r1
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=2760fbc02f691be3a352a0813fc85564
+_md5_=37772df18156736d19e7a858e60ae037
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r2 b/metadata/md5-cache/virtual/httpd-cgi-0-r2
index 0f10b7e65726..63e98fe588a5 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r2
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=0cf6afe24f2a8a508c7273e60b5885a8
+_md5_=6ff410f6376e59569411df0bb5072940
diff --git a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1 b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
index e1c1b0845851..3638e44a3b5d 100644
--- a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
+++ b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for FastCGI-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 RDEPEND=|| ( www-apache/mod_fcgid www-servers/lighttpd www-servers/bozohttpd www-servers/nginx www-servers/resin www-servers/cherokee )
 SLOT=0
-_md5_=c5148af949953068c34f44a7c4a434f5
+_md5_=0b59bab41988e58a626ddbea4d244871
diff --git a/metadata/md5-cache/virtual/inetd-0 b/metadata/md5-cache/virtual/inetd-0
index add9f243cfa8..559983d432cb 100644
--- a/metadata/md5-cache/virtual/inetd-0
+++ b/metadata/md5-cache/virtual/inetd-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the internet super-server daemon
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 RDEPEND=|| ( sys-apps/xinetd sys-apps/netkit-base sys-apps/ucspi-tcp dev-python/twisted-runner net-misc/ipsvd sys-freebsd/freebsd-usbin )
 SLOT=0
-_md5_=16165b800aa87d2e048ffe0474c7aa67
+_md5_=d13d569e2e6bf5153d4753f714b99584
diff --git a/metadata/md5-cache/virtual/jpeg-0-r2 b/metadata/md5-cache/virtual/jpeg-0-r2
index bbd3b921cb50..f860b83dbeb2 100644
--- a/metadata/md5-cache/virtual/jpeg-0-r2
+++ b/metadata/md5-cache/virtual/jpeg-0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages
 EAPI=5
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-8d-r1:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0db1c748e41a86a5098ce01f376f5099
+_md5_=b39c634175b4b7f8da76eee503c3adf5
diff --git a/metadata/md5-cache/virtual/jpeg-62 b/metadata/md5-cache/virtual/jpeg-62
index f4172a062e57..b94894f8f52e 100644
--- a/metadata/md5-cache/virtual/jpeg-62
+++ b/metadata/md5-cache/virtual/jpeg-62
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the libjpeg.so.62 ABI for binary-only programs
 EAPI=5
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-6b-r12:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=62
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=56bae2efa6de28824a3103263b7cdf7a
+_md5_=b3b3e6f43f9761d4cbed18ac9e0641c6
diff --git a/metadata/md5-cache/virtual/libc-0 b/metadata/md5-cache/virtual/libc-0
index fc8b33094f1c..b95262451f54 100644
--- a/metadata/md5-cache/virtual/libc-0
+++ b/metadata/md5-cache/virtual/libc-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( || ( sys-libs/uclibc sys-libs/uclibc-ng ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) )
 SLOT=0
-_md5_=b90d906e6e9663e03275b21ddee1b6c3
+_md5_=d87cf9930063927e072e04323cb499cd
diff --git a/metadata/md5-cache/virtual/libc-1 b/metadata/md5-cache/virtual/libc-1
index 8160960d0ec5..2cc532348aa7 100644
--- a/metadata/md5-cache/virtual/libc-1
+++ b/metadata/md5-cache/virtual/libc-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( || ( sys-libs/uclibc-ng sys-libs/uclibc ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) )
 SLOT=0
-_md5_=b9eaf4144ff81e76e678094910a9d40e
+_md5_=805666296fe7729e1f69b2cf9cb84429
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2
index 2a052dc8957e..8f93835ee980 100644
--- a/metadata/md5-cache/virtual/libelf-2
+++ b/metadata/md5-cache/virtual/libelf-2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.0 provider dev-libs/libelf
 EAPI=6
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7f1adb30f97c6bb975cef9c87836522b
+_md5_=c1f01d42525da6d42e97fe18f385ad40
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3
index 14359b400ab7..092f8607e795 100644
--- a/metadata/md5-cache/virtual/libelf-3
+++ b/metadata/md5-cache/virtual/libelf-3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.1 provider dev-libs/elfutils
 EAPI=6
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 RDEPEND=|| ( >=dev-libs/elfutils-0.155-r1: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-freebsd/freebsd-lib-9.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3245bb743888968961e89b54b790c5dd
+_md5_=c77d960a02358d4ecaa8064e4ad9a022
diff --git a/metadata/md5-cache/virtual/libffi-3.0.10 b/metadata/md5-cache/virtual/libffi-3.0.10
index f44ed177972a..4768c43c61bd 100644
--- a/metadata/md5-cache/virtual/libffi-3.0.10
+++ b/metadata/md5-cache/virtual/libffi-3.0.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Foreign Function Interface implementation
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm 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
 RDEPEND=>=dev-libs/libffi-3.0.10
 SLOT=0
-_md5_=4d71218326a293f93ad582a90d190eb3
+_md5_=ada1620be87b737becfab232cc7d03b3
diff --git a/metadata/md5-cache/virtual/libffi-3.0.11 b/metadata/md5-cache/virtual/libffi-3.0.11
index 9840c9eb38fd..82fe3b83324d 100644
--- a/metadata/md5-cache/virtual/libffi-3.0.11
+++ b/metadata/md5-cache/virtual/libffi-3.0.11
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Foreign Function Interface implementation
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libffi-3.0.11
 SLOT=0
-_md5_=c8507c06fe072ea02f8ac60b35c4a603
+_md5_=b98bb0fef31cdeee2d5feb0029fdbc17
diff --git a/metadata/md5-cache/virtual/libffi-3.0.13-r1 b/metadata/md5-cache/virtual/libffi-3.0.13-r1
index daea111f0caa..6b9856debabb 100644
--- a/metadata/md5-cache/virtual/libffi-3.0.13-r1
+++ b/metadata/md5-cache/virtual/libffi-3.0.13-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Foreign Function Interface implementation
 EAPI=5
 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=76c31dd84133ca0fba46e46563bc4cff
+_md5_=4778a363883061ea842d6932f4a5370e
diff --git a/metadata/md5-cache/virtual/libiconv-0 b/metadata/md5-cache/virtual/libiconv-0
index cbc734137e75..62372a3e6c9d 100644
--- a/metadata/md5-cache/virtual/libiconv-0
+++ b/metadata/md5-cache/virtual/libiconv-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc elibc_musl
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )
 SLOT=0
-_md5_=6df436a1f3f787b52259905044367042
+_md5_=ee774952ae99b1c0f1b8d2f697a139a6
diff --git a/metadata/md5-cache/virtual/libiconv-0-r1 b/metadata/md5-cache/virtual/libiconv-0-r1
index a886ba093176..e1ebf2309e32 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r1
+++ b/metadata/md5-cache/virtual/libiconv-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3754009d58794ee65cd24cf393eac734
+_md5_=3e4f47cd9ce862601873ccf72b7d04cf
diff --git a/metadata/md5-cache/virtual/libiconv-0-r2 b/metadata/md5-cache/virtual/libiconv-0-r2
index 1cdec4f4fc2b..6523453c004a 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r2
+++ b/metadata/md5-cache/virtual/libiconv-0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-freebsd/freebsd-lib-10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=864f057d89d98c3ed5e9ccc1348f0aae
+_md5_=44a99fca17d4ef06ca2801b6a9f3ed2d
diff --git a/metadata/md5-cache/virtual/libintl-0 b/metadata/md5-cache/virtual/libintl-0
index 030be2218ca7..b65144c2a42f 100644
--- a/metadata/md5-cache/virtual/libintl-0
+++ b/metadata/md5-cache/virtual/libintl-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )
 SLOT=0
-_md5_=62ddc9a409968c11d31e1a95e7c3a895
+_md5_=d7048f82b03275fa04cb4f2ff0781b44
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
index 228d36ad2398..ec66b763ff72 100644
--- a/metadata/md5-cache/virtual/libintl-0-r1
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97eabc91c077b1d01a365178645d3859
+_md5_=b1136a118fbaf17ecc01bff1f1edf28f
diff --git a/metadata/md5-cache/virtual/libintl-0-r2 b/metadata/md5-cache/virtual/libintl-0-r2
index 81db0389ff84..5426c59f3e91 100644
--- a/metadata/md5-cache/virtual/libintl-0-r2
+++ b/metadata/md5-cache/virtual/libintl-0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_musl elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9e14b386cc75c6475a298957f2ae5920
+_md5_=5c88f5ff373c4221f65b7542c9ebb160
diff --git a/metadata/md5-cache/virtual/libmysqlclient-18 b/metadata/md5-cache/virtual/libmysqlclient-18
index eb4b84ad22d9..94c45dffb633 100644
--- a/metadata/md5-cache/virtual/libmysqlclient-18
+++ b/metadata/md5-cache/virtual/libmysqlclient-18
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL client libraries
 EAPI=5
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( dev-db/mysql-connector-c:0/18[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mariadb:0/18[client-libs(+),static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql:0/18[client-libs(+),static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/percona-server:0/18[client-libs(+),static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mariadb-galera:0/18[client-libs(+),static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-cluster:0/18[client-libs(+),static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/18
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=743869123aba42cf6163418a616b1b4f
+_md5_=6fad1e7c1a4a06e77523ad539fb9a6a6
diff --git a/metadata/md5-cache/virtual/logger-0 b/metadata/md5-cache/virtual/logger-0
index cbf9f1bcd466..2f2e99d3a8e8 100644
--- a/metadata/md5-cache/virtual/logger-0
+++ b/metadata/md5-cache/virtual/logger-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for system loggers
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( app-admin/metalog app-admin/rsyslog app-admin/socklog app-admin/sysklogd app-admin/syslog-ng app-admin/syslogread sys-freebsd/freebsd-usbin sys-apps/busybox[syslog] >=sys-apps/systemd-38 )
 SLOT=0
-_md5_=cc545a823b8d7e4496159341196585a1
+_md5_=5ad84bd09909c35391f84220301644c3
diff --git a/metadata/md5-cache/virtual/man-0-r1 b/metadata/md5-cache/virtual/man-0-r1
index 7bcf02e8d1bc..1f6ee06bff29 100644
--- a/metadata/md5-cache/virtual/man-0-r1
+++ b/metadata/md5-cache/virtual/man-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for man
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/man-db sys-apps/man )
 SLOT=0
-_md5_=e7310d8464c5e53bf1609c7ef25f7eed
+_md5_=a3fb2b6b6951f7b9d01e056de5dbeaa3
diff --git a/metadata/md5-cache/virtual/mta-0 b/metadata/md5-cache/virtual/mta-0
index 54a8805d77f4..c0fcd20c83b1 100644
--- a/metadata/md5-cache/virtual/mta-0
+++ b/metadata/md5-cache/virtual/mta-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Transfer Agents
 EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=mail-mta/ssmtp-2.64-r2[mta] <mail-mta/ssmtp-2.64-r2 mail-mta/courier mail-mta/esmtp mail-mta/exim mail-mta/mini-qmail >=mail-mta/msmtp-1.4.19-r1[mta] <mail-mta/msmtp-1.4.19-r1 mail-mta/netqmail mail-mta/nullmailer mail-mta/postfix mail-mta/qmail-ldap mail-mta/sendmail mail-mta/opensmtpd mail-mta/citadel[-postfix] )
 SLOT=0
-_md5_=0dd040fadbfd7575f810f9693dd955c3
+_md5_=3ff2eb05faf1ba42df1f43e4d875e8c2
diff --git a/metadata/md5-cache/virtual/mta-1 b/metadata/md5-cache/virtual/mta-1
index 246c5bad816d..00cdf645016c 100644
--- a/metadata/md5-cache/virtual/mta-1
+++ b/metadata/md5-cache/virtual/mta-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Transfer Agents
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( mail-mta/nullmailer mail-mta/msmtp[mta] mail-mta/ssmtp[mta] mail-mta/courier mail-mta/esmtp mail-mta/exim mail-mta/mini-qmail mail-mta/netqmail mail-mta/postfix mail-mta/qmail-ldap mail-mta/sendmail mail-mta/opensmtpd mail-mta/citadel[-postfix] )
 SLOT=0
-_md5_=66710cf9e4742e1f78585d7ad8f94954
+_md5_=65c24816035cb5637ea05a7f312b233c
diff --git a/metadata/md5-cache/virtual/mysql-5.5-r1 b/metadata/md5-cache/virtual/mysql-5.5-r1
index 5c1b3dcaef3f..115a34523681 100644
--- a/metadata/md5-cache/virtual/mysql-5.5-r1
+++ b/metadata/md5-cache/virtual/mysql-5.5-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL client or database
 EAPI=5
 IUSE=embedded minimal static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-5.5*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-5.5*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-cluster-7.2*[embedded=,minimal=,static=,static-libs=] )
 SLOT=0
-_md5_=646f81b8ecfc58b301a3da9f1b2ac5ce
+_md5_=fbdb9123566299161d51b2dad9f160f2
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r10 b/metadata/md5-cache/virtual/mysql-5.6-r10
index c32cdf84d2d2..4dcaa6ad2a95 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r10
+++ b/metadata/md5-cache/virtual/mysql-5.6-r10
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL database server
 EAPI=6
 IUSE=embedded +server static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-10.2*[embedded(-)?,server?,static?] =dev-db/mariadb-10.1*[embedded(-)?,server?,static?] =dev-db/mariadb-10.0*[embedded(-)?,server?,static?] =dev-db/mysql-5.6*[embedded(-)?,server?,static?] =dev-db/percona-server-5.6*[embedded(-)?,server?,static?] =dev-db/mariadb-galera-10.0*[embedded(-)?,server?,static?] =dev-db/mysql-cluster-7.4*[embedded(-)?,server?,static?] =dev-db/mysql-cluster-7.3*[embedded(-)?,server?,static?] )
 SLOT=0/18
-_md5_=ea6428d7e898fd84b14b20e8aed3d1b0
+_md5_=083d860e3ae2b0fb1a5001189c4bbb6f
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r6 b/metadata/md5-cache/virtual/mysql-5.6-r6
index 0e323464aae0..9dd81b2b79fb 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r6
+++ b/metadata/md5-cache/virtual/mysql-5.6-r6
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL database server
 EAPI=5
 IUSE=embedded static 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 ~sparc-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=virtual/libmysqlclient[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(-)?] embedded? ( || ( =dev-db/mariadb-10.1*[client-libs(+),embedded,static=] =dev-db/mariadb-10.0*[client-libs(+),embedded,static=] =dev-db/mysql-5.6*[client-libs(+),embedded,static=] =dev-db/percona-server-5.6*[client-libs(+),embedded,static=] =dev-db/mariadb-galera-10.0*[client-libs(+),embedded,static=] =dev-db/mysql-cluster-7.3*[client-libs(+),embedded,static=] ) ) !embedded? ( || ( =dev-db/mariadb-10.1*[-embedded,static=] =dev-db/mariadb-10.0*[-embedded,static=] =dev-db/mysql-5.6*[-embedded,static=] =dev-db/percona-server-5.6*[-embedded,static=] =dev-db/mariadb-galera-10.0*[-embedded,static=] =dev-db/mysql-cluster-7.3*[-embedded,static=] ) )
 SLOT=0/18
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=78657d4374572bca6399df45743d8a5b
+_md5_=f570359724337b34987c8326007b5e18
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r7 b/metadata/md5-cache/virtual/mysql-5.6-r7
index 3d2be14968a9..d430d3688fe5 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r7
+++ b/metadata/md5-cache/virtual/mysql-5.6-r7
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL database server
 EAPI=5
 IUSE=embedded static 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 ~sparc-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 PDEPEND=virtual/libmysqlclient[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(-)?]
 RDEPEND=embedded? ( || ( =dev-db/mariadb-10.1*[client-libs(+),embedded,static=] =dev-db/mariadb-10.0*[client-libs(+),embedded,static=] =dev-db/mysql-5.6*[client-libs(+),embedded,static=] =dev-db/percona-server-5.6*[client-libs(+),embedded,static=] =dev-db/mariadb-galera-10.0*[client-libs(+),embedded,static=] =dev-db/mysql-cluster-7.3*[client-libs(+),embedded,static=] ) ) !embedded? ( || ( =dev-db/mariadb-10.1*[-embedded,static=] =dev-db/mariadb-10.0*[-embedded,static=] =dev-db/mysql-5.6*[-embedded,static=] =dev-db/percona-server-5.6*[-embedded,static=] =dev-db/mariadb-galera-10.0*[-embedded,static=] =dev-db/mysql-cluster-7.3*[-embedded,static=] ) )
 SLOT=0/18
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4b963f5ff6f7b395afae288b702d44b6
+_md5_=f092a1f4a0e732f1e72aa776f23bf77d
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r8 b/metadata/md5-cache/virtual/mysql-5.6-r8
index 6519501ffb26..6df55c947af4 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r8
+++ b/metadata/md5-cache/virtual/mysql-5.6-r8
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL database server
 EAPI=6
 IUSE=embedded static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-10.1*[embedded?,server,static?] =dev-db/mariadb-10.0*[embedded?,server,static?] =dev-db/mysql-5.6*[embedded?,server,static?] =dev-db/percona-server-5.6*[embedded?,server,static?] =dev-db/mariadb-galera-10.0*[embedded?,server,static?] =dev-db/mysql-cluster-7.3*[embedded?,server,static?] )
 SLOT=0/18
-_md5_=fb18d6fde41949697e64a2d947fe6f0d
+_md5_=f75297138e36441b2730aa3fcf7e5847
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r9 b/metadata/md5-cache/virtual/mysql-5.6-r9
index d024946b27dd..cbcdcd07cb27 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r9
+++ b/metadata/md5-cache/virtual/mysql-5.6-r9
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL database server
 EAPI=6
 IUSE=embedded +server static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-10.2*[embedded?,server?,static?] =dev-db/mariadb-10.1*[embedded?,server?,static?] =dev-db/mariadb-10.0*[embedded?,server?,static?] =dev-db/mysql-5.6*[embedded?,server?,static?] =dev-db/percona-server-5.6*[embedded?,server?,static?] =dev-db/mariadb-galera-10.0*[embedded?,server?,static?] =dev-db/mysql-cluster-7.3*[embedded?,server?,static?] )
 SLOT=0/18
-_md5_=853c3e3c2b654ffcda462c6a6e36351f
+_md5_=7fc22e54b3ab2ce97392a4014a42dded
diff --git a/metadata/md5-cache/virtual/os-headers-0 b/metadata/md5-cache/virtual/os-headers-0
index 2730e7ca7cda..aa40810407ae 100644
--- a/metadata/md5-cache/virtual/os-headers-0
+++ b/metadata/md5-cache/virtual/os-headers-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for operating system headers
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( kernel_linux? ( sys-kernel/linux-headers:0 ) !prefix? ( sys-freebsd/freebsd-lib ) )
 SLOT=0
-_md5_=959160304dcbea445de7e14ef73efd5d
+_md5_=05a9952c53eec6a3d7ec62459631ea72
diff --git a/metadata/md5-cache/virtual/package-manager-0 b/metadata/md5-cache/virtual/package-manager-0
index 199a8a11379e..c07b49fa19e8 100644
--- a/metadata/md5-cache/virtual/package-manager-0
+++ b/metadata/md5-cache/virtual/package-manager-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the package manager
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/portage sys-apps/paludis sys-apps/pkgcore )
 SLOT=0
-_md5_=004835dab42c7d274cea77d3f985c00f
+_md5_=8484e536bd1abc3ac22974394b4e3eeb
diff --git a/metadata/md5-cache/virtual/pager-0 b/metadata/md5-cache/virtual/pager-0
index 4c45ccd6422b..af9ca0032e87 100644
--- a/metadata/md5-cache/virtual/pager-0
+++ b/metadata/md5-cache/virtual/pager-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for command-line pagers
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/less sys-apps/more sys-apps/most sys-apps/util-linux[ncurses] app-text/lv app-editors/vim[vim-pager] )
 SLOT=0
-_md5_=61ba5495e1b3c02c0e5c7b61c4b7024b
+_md5_=29f7080d8ae637443d66fa8fda458fba
diff --git a/metadata/md5-cache/virtual/pam-0 b/metadata/md5-cache/virtual/pam-0
index 9c2acffbb3a2..f6114b251e15 100644
--- a/metadata/md5-cache/virtual/pam-0
+++ b/metadata/md5-cache/virtual/pam-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for PAM (Pluggable Authentication Modules)
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-libs/pam-0.78 sys-auth/openpam )
 SLOT=0
-_md5_=78e4a16fd1d8e747762c3e33e2d8919d
+_md5_=50d45bb63b83e7661eeb50be6b159f2c
diff --git a/metadata/md5-cache/virtual/pam-0-r1 b/metadata/md5-cache/virtual/pam-0-r1
index 08c1dc4771a6..94e252c9f0dc 100644
--- a/metadata/md5-cache/virtual/pam-0-r1
+++ b/metadata/md5-cache/virtual/pam-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for PAM (Pluggable Authentication Modules)
 EAPI=5
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-libs/pam-1.1.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-auth/openpam-20120526-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=79a31a89e15ebcddd90202297a9f60ce
+_md5_=dc4e66d5d396e7de7de5b0fab5e475cf
diff --git a/metadata/md5-cache/virtual/pkgconfig-0-r1 b/metadata/md5-cache/virtual/pkgconfig-0-r1
index 860c1d0a4841..ce372299b29b 100644
--- a/metadata/md5-cache/virtual/pkgconfig-0-r1
+++ b/metadata/md5-cache/virtual/pkgconfig-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the pkg-config implementation
 EAPI=5
 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=dev-util/pkgconfig-0.28-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconf-0.9.12[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=808c1c96d801202c3df5248f950e0758
+_md5_=21b27a00cd3252a25f9c81b255fc0141
diff --git a/metadata/md5-cache/virtual/pmake-1 b/metadata/md5-cache/virtual/pmake-1
index 54dc009b176b..1986436bd6b1 100644
--- a/metadata/md5-cache/virtual/pmake-1
+++ b/metadata/md5-cache/virtual/pmake-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for BSD-like make (to be used with get_bmake)
 EAPI=6
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos
 RDEPEND=kernel_linux? ( sys-devel/bmake ) kernel_SunOS? ( sys-devel/bmake ) kernel_Darwin? ( sys-devel/bsdmake )
 SLOT=0
-_md5_=a4bf0fb798014ab8a967b476d87df069
+_md5_=bd49c3d55b356ae02ae9790435a939f8
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
deleted file mode 100644
index 9fa51fa35abf..000000000000
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=Virtual ebuild for the Ruby ffi library
-EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby22
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=69d76d347d30ffb0be49eefe308571d3
diff --git a/metadata/md5-cache/virtual/ruby-ffi-4 b/metadata/md5-cache/virtual/ruby-ffi-4
index 0308434e0f96..b1f208ef44fa 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-4
+++ b/metadata/md5-cache/virtual/ruby-ffi-4
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby ffi library
 EAPI=5
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f570c0d58f999a3a995298a62fae41d8
+_md5_=bf85c38159efe742c9f1017255c8ce18
diff --git a/metadata/md5-cache/virtual/rust-1.23.0 b/metadata/md5-cache/virtual/rust-1.23.0
new file mode 100644
index 000000000000..86af7d159e54
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.23.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=6
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.23.0* =dev-lang/rust-bin-1.23.0* )
+SLOT=0
+_md5_=e021228b7e2243030200e59e74c71d63
diff --git a/metadata/md5-cache/virtual/service-manager-0 b/metadata/md5-cache/virtual/service-manager-0
index bd00f4665a91..a2198be222f7 100644
--- a/metadata/md5-cache/virtual/service-manager-0
+++ b/metadata/md5-cache/virtual/service-manager-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for various service managers
 EAPI=5
 IUSE=kernel_linux prefix
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=prefix? ( >=sys-apps/baselayout-prefix-2.2 ) !prefix? ( || ( sys-apps/openrc kernel_linux? ( || ( sys-apps/systemd sys-process/runit virtual/daemontools ) ) ) )
 SLOT=0
-_md5_=dbf79e6a9aeaa75157dff67b91803bea
+_md5_=070e411cd3ebd27b83fcf1bc87285646
diff --git a/metadata/md5-cache/virtual/ssh-0 b/metadata/md5-cache/virtual/ssh-0
index 8075323b5dbd..9271f354baad 100644
--- a/metadata/md5-cache/virtual/ssh-0
+++ b/metadata/md5-cache/virtual/ssh-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for SSH client and server
 EAPI=6
 IUSE=minimal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=minimal? ( || ( net-misc/dropbear net-misc/openssh ) ) !minimal? ( || ( net-misc/openssh net-misc/dropbear ) )
 SLOT=0
-_md5_=19bf3dd2c2c9ffcd59fcea71c21e3af2
+_md5_=df71a084cbca64b28f56c0949634a92b
diff --git a/metadata/md5-cache/virtual/yacc-0 b/metadata/md5-cache/virtual/yacc-0
index 0478590e20af..df0a7abc21ec 100644
--- a/metadata/md5-cache/virtual/yacc-0
+++ b/metadata/md5-cache/virtual/yacc-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=virtual for yacc (yet another compiler compiler)
 EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
 SLOT=0
-_md5_=88069e187dd51b7208e02fce9dcc95ea
+_md5_=8a294118783e3ec854822238d95e7756
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index da82351ad08c..730a958fbd4b 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/icingaweb2-2.5.1 b/metadata/md5-cache/www-apps/icingaweb2-2.5.1
new file mode 100644
index 000000000000..f902a594bfbe
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=6
+HOMEPAGE=http://www.icinga.org/
+IUSE=apache2 ldap mysql nginx pdf postgres apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=^^ ( apache2 nginx )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.5.1 -> icingaweb2-2.5.1.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a06ad82c86b12f897900228a335e4cd3
diff --git a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2 b/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
deleted file mode 100644
index 1d5c46b7fc6b..000000000000
--- a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] dev-ruby/mime-types:0[ruby_targets_ruby22] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby22] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby22] >=dev-ruby/rouge-1.7[ruby_targets_ruby22] >=dev-ruby/shoulda-3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A simple, blog aware, static site generator
-EAPI=5
-HOMEPAGE=http://jekyllrb.com https://github.com/jekyll/jekyll
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jekyll/jekyll/archive/v3.2.1.tar.gz -> jekyll-3.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=210297a1afe63248961cb2a6d5f1a405
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
deleted file mode 100644
index 71a80b0db077..000000000000
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/coffee-script[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( www-apps/jekyll[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A CoffeeScript Converter for Jekyll
-EAPI=5
-HOMEPAGE=https://github.com/jekyll/jekyll-coffeescript
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/coffee-script[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.1.tar.gz -> jekyll-coffeescript-1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d24d43b00751243f1cf3d98c7152d430
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
deleted file mode 100644
index c74e8c8e2c8a..000000000000
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A basic Sass converter for Jekyll
-EAPI=5
-HOMEPAGE=https://github.com/jekyll/jekyll-sass-converter
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v1.4.0.tar.gz -> jekyll-sass-converter-1.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9804a855d19847082858ba1b84063590
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
index 9c7491fcd689..bc7818f05b33 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Automatically generate a sitemap.xml for your Jekyll site
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-sitemap
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v0.11.0.tar.gz -> jekyll-sitemap-0.11.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9efc44aa681b2a63bef858fd438050c6
+_md5_=9a5564ff2e0a49d698018c9decb9baf7
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1 b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
deleted file mode 100644
index 356c86285253..000000000000
--- a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Rebuild your Jekyll site when a file changes with the --watch switch
-EAPI=5
-HOMEPAGE=https://github.com/jekyll/jekyll-watch
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/listen-3.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v1.3.1.tar.gz -> jekyll-watch-1.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7db33bc72eb8037c9d3afc43ca406471
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.8 b/metadata/md5-cache/www-apps/redmine-3.2.8
deleted file mode 100644
index fe9f02af13be..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.2.8.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=65b90950dddc0613639acf1a7271be48
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.9 b/metadata/md5-cache/www-apps/redmine-3.2.9
new file mode 100644
index 000000000000..3737dc5b7a82
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=https://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-3.2.9.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b3f6ab8d851d35696db843aa51aeba1b
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.5 b/metadata/md5-cache/www-apps/redmine-3.3.5
deleted file mode 100644
index 54db1252fe71..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.3.5.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=73d18836314c8e2ae66801d202f86b8e
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.6 b/metadata/md5-cache/www-apps/redmine-3.3.6
new file mode 100644
index 000000000000..5db7445c86de
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=https://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-3.3.6.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b3f6ab8d851d35696db843aa51aeba1b
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.3 b/metadata/md5-cache/www-apps/redmine-3.4.3
deleted file mode 100644
index b2b4928f3697..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.4.3.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=08d252d11926626020e600908489de12
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.4 b/metadata/md5-cache/www-apps/redmine-3.4.4
new file mode 100644
index 000000000000..92951abb9716
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=https://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-3.4.4.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b3f6ab8d851d35696db843aa51aeba1b
diff --git a/metadata/md5-cache/www-apps/wordpress-4.8.3 b/metadata/md5-cache/www-apps/wordpress-4.8.3
deleted file mode 100644
index 98cc771daeb2..000000000000
--- a/metadata/md5-cache/www-apps/wordpress-4.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
-EAPI=6
-HOMEPAGE=https://wordpress.org/
-IUSE=+akismet examples +themes vhosts vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
-SLOT=4.8.3
-SRC_URI=https://wordpress.org/wordpress-4.8.3.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=2d8c70d9a087c86df718322d0f139919
diff --git a/metadata/md5-cache/www-apps/wordpress-4.9 b/metadata/md5-cache/www-apps/wordpress-4.9
deleted file mode 100644
index f9b28a5c5b45..000000000000
--- a/metadata/md5-cache/www-apps/wordpress-4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
-EAPI=6
-HOMEPAGE=https://wordpress.org/
-IUSE=+akismet examples +themes vhosts vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
-SLOT=4.9
-SRC_URI=https://wordpress.org/wordpress-4.9.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=2d8c70d9a087c86df718322d0f139919
diff --git a/metadata/md5-cache/www-apps/wordpress-4.9.1 b/metadata/md5-cache/www-apps/wordpress-4.9.1
deleted file mode 100644
index e50fd0275b9b..000000000000
--- a/metadata/md5-cache/www-apps/wordpress-4.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
-EAPI=6
-HOMEPAGE=https://wordpress.org/
-IUSE=+akismet examples +themes vhosts vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
-SLOT=4.9.1
-SRC_URI=https://wordpress.org/wordpress-4.9.1.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=2d8c70d9a087c86df718322d0f139919
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6b7346ac43d1..6347d1437928 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/chromium-63.0.3239.132 b/metadata/md5-cache/www-client/chromium-63.0.3239.132
index 20f029108877..56f526f06035 100644
--- a/metadata/md5-cache/www-client/chromium-63.0.3239.132
+++ b/metadata/md5-cache/www-client/chromium-63.0.3239.132
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.132.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3af2baa318d738c5a5dfa42deccfeac
+_md5_=e4f43eb1a9dd2571c1763049b7bca0b7
diff --git a/metadata/md5-cache/www-client/firefox-52.2.0 b/metadata/md5-cache/www-client/firefox-52.2.0
index 26e129a05122..52ca695e167b 100644
--- a/metadata/md5-cache/www-client/firefox-52.2.0
+++ b/metadata/md5-cache/www-client/firefox-52.2.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ach.xpi -> firefox-52.2.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/af.xpi -> firefox-52.2.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/an.xpi -> firefox-52.2.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ar.xpi -> firefox-52.2.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/as.xpi -> firefox-52.2.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ast.xpi -> firefox-52.2.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/az.xpi -> firefox-52.2.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/bg.xpi -> firefox-52.2.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.2.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.2.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/br.xpi -> firefox-52.2.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/bs.xpi -> firefox-52.2.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ca.xpi -> firefox-52.2.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/cak.xpi -> firefox-52.2.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/cs.xpi -> firefox-52.2.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/cy.xpi -> firefox-52.2.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/da.xpi -> firefox-52.2.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/de.xpi -> firefox-52.2.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.2.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/el.xpi -> firefox-52.2.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.2.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.2.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/eo.xpi -> firefox-52.2.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.2.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.2.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.2.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.2.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/et.xpi -> firefox-52.2.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/eu.xpi -> firefox-52.2.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/fa.xpi -> firefox-52.2.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ff.xpi -> firefox-52.2.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/fi.xpi -> firefox-52.2.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/fr.xpi -> firefox-52.2.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.2.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.2.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/gd.xpi -> firefox-52.2.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/gl.xpi -> firefox-52.2.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/gn.xpi -> firefox-52.2.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.2.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/he.xpi -> firefox-52.2.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.2.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/hr.xpi -> firefox-52.2.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.2.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/hu.xpi -> firefox-52.2.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.2.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/id.xpi -> firefox-52.2.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/is.xpi -> firefox-52.2.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/it.xpi -> firefox-52.2.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ja.xpi -> firefox-52.2.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ka.xpi -> firefox-52.2.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/kab.xpi -> firefox-52.2.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/kk.xpi -> firefox-52.2.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/km.xpi -> firefox-52.2.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/kn.xpi -> firefox-52.2.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ko.xpi -> firefox-52.2.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/lij.xpi -> firefox-52.2.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/lt.xpi -> firefox-52.2.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/lv.xpi -> firefox-52.2.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/mai.xpi -> firefox-52.2.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/mk.xpi -> firefox-52.2.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ml.xpi -> firefox-52.2.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/mr.xpi -> firefox-52.2.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ms.xpi -> firefox-52.2.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.2.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/nl.xpi -> firefox-52.2.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.2.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/or.xpi -> firefox-52.2.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.2.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/pl.xpi -> firefox-52.2.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.2.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.2.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/rm.xpi -> firefox-52.2.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ro.xpi -> firefox-52.2.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ru.xpi -> firefox-52.2.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/si.xpi -> firefox-52.2.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/sk.xpi -> firefox-52.2.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/sl.xpi -> firefox-52.2.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/son.xpi -> firefox-52.2.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/sq.xpi -> firefox-52.2.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/sr.xpi -> firefox-52.2.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.2.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/ta.xpi -> firefox-52.2.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/te.xpi -> firefox-52.2.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/th.xpi -> firefox-52.2.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/tr.xpi -> firefox-52.2.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/uk.xpi -> firefox-52.2.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/uz.xpi -> firefox-52.2.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/vi.xpi -> firefox-52.2.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/xh.xpi -> firefox-52.2.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.2.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.2.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.2.0esr/source/firefox-52.2.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-01.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9bd3b2ce5c97e43600fa7eb18a701fbf
diff --git a/metadata/md5-cache/www-client/firefox-52.4.0 b/metadata/md5-cache/www-client/firefox-52.4.0
index 892d4ba93c5e..8cd80594872e 100644
--- a/metadata/md5-cache/www-client/firefox-52.4.0
+++ b/metadata/md5-cache/www-client/firefox-52.4.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ach.xpi -> firefox-52.4.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/af.xpi -> firefox-52.4.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/an.xpi -> firefox-52.4.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ar.xpi -> firefox-52.4.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/as.xpi -> firefox-52.4.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ast.xpi -> firefox-52.4.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/az.xpi -> firefox-52.4.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bg.xpi -> firefox-52.4.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.4.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.4.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/br.xpi -> firefox-52.4.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bs.xpi -> firefox-52.4.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ca.xpi -> firefox-52.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cak.xpi -> firefox-52.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cs.xpi -> firefox-52.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cy.xpi -> firefox-52.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/da.xpi -> firefox-52.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/de.xpi -> firefox-52.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/el.xpi -> firefox-52.4.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.4.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.4.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/eo.xpi -> firefox-52.4.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.4.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.4.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.4.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.4.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/et.xpi -> firefox-52.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/eu.xpi -> firefox-52.4.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fa.xpi -> firefox-52.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ff.xpi -> firefox-52.4.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fi.xpi -> firefox-52.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fr.xpi -> firefox-52.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gd.xpi -> firefox-52.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gl.xpi -> firefox-52.4.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gn.xpi -> firefox-52.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.4.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/he.xpi -> firefox-52.4.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.4.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hr.xpi -> firefox-52.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hu.xpi -> firefox-52.4.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.4.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/id.xpi -> firefox-52.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/is.xpi -> firefox-52.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/it.xpi -> firefox-52.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ja.xpi -> firefox-52.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ka.xpi -> firefox-52.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kab.xpi -> firefox-52.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kk.xpi -> firefox-52.4.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/km.xpi -> firefox-52.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kn.xpi -> firefox-52.4.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ko.xpi -> firefox-52.4.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lij.xpi -> firefox-52.4.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lt.xpi -> firefox-52.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lv.xpi -> firefox-52.4.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mai.xpi -> firefox-52.4.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mk.xpi -> firefox-52.4.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ml.xpi -> firefox-52.4.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mr.xpi -> firefox-52.4.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ms.xpi -> firefox-52.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nl.xpi -> firefox-52.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.4.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/or.xpi -> firefox-52.4.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pl.xpi -> firefox-52.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/rm.xpi -> firefox-52.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ro.xpi -> firefox-52.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ru.xpi -> firefox-52.4.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/si.xpi -> firefox-52.4.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sk.xpi -> firefox-52.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sl.xpi -> firefox-52.4.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/son.xpi -> firefox-52.4.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sq.xpi -> firefox-52.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sr.xpi -> firefox-52.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.4.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ta.xpi -> firefox-52.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/te.xpi -> firefox-52.4.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/th.xpi -> firefox-52.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/tr.xpi -> firefox-52.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/uk.xpi -> firefox-52.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/uz.xpi -> firefox-52.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/vi.xpi -> firefox-52.4.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/xh.xpi -> firefox-52.4.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.4.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/source/firefox-52.4.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dcc0e5ce18367e327dc39d19c422c043
diff --git a/metadata/md5-cache/www-client/firefox-52.5.2 b/metadata/md5-cache/www-client/firefox-52.5.2
index b0aac71b026e..ed9ed5046797 100644
--- a/metadata/md5-cache/www-client/firefox-52.5.2
+++ b/metadata/md5-cache/www-client/firefox-52.5.2
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ach.xpi -> firefox-52.5.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/af.xpi -> firefox-52.5.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/an.xpi -> firefox-52.5.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ar.xpi -> firefox-52.5.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/as.xpi -> firefox-52.5.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ast.xpi -> firefox-52.5.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/az.xpi -> firefox-52.5.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/bg.xpi -> firefox-52.5.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.5.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.5.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/br.xpi -> firefox-52.5.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/bs.xpi -> firefox-52.5.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ca.xpi -> firefox-52.5.2esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/cak.xpi -> firefox-52.5.2esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/cs.xpi -> firefox-52.5.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/cy.xpi -> firefox-52.5.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/da.xpi -> firefox-52.5.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/de.xpi -> firefox-52.5.2esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/dsb.xpi -> firefox-52.5.2esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/el.xpi -> firefox-52.5.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/en-GB.xpi -> firefox-52.5.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.5.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/eo.xpi -> firefox-52.5.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/es-AR.xpi -> firefox-52.5.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/es-CL.xpi -> firefox-52.5.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/es-ES.xpi -> firefox-52.5.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/es-MX.xpi -> firefox-52.5.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/et.xpi -> firefox-52.5.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/eu.xpi -> firefox-52.5.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/fa.xpi -> firefox-52.5.2esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ff.xpi -> firefox-52.5.2esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/fi.xpi -> firefox-52.5.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/fr.xpi -> firefox-52.5.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.5.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.5.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/gd.xpi -> firefox-52.5.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/gl.xpi -> firefox-52.5.2esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/gn.xpi -> firefox-52.5.2esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.5.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/he.xpi -> firefox-52.5.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.5.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/hr.xpi -> firefox-52.5.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/hsb.xpi -> firefox-52.5.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/hu.xpi -> firefox-52.5.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.5.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/id.xpi -> firefox-52.5.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/is.xpi -> firefox-52.5.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/it.xpi -> firefox-52.5.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ja.xpi -> firefox-52.5.2esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ka.xpi -> firefox-52.5.2esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/kab.xpi -> firefox-52.5.2esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/kk.xpi -> firefox-52.5.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/km.xpi -> firefox-52.5.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/kn.xpi -> firefox-52.5.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ko.xpi -> firefox-52.5.2esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/lij.xpi -> firefox-52.5.2esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/lt.xpi -> firefox-52.5.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/lv.xpi -> firefox-52.5.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/mai.xpi -> firefox-52.5.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/mk.xpi -> firefox-52.5.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ml.xpi -> firefox-52.5.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/mr.xpi -> firefox-52.5.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ms.xpi -> firefox-52.5.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.5.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/nl.xpi -> firefox-52.5.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.5.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/or.xpi -> firefox-52.5.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.5.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/pl.xpi -> firefox-52.5.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.5.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.5.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/rm.xpi -> firefox-52.5.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ro.xpi -> firefox-52.5.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ru.xpi -> firefox-52.5.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/si.xpi -> firefox-52.5.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/sk.xpi -> firefox-52.5.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/sl.xpi -> firefox-52.5.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/son.xpi -> firefox-52.5.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/sq.xpi -> firefox-52.5.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/sr.xpi -> firefox-52.5.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.5.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/ta.xpi -> firefox-52.5.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/te.xpi -> firefox-52.5.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/th.xpi -> firefox-52.5.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/tr.xpi -> firefox-52.5.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/uk.xpi -> firefox-52.5.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/uz.xpi -> firefox-52.5.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/vi.xpi -> firefox-52.5.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/xh.xpi -> firefox-52.5.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.5.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.5.2esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.5.2esr/source/firefox-52.5.2esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40f6c82058871258c0a9d85362d0a023
diff --git a/metadata/md5-cache/www-client/firefox-52.6.0 b/metadata/md5-cache/www-client/firefox-52.6.0
new file mode 100644
index 000000000000..4a0f48e9694e
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-52.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) rust? ( virtual/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=bindist eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ach.xpi -> firefox-52.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/af.xpi -> firefox-52.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/an.xpi -> firefox-52.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ar.xpi -> firefox-52.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/as.xpi -> firefox-52.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ast.xpi -> firefox-52.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/az.xpi -> firefox-52.6.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bg.xpi -> firefox-52.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/br.xpi -> firefox-52.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bs.xpi -> firefox-52.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ca.xpi -> firefox-52.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cak.xpi -> firefox-52.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cs.xpi -> firefox-52.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cy.xpi -> firefox-52.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/da.xpi -> firefox-52.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/de.xpi -> firefox-52.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/el.xpi -> firefox-52.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eo.xpi -> firefox-52.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/et.xpi -> firefox-52.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eu.xpi -> firefox-52.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fa.xpi -> firefox-52.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ff.xpi -> firefox-52.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fi.xpi -> firefox-52.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fr.xpi -> firefox-52.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gd.xpi -> firefox-52.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gl.xpi -> firefox-52.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gn.xpi -> firefox-52.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/he.xpi -> firefox-52.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hr.xpi -> firefox-52.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hu.xpi -> firefox-52.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/id.xpi -> firefox-52.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/is.xpi -> firefox-52.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/it.xpi -> firefox-52.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ja.xpi -> firefox-52.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ka.xpi -> firefox-52.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kab.xpi -> firefox-52.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kk.xpi -> firefox-52.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/km.xpi -> firefox-52.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kn.xpi -> firefox-52.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ko.xpi -> firefox-52.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lij.xpi -> firefox-52.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lt.xpi -> firefox-52.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lv.xpi -> firefox-52.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mai.xpi -> firefox-52.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mk.xpi -> firefox-52.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ml.xpi -> firefox-52.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mr.xpi -> firefox-52.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ms.xpi -> firefox-52.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nl.xpi -> firefox-52.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/or.xpi -> firefox-52.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pl.xpi -> firefox-52.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/rm.xpi -> firefox-52.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ro.xpi -> firefox-52.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ru.xpi -> firefox-52.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/si.xpi -> firefox-52.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sk.xpi -> firefox-52.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sl.xpi -> firefox-52.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/son.xpi -> firefox-52.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sq.xpi -> firefox-52.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sr.xpi -> firefox-52.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ta.xpi -> firefox-52.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/te.xpi -> firefox-52.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/th.xpi -> firefox-52.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/tr.xpi -> firefox-52.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uk.xpi -> firefox-52.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uz.xpi -> firefox-52.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/vi.xpi -> firefox-52.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/xh.xpi -> firefox-52.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.6.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/source/firefox-52.6.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c3881f08689029e09bdc23dbba2ad88
diff --git a/metadata/md5-cache/www-client/firefox-57.0.4 b/metadata/md5-cache/www-client/firefox-57.0.4
index 5b87f094af3d..d4c01c917043 100644
--- a/metadata/md5-cache/www-client/firefox-57.0.4
+++ b/metadata/md5-cache/www-client/firefox-57.0.4
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.33 >=dev-libs/nspr-4.17 selinux?
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ach.xpi -> firefox-57.0.4-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/af.xpi -> firefox-57.0.4-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/an.xpi -> firefox-57.0.4-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ar.xpi -> firefox-57.0.4-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/as.xpi -> firefox-57.0.4-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ast.xpi -> firefox-57.0.4-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/az.xpi -> firefox-57.0.4-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/bg.xpi -> firefox-57.0.4-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/bn-BD.xpi -> firefox-57.0.4-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/bn-IN.xpi -> firefox-57.0.4-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/br.xpi -> firefox-57.0.4-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/bs.xpi -> firefox-57.0.4-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ca.xpi -> firefox-57.0.4-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/cak.xpi -> firefox-57.0.4-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/cs.xpi -> firefox-57.0.4-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/cy.xpi -> firefox-57.0.4-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/da.xpi -> firefox-57.0.4-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/de.xpi -> firefox-57.0.4-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/dsb.xpi -> firefox-57.0.4-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/el.xpi -> firefox-57.0.4-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/en-GB.xpi -> firefox-57.0.4-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/en-ZA.xpi -> firefox-57.0.4-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/eo.xpi -> firefox-57.0.4-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/es-AR.xpi -> firefox-57.0.4-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/es-CL.xpi -> firefox-57.0.4-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/es-ES.xpi -> firefox-57.0.4-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/es-MX.xpi -> firefox-57.0.4-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/et.xpi -> firefox-57.0.4-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/eu.xpi -> firefox-57.0.4-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/fa.xpi -> firefox-57.0.4-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ff.xpi -> firefox-57.0.4-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/fi.xpi -> firefox-57.0.4-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/fr.xpi -> firefox-57.0.4-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/fy-NL.xpi -> firefox-57.0.4-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ga-IE.xpi -> firefox-57.0.4-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/gd.xpi -> firefox-57.0.4-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/gl.xpi -> firefox-57.0.4-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/gn.xpi -> firefox-57.0.4-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/gu-IN.xpi -> firefox-57.0.4-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/he.xpi -> firefox-57.0.4-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/hi-IN.xpi -> firefox-57.0.4-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/hr.xpi -> firefox-57.0.4-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/hsb.xpi -> firefox-57.0.4-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/hu.xpi -> firefox-57.0.4-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/hy-AM.xpi -> firefox-57.0.4-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/id.xpi -> firefox-57.0.4-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/is.xpi -> firefox-57.0.4-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/it.xpi -> firefox-57.0.4-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ja.xpi -> firefox-57.0.4-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ka.xpi -> firefox-57.0.4-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/kab.xpi -> firefox-57.0.4-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/kk.xpi -> firefox-57.0.4-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/km.xpi -> firefox-57.0.4-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/kn.xpi -> firefox-57.0.4-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ko.xpi -> firefox-57.0.4-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/lij.xpi -> firefox-57.0.4-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/lt.xpi -> firefox-57.0.4-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/lv.xpi -> firefox-57.0.4-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/mai.xpi -> firefox-57.0.4-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/mk.xpi -> firefox-57.0.4-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ml.xpi -> firefox-57.0.4-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/mr.xpi -> firefox-57.0.4-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ms.xpi -> firefox-57.0.4-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/nb-NO.xpi -> firefox-57.0.4-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/nl.xpi -> firefox-57.0.4-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/nn-NO.xpi -> firefox-57.0.4-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/or.xpi -> firefox-57.0.4-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/pa-IN.xpi -> firefox-57.0.4-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/pl.xpi -> firefox-57.0.4-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/pt-BR.xpi -> firefox-57.0.4-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/pt-PT.xpi -> firefox-57.0.4-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/rm.xpi -> firefox-57.0.4-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ro.xpi -> firefox-57.0.4-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ru.xpi -> firefox-57.0.4-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/si.xpi -> firefox-57.0.4-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/sk.xpi -> firefox-57.0.4-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/sl.xpi -> firefox-57.0.4-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/son.xpi -> firefox-57.0.4-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/sq.xpi -> firefox-57.0.4-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/sr.xpi -> firefox-57.0.4-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/sv-SE.xpi -> firefox-57.0.4-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/ta.xpi -> firefox-57.0.4-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/te.xpi -> firefox-57.0.4-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/th.xpi -> firefox-57.0.4-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/tr.xpi -> firefox-57.0.4-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/uk.xpi -> firefox-57.0.4-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/uz.xpi -> firefox-57.0.4-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/vi.xpi -> firefox-57.0.4-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/xh.xpi -> firefox-57.0.4-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/zh-CN.xpi -> firefox-57.0.4-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xpi/zh-TW.xpi -> firefox-57.0.4-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/57.0.4/source/firefox-57.0.4.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-57.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-57.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-57.0-patches-01.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.57	813a7aca0eceed46f25e38701678650e	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.57	813a7aca0eceed46f25e38701678650e	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6922ab289246d0fb9fb92a25ab6b0e51
diff --git a/metadata/md5-cache/www-client/firefox-bin-52.5.3-r1 b/metadata/md5-cache/www-client/firefox-bin-52.5.3-r1
deleted file mode 100644
index 52eebaf055d6..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-52.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ach.xpi -> firefox-52.5.3esr-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/af.xpi -> firefox-52.5.3esr-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/an.xpi -> firefox-52.5.3esr-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ar.xpi -> firefox-52.5.3esr-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/as.xpi -> firefox-52.5.3esr-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ast.xpi -> firefox-52.5.3esr-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/az.xpi -> firefox-52.5.3esr-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/bg.xpi -> firefox-52.5.3esr-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.5.3esr-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.5.3esr-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/br.xpi -> firefox-52.5.3esr-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/bs.xpi -> firefox-52.5.3esr-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ca.xpi -> firefox-52.5.3esr-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/cs.xpi -> firefox-52.5.3esr-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/cy.xpi -> firefox-52.5.3esr-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/da.xpi -> firefox-52.5.3esr-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/de.xpi -> firefox-52.5.3esr-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/el.xpi -> firefox-52.5.3esr-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/en-GB.xpi -> firefox-52.5.3esr-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.5.3esr-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/eo.xpi -> firefox-52.5.3esr-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/es-AR.xpi -> firefox-52.5.3esr-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/es-CL.xpi -> firefox-52.5.3esr-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/es-ES.xpi -> firefox-52.5.3esr-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/es-MX.xpi -> firefox-52.5.3esr-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/et.xpi -> firefox-52.5.3esr-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/eu.xpi -> firefox-52.5.3esr-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/fa.xpi -> firefox-52.5.3esr-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/fi.xpi -> firefox-52.5.3esr-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/fr.xpi -> firefox-52.5.3esr-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.5.3esr-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.5.3esr-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/gd.xpi -> firefox-52.5.3esr-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/gl.xpi -> firefox-52.5.3esr-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.5.3esr-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/he.xpi -> firefox-52.5.3esr-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.5.3esr-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/hr.xpi -> firefox-52.5.3esr-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/hsb.xpi -> firefox-52.5.3esr-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/hu.xpi -> firefox-52.5.3esr-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.5.3esr-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/id.xpi -> firefox-52.5.3esr-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/is.xpi -> firefox-52.5.3esr-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/it.xpi -> firefox-52.5.3esr-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ja.xpi -> firefox-52.5.3esr-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/kk.xpi -> firefox-52.5.3esr-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/km.xpi -> firefox-52.5.3esr-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/kn.xpi -> firefox-52.5.3esr-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ko.xpi -> firefox-52.5.3esr-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/lt.xpi -> firefox-52.5.3esr-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/lv.xpi -> firefox-52.5.3esr-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/mai.xpi -> firefox-52.5.3esr-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/mk.xpi -> firefox-52.5.3esr-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ml.xpi -> firefox-52.5.3esr-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/mr.xpi -> firefox-52.5.3esr-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ms.xpi -> firefox-52.5.3esr-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.5.3esr-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/nl.xpi -> firefox-52.5.3esr-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.5.3esr-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/or.xpi -> firefox-52.5.3esr-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.5.3esr-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/pl.xpi -> firefox-52.5.3esr-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.5.3esr-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.5.3esr-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/rm.xpi -> firefox-52.5.3esr-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ro.xpi -> firefox-52.5.3esr-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ru.xpi -> firefox-52.5.3esr-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/si.xpi -> firefox-52.5.3esr-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/sk.xpi -> firefox-52.5.3esr-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/sl.xpi -> firefox-52.5.3esr-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/son.xpi -> firefox-52.5.3esr-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/sq.xpi -> firefox-52.5.3esr-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/sr.xpi -> firefox-52.5.3esr-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.5.3esr-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/ta.xpi -> firefox-52.5.3esr-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/te.xpi -> firefox-52.5.3esr-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/th.xpi -> firefox-52.5.3esr-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/tr.xpi -> firefox-52.5.3esr-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/uk.xpi -> firefox-52.5.3esr-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/uz.xpi -> firefox-52.5.3esr-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/vi.xpi -> firefox-52.5.3esr-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/xh.xpi -> firefox-52.5.3esr-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.5.3esr-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.5.3esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.5.3esr-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.5.3esr/linux-x86_64/en-US/firefox-52.5.3esr.tar.bz2 -> firefox-bin_x86_64-52.5.3.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.5.3esr/linux-i686/en-US/firefox-52.5.3esr.tar.bz2 -> firefox-bin_i686-52.5.3.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aebb52c6abc2428cb781181741d5b14b
diff --git a/metadata/md5-cache/www-client/firefox-bin-52.6.0 b/metadata/md5-cache/www-client/firefox-bin-52.6.0
new file mode 100644
index 000000000000..2973fe94ed11
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-52.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ach.xpi -> firefox-52.6.0esr-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/af.xpi -> firefox-52.6.0esr-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/an.xpi -> firefox-52.6.0esr-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ar.xpi -> firefox-52.6.0esr-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/as.xpi -> firefox-52.6.0esr-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ast.xpi -> firefox-52.6.0esr-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/az.xpi -> firefox-52.6.0esr-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/bg.xpi -> firefox-52.6.0esr-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.6.0esr-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/br.xpi -> firefox-52.6.0esr-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/bs.xpi -> firefox-52.6.0esr-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ca.xpi -> firefox-52.6.0esr-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/cs.xpi -> firefox-52.6.0esr-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/cy.xpi -> firefox-52.6.0esr-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/da.xpi -> firefox-52.6.0esr-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/de.xpi -> firefox-52.6.0esr-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/el.xpi -> firefox-52.6.0esr-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.6.0esr-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.6.0esr-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/eo.xpi -> firefox-52.6.0esr-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.6.0esr-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.6.0esr-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.6.0esr-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.6.0esr-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/et.xpi -> firefox-52.6.0esr-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/eu.xpi -> firefox-52.6.0esr-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/fa.xpi -> firefox-52.6.0esr-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/fi.xpi -> firefox-52.6.0esr-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/fr.xpi -> firefox-52.6.0esr-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.6.0esr-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.6.0esr-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/gd.xpi -> firefox-52.6.0esr-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/gl.xpi -> firefox-52.6.0esr-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.6.0esr-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/he.xpi -> firefox-52.6.0esr-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.6.0esr-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/hr.xpi -> firefox-52.6.0esr-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.6.0esr-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/hu.xpi -> firefox-52.6.0esr-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.6.0esr-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/id.xpi -> firefox-52.6.0esr-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/is.xpi -> firefox-52.6.0esr-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/it.xpi -> firefox-52.6.0esr-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ja.xpi -> firefox-52.6.0esr-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/kk.xpi -> firefox-52.6.0esr-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/km.xpi -> firefox-52.6.0esr-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/kn.xpi -> firefox-52.6.0esr-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ko.xpi -> firefox-52.6.0esr-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/lt.xpi -> firefox-52.6.0esr-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/lv.xpi -> firefox-52.6.0esr-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/mai.xpi -> firefox-52.6.0esr-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/mk.xpi -> firefox-52.6.0esr-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ml.xpi -> firefox-52.6.0esr-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/mr.xpi -> firefox-52.6.0esr-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ms.xpi -> firefox-52.6.0esr-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.6.0esr-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/nl.xpi -> firefox-52.6.0esr-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.6.0esr-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/or.xpi -> firefox-52.6.0esr-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.6.0esr-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/pl.xpi -> firefox-52.6.0esr-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.6.0esr-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/rm.xpi -> firefox-52.6.0esr-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ro.xpi -> firefox-52.6.0esr-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ru.xpi -> firefox-52.6.0esr-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/si.xpi -> firefox-52.6.0esr-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/sk.xpi -> firefox-52.6.0esr-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/sl.xpi -> firefox-52.6.0esr-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/son.xpi -> firefox-52.6.0esr-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/sq.xpi -> firefox-52.6.0esr-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/sr.xpi -> firefox-52.6.0esr-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.6.0esr-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/ta.xpi -> firefox-52.6.0esr-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/te.xpi -> firefox-52.6.0esr-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/th.xpi -> firefox-52.6.0esr-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/tr.xpi -> firefox-52.6.0esr-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/uk.xpi -> firefox-52.6.0esr-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/uz.xpi -> firefox-52.6.0esr-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/vi.xpi -> firefox-52.6.0esr-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/xh.xpi -> firefox-52.6.0esr-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.6.0esr-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.6.0esr/linux-x86_64/en-US/firefox-52.6.0esr.tar.bz2 -> firefox-bin_x86_64-52.6.0.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.6.0esr/linux-i686/en-US/firefox-52.6.0esr.tar.bz2 -> firefox-bin_i686-52.6.0.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aebb52c6abc2428cb781181741d5b14b
diff --git a/metadata/md5-cache/www-client/firefox-bin-57.0.4-r1 b/metadata/md5-cache/www-client/firefox-bin-57.0.4-r1
index c1cf8a74e8f4..6da331a5f5ca 100644
--- a/metadata/md5-cache/www-client/firefox-bin-57.0.4-r1
+++ b/metadata/md5-cache/www-client/firefox-bin-57.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ach.xpi -> firefox-57.0.4-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/af.xpi -> firefox-57.0.4-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/an.xpi -> firefox-57.0.4-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ar.xpi -> firefox-57.0.4-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/as.xpi -> firefox-57.0.4-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ast.xpi -> firefox-57.0.4-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/az.xpi -> firefox-57.0.4-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/bg.xpi -> firefox-57.0.4-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/bn-BD.xpi -> firefox-57.0.4-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/bn-IN.xpi -> firefox-57.0.4-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/br.xpi -> firefox-57.0.4-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/bs.xpi -> firefox-57.0.4-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ca.xpi -> firefox-57.0.4-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/cs.xpi -> firefox-57.0.4-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/cy.xpi -> firefox-57.0.4-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/da.xpi -> firefox-57.0.4-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/de.xpi -> firefox-57.0.4-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/el.xpi -> firefox-57.0.4-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/en-GB.xpi -> firefox-57.0.4-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/en-ZA.xpi -> firefox-57.0.4-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/eo.xpi -> firefox-57.0.4-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/es-AR.xpi -> firefox-57.0.4-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/es-CL.xpi -> firefox-57.0.4-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/es-ES.xpi -> firefox-57.0.4-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/es-MX.xpi -> firefox-57.0.4-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/et.xpi -> firefox-57.0.4-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/eu.xpi -> firefox-57.0.4-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/fa.xpi -> firefox-57.0.4-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/fi.xpi -> firefox-57.0.4-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/fr.xpi -> firefox-57.0.4-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/fy-NL.xpi -> firefox-57.0.4-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ga-IE.xpi -> firefox-57.0.4-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/gd.xpi -> firefox-57.0.4-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/gl.xpi -> firefox-57.0.4-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/gu-IN.xpi -> firefox-57.0.4-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/he.xpi -> firefox-57.0.4-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/hi-IN.xpi -> firefox-57.0.4-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/hr.xpi -> firefox-57.0.4-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/hsb.xpi -> firefox-57.0.4-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/hu.xpi -> firefox-57.0.4-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/hy-AM.xpi -> firefox-57.0.4-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/id.xpi -> firefox-57.0.4-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/is.xpi -> firefox-57.0.4-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/it.xpi -> firefox-57.0.4-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ja.xpi -> firefox-57.0.4-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/kk.xpi -> firefox-57.0.4-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/km.xpi -> firefox-57.0.4-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/kn.xpi -> firefox-57.0.4-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ko.xpi -> firefox-57.0.4-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/lt.xpi -> firefox-57.0.4-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/lv.xpi -> firefox-57.0.4-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/mai.xpi -> firefox-57.0.4-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/mk.xpi -> firefox-57.0.4-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ml.xpi -> firefox-57.0.4-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/mr.xpi -> firefox-57.0.4-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ms.xpi -> firefox-57.0.4-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/nb-NO.xpi -> firefox-57.0.4-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/nl.xpi -> firefox-57.0.4-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/nn-NO.xpi -> firefox-57.0.4-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/or.xpi -> firefox-57.0.4-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/pa-IN.xpi -> firefox-57.0.4-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/pl.xpi -> firefox-57.0.4-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/pt-BR.xpi -> firefox-57.0.4-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/pt-PT.xpi -> firefox-57.0.4-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/rm.xpi -> firefox-57.0.4-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ro.xpi -> firefox-57.0.4-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ru.xpi -> firefox-57.0.4-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/si.xpi -> firefox-57.0.4-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/sk.xpi -> firefox-57.0.4-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/sl.xpi -> firefox-57.0.4-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/son.xpi -> firefox-57.0.4-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/sq.xpi -> firefox-57.0.4-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/sr.xpi -> firefox-57.0.4-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/sv-SE.xpi -> firefox-57.0.4-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/ta.xpi -> firefox-57.0.4-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/te.xpi -> firefox-57.0.4-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/th.xpi -> firefox-57.0.4-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/tr.xpi -> firefox-57.0.4-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/uk.xpi -> firefox-57.0.4-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/uz.xpi -> firefox-57.0.4-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/vi.xpi -> firefox-57.0.4-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/xh.xpi -> firefox-57.0.4-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/zh-CN.xpi -> firefox-57.0.4-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//57.0.4/linux-i686/xpi/zh-TW.xpi -> firefox-57.0.4-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/57.0.4/linux-x86_64/en-US/firefox-57.0.4.tar.bz2 -> firefox-bin_x86_64-57.0.4.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/57.0.4/linux-i686/en-US/firefox-57.0.4.tar.bz2 -> firefox-bin_i686-57.0.4.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a4e903f50b67c6bf5790e0c6bd243297
diff --git a/metadata/md5-cache/www-client/firefox-bin-58.0 b/metadata/md5-cache/www-client/firefox-bin-58.0
new file mode 100644
index 000000000000..34198ab7737b
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-58.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ach.xpi -> firefox-58.0-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/af.xpi -> firefox-58.0-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/an.xpi -> firefox-58.0-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ar.xpi -> firefox-58.0-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/as.xpi -> firefox-58.0-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ast.xpi -> firefox-58.0-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/az.xpi -> firefox-58.0-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/bg.xpi -> firefox-58.0-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/bn-BD.xpi -> firefox-58.0-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/bn-IN.xpi -> firefox-58.0-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/br.xpi -> firefox-58.0-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/bs.xpi -> firefox-58.0-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ca.xpi -> firefox-58.0-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/cs.xpi -> firefox-58.0-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/cy.xpi -> firefox-58.0-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/da.xpi -> firefox-58.0-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/de.xpi -> firefox-58.0-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/el.xpi -> firefox-58.0-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/en-GB.xpi -> firefox-58.0-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/en-ZA.xpi -> firefox-58.0-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/eo.xpi -> firefox-58.0-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/es-AR.xpi -> firefox-58.0-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/es-CL.xpi -> firefox-58.0-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/es-ES.xpi -> firefox-58.0-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/es-MX.xpi -> firefox-58.0-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/et.xpi -> firefox-58.0-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/eu.xpi -> firefox-58.0-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/fa.xpi -> firefox-58.0-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/fi.xpi -> firefox-58.0-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/fr.xpi -> firefox-58.0-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/fy-NL.xpi -> firefox-58.0-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ga-IE.xpi -> firefox-58.0-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/gd.xpi -> firefox-58.0-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/gl.xpi -> firefox-58.0-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/gu-IN.xpi -> firefox-58.0-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/he.xpi -> firefox-58.0-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/hi-IN.xpi -> firefox-58.0-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/hr.xpi -> firefox-58.0-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/hsb.xpi -> firefox-58.0-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/hu.xpi -> firefox-58.0-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/hy-AM.xpi -> firefox-58.0-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/id.xpi -> firefox-58.0-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/is.xpi -> firefox-58.0-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/it.xpi -> firefox-58.0-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ja.xpi -> firefox-58.0-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/kk.xpi -> firefox-58.0-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/km.xpi -> firefox-58.0-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/kn.xpi -> firefox-58.0-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ko.xpi -> firefox-58.0-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/lt.xpi -> firefox-58.0-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/lv.xpi -> firefox-58.0-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/mai.xpi -> firefox-58.0-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/mk.xpi -> firefox-58.0-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ml.xpi -> firefox-58.0-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/mr.xpi -> firefox-58.0-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ms.xpi -> firefox-58.0-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/nb-NO.xpi -> firefox-58.0-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/nl.xpi -> firefox-58.0-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/nn-NO.xpi -> firefox-58.0-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/or.xpi -> firefox-58.0-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/pa-IN.xpi -> firefox-58.0-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/pl.xpi -> firefox-58.0-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/pt-BR.xpi -> firefox-58.0-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/pt-PT.xpi -> firefox-58.0-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/rm.xpi -> firefox-58.0-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ro.xpi -> firefox-58.0-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ru.xpi -> firefox-58.0-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/si.xpi -> firefox-58.0-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/sk.xpi -> firefox-58.0-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/sl.xpi -> firefox-58.0-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/son.xpi -> firefox-58.0-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/sq.xpi -> firefox-58.0-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/sr.xpi -> firefox-58.0-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/sv-SE.xpi -> firefox-58.0-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/ta.xpi -> firefox-58.0-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/te.xpi -> firefox-58.0-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/th.xpi -> firefox-58.0-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/tr.xpi -> firefox-58.0-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/uk.xpi -> firefox-58.0-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/uz.xpi -> firefox-58.0-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/vi.xpi -> firefox-58.0-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/xh.xpi -> firefox-58.0-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/zh-CN.xpi -> firefox-58.0-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//58.0/linux-i686/xpi/zh-TW.xpi -> firefox-58.0-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2 -> firefox-bin_x86_64-58.0.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/58.0/linux-i686/en-US/firefox-58.0.tar.bz2 -> firefox-bin_i686-58.0.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a4e903f50b67c6bf5790e0c6bd243297
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85
deleted file mode 100644
index d77fa8d33a2c..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-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-beta/google-chrome-beta_64.0.3282.85-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7383cd3d2d1fb2ee1a8519f2fecf0517
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.99 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.99
new file mode 100644
index 000000000000..9fa25d4786e1
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-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-beta/google-chrome-beta_64.0.3282.99-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7383cd3d2d1fb2ee1a8519f2fecf0517
diff --git a/metadata/md5-cache/www-client/lynx-2.8.9_pre11 b/metadata/md5-cache/www-client/lynx-2.8.9_pre11
index ac7fe851228e..4d457993d1d0 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.9_pre11
+++ b/metadata/md5-cache/www-client/lynx-2.8.9_pre11
@@ -4,9 +4,9 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=6
 HOMEPAGE=http://lynx.invisible-island.net/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.9dev.11.tar.bz2
-_md5_=75530e2c37484913d49dbbd8e6b5c8fd
+_md5_=fc47eaa9a3383a90cf6ee91a57c1cff1
diff --git a/metadata/md5-cache/www-client/lynx-2.8.9_pre16 b/metadata/md5-cache/www-client/lynx-2.8.9_pre16
index e00908e76fff..5cb7c461f2a2 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.9_pre16
+++ b/metadata/md5-cache/www-client/lynx-2.8.9_pre16
@@ -4,9 +4,9 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=6
 HOMEPAGE=http://lynx.invisible-island.net/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.9dev.16.tar.bz2
-_md5_=f6446bc29cedd5b92acf67b17fa39f08
+_md5_=d27d428a3705d896d3ffde6d5323bdcf
diff --git a/metadata/md5-cache/www-client/opera-50.0.2762.45 b/metadata/md5-cache/www-client/opera-50.0.2762.45
deleted file mode 100644
index fc1dc2b32b13..000000000000
--- a/metadata/md5-cache/www-client/opera-50.0.2762.45
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/50.0.2762.45/linux/opera-stable_50.0.2762.45_amd64.deb http://download2.operacdn.com/pub/opera/desktop/50.0.2762.45/linux/opera-stable_50.0.2762.45_amd64.deb http://download3.operacdn.com/pub/opera/desktop/50.0.2762.45/linux/opera-stable_50.0.2762.45_amd64.deb http://download4.operacdn.com/pub/opera/desktop/50.0.2762.45/linux/opera-stable_50.0.2762.45_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-50.0.2762.67 b/metadata/md5-cache/www-client/opera-50.0.2762.67
new file mode 100644
index 000000000000..0f06434ab10d
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-50.0.2762.67
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/50.0.2762.67/linux/opera-stable_50.0.2762.67_amd64.deb http://download2.operacdn.com/pub/opera/desktop/50.0.2762.67/linux/opera-stable_50.0.2762.67_amd64.deb http://download3.operacdn.com/pub/opera/desktop/50.0.2762.67/linux/opera-stable_50.0.2762.67_amd64.deb http://download4.operacdn.com/pub/opera/desktop/50.0.2762.67/linux/opera-stable_50.0.2762.67_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-beta-51.0.2830.16 b/metadata/md5-cache/www-client/opera-beta-51.0.2830.16
new file mode 100644
index 000000000000..38a6ab264fe4
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-51.0.2830.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/51.0.2830.16/linux/opera-beta_51.0.2830.16_amd64.deb http://download2.operacdn.com/pub/opera-beta/51.0.2830.16/linux/opera-beta_51.0.2830.16_amd64.deb http://download3.operacdn.com/pub/opera-beta/51.0.2830.16/linux/opera-beta_51.0.2830.16_amd64.deb http://download4.operacdn.com/pub/opera-beta/51.0.2830.16/linux/opera-beta_51.0.2830.16_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/opera-beta-51.0.2830.2 b/metadata/md5-cache/www-client/opera-beta-51.0.2830.2
deleted file mode 100644
index e11416bb3da4..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-51.0.2830.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download2.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download3.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download4.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/opera-developer-52.0.2845.0 b/metadata/md5-cache/www-client/opera-developer-52.0.2845.0
new file mode 100644
index 000000000000..d0be6a5cca18
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-52.0.2845.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/52.0.2845.0/linux/opera-developer_52.0.2845.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/52.0.2845.0/linux/opera-developer_52.0.2845.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/52.0.2845.0/linux/opera-developer_52.0.2845.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/52.0.2845.0/linux/opera-developer_52.0.2845.0_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.1.0 b/metadata/md5-cache/www-client/qutebrowser-1.1.0
deleted file mode 100644
index 563cb88aa575..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.1.0/qutebrowser-1.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.1.1 b/metadata/md5-cache/www-client/qutebrowser-1.1.1
new file mode 100644
index 000000000000..55824799e1db
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.1.1/qutebrowser-1.1.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
index 75e75b4f347a..90f69b91c5df 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/source/thunderbird-52.5.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.5.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.5.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.5.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.5.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.5.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.5.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.5.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.5.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.5.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.5.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.5.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.5.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.5.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.5.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=03612936bd710ab160c94e7c3d37d0d1
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
index a096cc6e78a2..c4cd894ed1bb 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/source/thunderbird-52.5.2.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.5.2-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.5.2-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.5.2-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.5.2-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.5.2-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.5.2-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.5.2-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.5.2-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.5.2-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.5.2-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.5.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.5.2-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.5.2-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.5.2-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ebb109ec43769e084011ece1eb007b56
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0
new file mode 100644
index 000000000000..ce0aca855e3b
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=6
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx force-gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/source/thunderbird-52.6.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.6.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.6.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.6.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.6.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.6.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.6.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.6.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.6.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.6.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.6.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.6.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.6.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.6.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.6.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.6.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebb109ec43769e084011ece1eb007b56
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.48 b/metadata/md5-cache/www-client/seamonkey-bin-2.48
index 7604d57884c7..d84594db8765 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.48
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.48
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/contrib/seamonkey-2.48.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.48.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/linux-i686/en-US/seamonkey-2.48.tar.bz2 -> seamonkey-bin_i686-2.48.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd82cd1ca3c7d2982d4c233f76d9d2f6
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2 b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
index 576721a28074..7b95caa6638a 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/cs.xpi -> seamonkey-2.49.1-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/de.xpi -> seamonkey-2.49.1-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.1-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.1-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.1-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/fr.xpi -> seamonkey-2.49.1-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/hu.xpi -> seamonkey-2.49.1-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/it.xpi -> seamonkey-2.49.1-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ja.xpi -> seamonkey-2.49.1-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/lt.xpi -> seamonkey-2.49.1-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/nl.xpi -> seamonkey-2.49.1-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pl.xpi -> seamonkey-2.49.1-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.1-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ru.xpi -> seamonkey-2.49.1-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sk.xpi -> seamonkey-2.49.1-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.1-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.1-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.1-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-x86_64/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_x86_64-2.49.1_rc2.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_i686-2.49.1_rc2.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d822038773704800103ff107b2fc6b0b
diff --git a/metadata/md5-cache/www-client/vivaldi-1.13.1008.40_p1 b/metadata/md5-cache/www-client/vivaldi-1.13.1008.40_p1
deleted file mode 100644
index 51f854590245..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-1.13.1008.40_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm x86
-LICENSE=Vivaldi
-RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.40-1_amd64.deb -> vivaldi-1.13.1008.40_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.40-1_armhf.deb -> vivaldi-1.13.1008.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.40-1_i386.deb -> vivaldi-1.13.1008.40_p1-i386.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77b20c0213fe422799fbd414acd29ee1
diff --git a/metadata/md5-cache/www-client/vivaldi-1.13.1008.44_p1 b/metadata/md5-cache/www-client/vivaldi-1.13.1008.44_p1
index 87d760fa55de..3002aa5277f9 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.13.1008.44_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.13.1008.44_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A new browser for our friends
 EAPI=5
 HOMEPAGE=http://vivaldi.com/
 IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
+KEYWORDS=-* amd64 ~arm x86
 LICENSE=Vivaldi
 RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.44-1_amd64.deb -> vivaldi-1.13.1008.44_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.44-1_armhf.deb -> vivaldi-1.13.1008.44_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.44-1_i386.deb -> vivaldi-1.13.1008.44_p1-i386.deb )
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a605f5159b386cd1c7af51b97eb4c57
+_md5_=8160aab8ac193a35f6fecbe48bf6f731
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1064.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1064.3_p1
deleted file mode 100644
index c7289cc049c8..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1064.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=Vivaldi
-RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1064.3-1_amd64.deb -> vivaldi-snapshot-1.14.1064.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1064.3-1_armhf.deb -> vivaldi-snapshot-1.14.1064.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1064.3-1_i386.deb -> vivaldi-snapshot-1.14.1064.3_p1-i386.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbb6d96938b7020935d7c2e9fb60ccc2
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1072.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1072.3_p1
deleted file mode 100644
index da5b5ba9bc35..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1072.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=Vivaldi
-RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1072.3-1_amd64.deb -> vivaldi-snapshot-1.14.1072.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1072.3-1_armhf.deb -> vivaldi-snapshot-1.14.1072.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1072.3-1_i386.deb -> vivaldi-snapshot-1.14.1072.3_p1-i386.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d100e57dec2c62b778401fa84835913
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.25_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.25_p1
new file mode 100644
index 000000000000..19f41c7f032a
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.25_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.25-1_amd64.deb -> vivaldi-snapshot-1.14.1077.25_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.25-1_armhf.deb -> vivaldi-snapshot-1.14.1077.25_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.25-1_i386.deb -> vivaldi-snapshot-1.14.1077.25_p1-i386.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d100e57dec2c62b778401fa84835913
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.3_p1
new file mode 100644
index 000000000000..41afc693af63
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1077.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.3-1_amd64.deb -> vivaldi-snapshot-1.14.1077.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.3-1_armhf.deb -> vivaldi-snapshot-1.14.1077.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1077.3-1_i386.deb -> vivaldi-snapshot-1.14.1077.3_p1-i386.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d100e57dec2c62b778401fa84835913
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 22d9a631a0ca..bfc52f122c33 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/adobe-flash-28.0.0.137 b/metadata/md5-cache/www-plugins/adobe-flash-28.0.0.137
index 67df1ac1d66b..f14a4d6051e0 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-28.0.0.137
+++ b/metadata/md5-cache/www-plugins/adobe-flash-28.0.0.137
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( nsplugin ppapi )
 RESTRICT=strip mirror
 SLOT=22
 SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/28.0.0.137/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-28.0.0.137-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/28.0.0.137/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-28.0.0.137-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/28.0.0.137/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-28.0.0.137-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/28.0.0.137/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-28.0.0.137-ppapi.x86_64.tar.gz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=493fc181efb99a52f53329878f9e5958
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta
deleted file mode 100644
index f0876e65cd9e..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.85-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.99_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.99_beta
new file mode 100644
index 000000000000..74e9997380aa
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.99_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.99-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.8 b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.8
index b7d5c85fa6d4..ba0186448077 100644
--- a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.8
+++ b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 dev-libs/nspr >=media-libs/gmtk-1.0.8 >=media-video/gnome-mplayer-1.0.8[dbus] curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-1.0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=78f9d223b438baf275b9b7329871a9fc
diff --git a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9 b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
index 91d58b105015..ded922d23442 100644
--- a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
+++ b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 dev-libs/nspr >=media-libs/gmtk-1.0.9 >=media-video/gnome-mplayer-1.0.9[dbus] curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://gecko-mediaplayer.googlecode.com/svn/packages/gecko-mediaplayer-1.0.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f77e74da5eba549b63628b241d12f057
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r1 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r1
index 826007fc0356..8eb5a439006a 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r1
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gnash-0.8.10_p20160329.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a76acb7070922ff06d3bb01b0d16fd2e
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
index 748f3acb8e7e..60e7a93be39f 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_amd64.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9a6df4ae3ad01f47f93c1ed623addcc9
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
index 63b360056705..2f9f57c78b5b 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_amd64.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bf0a9de61e7618063fab1134c8a4ae8a
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-9999 b/metadata/md5-cache/www-plugins/google-talkplugin-9999
index c167811e73ec..b1f6eadb2a1c 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-9999
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-9999
@@ -8,5 +8,5 @@ LICENSE=Google-TOS openssl BSD
 RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-libs/glib:2 sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/pango sys-apps/lsb-release selinux? ( sec-policy/selinux-googletalk ) libnotify? ( x11-libs/libnotify )
 RESTRICT=strip mirror
 SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bf0a9de61e7618063fab1134c8a4ae8a
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.7.2_p20160107 b/metadata/md5-cache/www-plugins/lightspark-0.7.2_p20160107
index fa8cb0e8a3a1..5467a1c1e813 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.7.2_p20160107
+++ b/metadata/md5-cache/www-plugins/lightspark-0.7.2_p20160107
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= >=sys-devel/gcc-4.6.0:*[cxx] <sys-devel/llvm-4:0= >=sys-devel/llvm-3.4:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/gtk+:2= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gles? ( media-libs/mesa:0=[gles2] ) !gles? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 SLOT=0
 SRC_URI=https://github.com/lightspark/lightspark/archive/308241eb55c5379765033e60f28dfdd956c7abcd.tar.gz -> lightspark-0.7.2_p20160107.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=39283bb7790dbe8597093879f6c58bf4
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.8.0 b/metadata/md5-cache/www-plugins/lightspark-0.8.0
index 98cdd5b82fad..1b1cbc37aa45 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.8.0
+++ b/metadata/md5-cache/www-plugins/lightspark-0.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= >=sys-devel/gcc-4.6.0:*[cxx] >=sys-devel/llvm-3.4:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/gtk+:2= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gles? ( media-libs/mesa:0=[gles2] ) !gles? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 SLOT=0
 SRC_URI=https://github.com/lightspark/lightspark/archive/lightspark-0.8.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e62ded6a9772184aebbd1906bac3e68d
diff --git a/metadata/md5-cache/www-plugins/lightspark-9999 b/metadata/md5-cache/www-plugins/lightspark-9999
index 65a2e3bbc69b..c40194864538 100644
--- a/metadata/md5-cache/www-plugins/lightspark-9999
+++ b/metadata/md5-cache/www-plugins/lightspark-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp
 LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= >=sys-devel/gcc-4.6.0:*[cxx] >=sys-devel/llvm-3.4:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/gtk+:2= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gles? ( media-libs/mesa:0=[gles2] ) !gles? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e09745f7fecc7b2c7930deb7bcdb1bf1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2ce9a69f3a44..999e1a206d8a 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.2.34 b/metadata/md5-cache/www-servers/apache-2.2.34
index aed37590355e..5eeaf3c32f93 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.34
+++ b/metadata/md5-cache/www-servers/apache-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.2.34
 RDEPEND=>=dev-libs/apr-1.4.5:= dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2 https://dev.gentoo.org/~whissi/dist/apache/gentoo-apache-2.2.34-20170918.tar.bz2
 _eclasses_=apache-2	e713ca24e670958001d6ad8d437bea5a	autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4c3d870ff3e54bbc53ca4793d0a5d9c6
+_md5_=6af80af5918568f860398aa7f7a86b15
diff --git a/metadata/md5-cache/www-servers/apache-2.4.27-r1 b/metadata/md5-cache/www-servers/apache-2.4.27-r1
index 8d8bbf67c360..eb90948e0f1e 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.27-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.27-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.27
 RDEPEND=>=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.27.tar.bz2 https://dev.gentoo.org/~whissi/dist/apache/gentoo-apache-2.4.27-20170918.tar.bz2
 _eclasses_=apache-2	e713ca24e670958001d6ad8d437bea5a	autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8e960fbfe9c62a9dd2a0860d3102f529
+_md5_=f9882f4b880366aaf4dc56332db26a99
diff --git a/metadata/md5-cache/www-servers/apache-2.4.28 b/metadata/md5-cache/www-servers/apache-2.4.28
index b0d514308bdc..b921843ba013 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.28
+++ b/metadata/md5-cache/www-servers/apache-2.4.28
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.28
 RDEPEND=>=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	e713ca24e670958001d6ad8d437bea5a	autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2d83256526fe14d6b393c2c41d89f854
+_md5_=0ab4524576e8350624197b8be35540c2
diff --git a/metadata/md5-cache/www-servers/apache-2.4.29 b/metadata/md5-cache/www-servers/apache-2.4.29
index 856d53153e0c..a0f37ded09c3 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.29
+++ b/metadata/md5-cache/www-servers/apache-2.4.29
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.29
 RDEPEND=>=dev-libs/apr-1.5.1:= !www-apache/mod_macro apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	e713ca24e670958001d6ad8d437bea5a	autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5d457c9e8b7654153509812090a45e7c
+_md5_=4acb9b1f3711612d27df8e6e057be0d0
diff --git a/metadata/md5-cache/www-servers/apache-2.4.29-r1 b/metadata/md5-cache/www-servers/apache-2.4.29-r1
index 9dff06e10003..e75fb423a6d4 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.29-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.29-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.29
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	e713ca24e670958001d6ad8d437bea5a	autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7922b377b1bc39a8d51c7a406b17ca03
+_md5_=4465a1c76c88491b32af4534d02e3bf4
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.42 b/metadata/md5-cache/www-servers/lighttpd-1.4.42
index 080cf295712f..bc0464745568 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.42
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.42
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.42.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f1a113138c76e883e1c2c41cc186ccde
+_md5_=33fba664ab6cc397575cc97fe0e7d072
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.43 b/metadata/md5-cache/www-servers/lighttpd-1.4.43
index 074d4bbc3783..6ad4c5903d4f 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.43
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.43
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.43.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=019e781ae36d94c31234d7a104971752
+_md5_=5fb26630208f028be60228099b9f6b89
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.44 b/metadata/md5-cache/www-servers/lighttpd-1.4.44
index fa5f815f4f47..bfdbc365bed8 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.44
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.44
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.44.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a62996809ab10f33b9520099da54524e
+_md5_=5fb26630208f028be60228099b9f6b89
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.45 b/metadata/md5-cache/www-servers/lighttpd-1.4.45
index 25336321888f..bd578d4230c8 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.45
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.45
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.45.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=115de8e8d855e67acbcecacd77ff3926
+_md5_=2f33fd6c1c58da61203ad16feb003c95
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.47 b/metadata/md5-cache/www-servers/lighttpd-1.4.47
index 1461f87aebb4..7a2cc7688ae8 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.47
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.47
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.47.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=58e6a1bdc5c3a72444c0e689fb85e215
+_md5_=5827b2540842f8dfe254b903cbb8411d
diff --git a/metadata/md5-cache/www-servers/puma-3.11.2 b/metadata/md5-cache/www-servers/puma-3.11.2
new file mode 100644
index 000000000000..e8bd95102816
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-3.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=6
+HOMEPAGE=http://puma.io/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v3.11.2.tar.gz -> puma-3.11.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=edb5576adeced3a2f9423d24d66f54d6
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.2_beta b/metadata/md5-cache/www-servers/tomcat-9.0.2_beta
deleted file mode 100644
index bab3b16da783..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.2_beta
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.2_beta:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.2_beta:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.2/src/apache-tomcat-9.0.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=59ebd45af254ecab35ac10dbdcd78316
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.4 b/metadata/md5-cache/www-servers/tomcat-9.0.4
new file mode 100644
index 000000000000..b87fd5f60647
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.4:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.4:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=da8c412fdef1fec5212ea3cbf9c7076d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 643caf7c1661..93bdc020d4f6 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.30 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.30
deleted file mode 100644
index 9fae084b35b2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.30
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite 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-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.30 )
-RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.30/VirtualBox-5.1.30.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=26cdf1b8d8c5ca5036b9ad38e7d6bcd0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32
index e13c7a0838ef..e36ad3b3a00e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.32
@@ -4,7 +4,7 @@ DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=dri python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.32 )
 RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite 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(+)]
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=51f4050d804f66dfb1d0ac8fd044c536
+_md5_=f9ca25196ea2084e448006c2ae3d1ab2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 9cfb6b2408b1..51bbb65e5cd7 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/libfm-qt-0.11.1 b/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
index 23f41de14854..9fde9c2c5b6f 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
 EAPI=6
 HOMEPAGE=http://lxqt.org/
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= !<x11-misc/pcmanfm-qt-0.11.0
 SLOT=0/3
 SRC_URI=https://github.com/lxde/libfm-qt/releases/download/0.11.1/libfm-qt-0.11.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad3e08f5ca2025cef45e29bf44959e03
+_md5_=a9b8f76aa4ef4a48a3e25c35230f15c1
diff --git a/metadata/md5-cache/x11-libs/libyui-3.0.13 b/metadata/md5-cache/x11-libs/libyui-3.0.13
deleted file mode 100644
index 4672c4bb3888..000000000000
--- a/metadata/md5-cache/x11-libs/libyui-3.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=UI abstraction library
-EAPI=5
-HOMEPAGE=https://github.com/libyui/libyui
-IUSE=gtk ncurses qt4 static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-PDEPEND=qt4? ( x11-libs/libyui-qt:0/6 ) ncurses? ( x11-libs/libyui-ncurses:0/6 ) gtk? ( x11-libs/libyui-gtk:0/6 )
-REQUIRED_USE=|| ( gtk ncurses qt4 )
-SLOT=0/6
-SRC_URI=https://github.com/libyui/libyui/archive/libyui/master/3.0.13.tar.gz -> libyui-3.0.13.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0770255cc1c68c255834a68e874215f8
diff --git a/metadata/md5-cache/x11-libs/libyui-3.2.5 b/metadata/md5-cache/x11-libs/libyui-3.2.5
deleted file mode 100644
index 2313da76fdfd..000000000000
--- a/metadata/md5-cache/x11-libs/libyui-3.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=UI abstraction library
-EAPI=5
-HOMEPAGE=https://github.com/libyui/libyui
-IUSE=gtk ncurses qt4 static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-PDEPEND=qt4? ( x11-libs/libyui-qt:0/6 ) ncurses? ( x11-libs/libyui-ncurses:0/6 ) gtk? ( x11-libs/libyui-gtk:0/6 )
-REQUIRED_USE=|| ( gtk ncurses qt4 )
-SLOT=0/6
-SRC_URI=https://github.com/libyui/libyui/archive/libyui/master/3.2.5.tar.gz -> libyui-3.2.5.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84b8991734e0cf1fa605785e402b4677
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.6-r1 b/metadata/md5-cache/x11-libs/motif-2.3.6-r1
deleted file mode 100644
index 26360e248df8..000000000000
--- a/metadata/md5-cache/x11-libs/motif-2.3.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Motif user interface component toolkit
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
-IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.6%20Source%20Code/motif-2.3.6.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.6-patches-2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=56619ec759e4c53b9ad8207ace604d45
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.7 b/metadata/md5-cache/x11-libs/motif-2.3.7
index 2f6a27889ccc..66c68cba7cc1 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.7
+++ b/metadata/md5-cache/x11-libs/motif-2.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.7%20Source%20Code/motif-2.3.7.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.6-patches-2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1f79a823061307807f855452eacae4ea
+_md5_=0b50ae2dd27d56d6c6cd43bf0c9d9333
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 0b2485a4b4c4..f0e46018692b 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/kaqaz-1.2.0-r2 b/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r2
deleted file mode 100644
index c6cc98779c3b..000000000000
--- a/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsensors:5 dev-qt/qtsql:5[sqlite] dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-DESCRIPTION=Modern note manager
-EAPI=5
-HOMEPAGE=https://github.com/sialan-labs/kaqaz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsensors:5 dev-qt/qtsql:5[sqlite] dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=https://github.com/sialan-labs/kaqaz/archive/1.2.0.tar.gz -> kaqaz-1.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97e16cc749c489edebfdf8698d52e3e9
diff --git a/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r3 b/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r3
new file mode 100644
index 000000000000..3439334e534b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsensors:5 dev-qt/qtsql:5[sqlite] dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+DESCRIPTION=Modern note manager
+EAPI=6
+HOMEPAGE=https://github.com/sialan-labs/kaqaz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsensors:5 dev-qt/qtsql:5[sqlite] dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/sialan-labs/kaqaz/archive/1.2.0.tar.gz -> kaqaz-1.2.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a2f97e3e73a9e1d5b7f13a163784f309
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.3-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.3-r1
new file mode 100644
index 000000000000..5693f0e17693
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext xfce-base/exo >=sys-apps/sed-4
+DESCRIPTION=LightDM GTK+ Greeter
+EAPI=6
+HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
+IUSE=ayatana branding
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
+RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
+SLOT=0
+SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.3/+download/lightdm-gtk-greeter-2.0.3.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98deefd14fe8937f6b1a2c8f4db9f076
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
index b57aed4b1976..dafe15cf93f8 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev
 DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
 EAPI=6
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= x11-libs/libfm-qt:= x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://github.com/lxde/pcmanfm-qt/releases/download/0.11.1/pcmanfm-qt-0.11.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7503953979cbc219749e0a3f22c8adf
+_md5_=b7a2fe3b0cb482a489c9df9cc8d0565b
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.2.1-r1 b/metadata/md5-cache/x11-misc/screengrab-1.2.1-r1
deleted file mode 100644
index 5afd48a72e85..000000000000
--- a/metadata/md5-cache/x11-misc/screengrab-1.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libqxt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt application for getting screenshots
-EAPI=5
-HOMEPAGE=http://screengrab.doomer.org
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libqxt x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/DOOMer/screengrab/archive/1.2.1.tar.gz -> screengrab-1.2.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14b7f21d6c33e3e6dc6420247c542a00
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.97 b/metadata/md5-cache/x11-misc/screengrab-1.97
index 2ab4adf83669..ff71e3365939 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.97
+++ b/metadata/md5-cache/x11-misc/screengrab-1.97
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/q
 DESCRIPTION=Qt application for getting screenshots
 EAPI=6
 HOMEPAGE=https://github.com/QtDesktop/screengrab/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/QtDesktop/screengrab/archive/1.97.tar.gz -> screengrab-1.97.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=411009ae37958d96023b11c9f8c69166
+_md5_=e7f2892a3249a9003f043920f599966d
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 0318f4243968..70ee676b50fe 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/mutter-3.24.4 b/metadata/md5-cache/x11-wm/mutter-3.24.4
index c7e4b91757c0..8a7a4ac33b90 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.24.4
+++ b/metadata/md5-cache/x11-wm/mutter-3.24.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d59663b2c26b5b48f219a05517351e5b
+_md5_=04cb6f592ceb6f5dada2198a29f7725f
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 10a07408e0ff..16125c897987 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.7.0 b/metadata/md5-cache/xfce-base/thunar-1.7.0
index b2846c33041f..2bf26b43c9b4 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.7.0
+++ b/metadata/md5-cache/xfce-base/thunar-1.7.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure postinst postrm test
+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.20:3= >=xfce-base/exo-0.10:= >=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
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:=
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.7/Thunar-1.7.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1f97ed3e84740cb9fa4bdc82464853e
+_md5_=1156a06875a92ab5796b2989163bd73f
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 165002689738..5528af9b842e 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0
new file mode 100644
index 000000000000..d40221efb969
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A simple timer plug-in for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.10:=
+SLOT=0
+SRC_URI=mirror://xfce/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-1.7.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f3593d73a9fa0bec806503331b83e08
diff --git a/metadata/news/2018-01-23-systemd-blocker/2018-01-23-systemd-blocker.en.txt b/metadata/news/2018-01-23-systemd-blocker/2018-01-23-systemd-blocker.en.txt
new file mode 100644
index 000000000000..17692d9b6eac
--- /dev/null
+++ b/metadata/news/2018-01-23-systemd-blocker/2018-01-23-systemd-blocker.en.txt
@@ -0,0 +1,46 @@
+Title: systemd sysv-utils blocker resolution
+Author: Mike Gilbert <floppym@gentoo.org>
+Posted: 2018-01-23
+Revision: 2
+News-Item-Format: 2.0
+Display-If-Installed: <sys-apps/systemd-236-r4
+
+Starting with systemd-236, the sysv-utils USE flag is enabled by
+default.
+
+The sysv-utils USE flag controls installation of symlinks for several
+key commands:
+
+    /sbin/halt -> ../bin/systemctl
+    /sbin/init -> ../lib/systemd/systemd
+    /sbin/reboot -> ../bin/systemctl
+    /sbin/poweroff -> ../bin/systemctl
+    /sbin/runlevel -> ../bin/systemctl
+    /sbin/shutdown -> ../bin/systemctl
+    /sbin/telinit -> ../bin/systemctl
+
+These commands are otherwise provided by sys-apps/sysvinit. This package
+is blocked by systemd when the sysv-utils USE flag is enabled.
+
+Enabling sysv-utils should cause Portage to un-merge sysvinit and OpenRC
+if they are currently installed. emerge may emit a warning message
+before doing so; if you are booting with systemd, this message is safe
+to ignore.
+
+If you wish to keep sysvinit (and openrc) installed, you may disable the
+sysv-utils USE flag locally.
+
+If you run into unresolvable blockers with sysv-utils enabled, ensure
+that you do not have any reverse dependencies of sys-apps/sysvinit
+selected (in your world file).
+
+Common packages to look for:
+
+    sys-apps/sysvinit
+    sys-apps/openrc
+    net-misc/netifrc
+
+The equery command from gentoolkit may help track down installed
+packages that depend on openrc.
+
+    equery depends sys-apps/openrc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1c71e46d2142..191217c18379 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 18854 BLAKE2B 5514027fe02f2faff82837ae95feeafacf1ff654efc38e0217cb68454eff3498ba3d1c2ac7158d39b57a10a2277f4270fe60327e415d5b26128e7cd6ef521b82 SHA512 2a20a4b7ebf0aa6f21f104449ab417f770f5b13ce1903a80656e28d71b1200381c396aa4459c91d9e1e5f28fe3223544427441c12988b68c18f77fb692912fed
-TIMESTAMP 2018-01-21T18:08:27Z
+MANIFEST Manifest.files.gz 19029 BLAKE2B ce06494761e0d519b11c6e90add9344a529739b54c9ed439c6eb0d3079283090966ce78b3efa765cef03592f2eaec8c4c45822e3207427dcebc59e2f0903d3f6 SHA512 8d6322320c30905299bf49afe5ddebe7341c62d7ac02b6106a345e4a6a33d933c49dd510b54c28fe6aa6d79991d2e352cd49e7bf4ed3e8baa812bdd04b33f2bf
+TIMESTAMP 2018-01-26T14:38:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpk1xtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlprPWdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDZcg//YPzlld7zI4Wr9lXsq3Ycl3mRrhW0qsJ+UvD+6eGFeNdAVrSzyY4AlNFS
-MevUAcXaTV6AHe0TM6+BuLmPsa3iUnDO9x8yGEPVgKCvUJSOsHFYDjTO9lafH+bJ
-d/ySIV8D9zNUnn8jjbZ9Un6FQy8WlIgZ3p9Vuv/aiM2ifxhsjYrzPEd9jMw0ODtd
-XxqBoB9Z7SUY8wuvVbdA7nxdS0yqrQUK3mJFFC/sGGT2QD7tIsDmecoJYBFJNVmW
-b4yglaBMBPX2AtxIAnnCf9wScIZCi7D+Xewdqzcz3AAWUhHGS0GGTnEAlZvGvFac
-93nTOyKARPHD3lJbiwk/jTcM5CnZpV8ZNaxk7aNyy+5kizPJ1jyWaVa91S3g2EoA
-FKhRXOjwLLJGTtWNgKDGxuvcmYzcvWDcuJWwmTx4U3OnxuhTgxKWNq5tTxdXb4Gn
-esWwYVsgNzhD88VjGsHn6l5sgBZlL9s6E9zfbDOhUuUT2ChvGCoOz3uA/ngstlY0
-+voLoxVSmC7BbTXtrJykJfJYFjc5WVqBOwKe94yTzXPMSjeMO8Wt4CZ6YyAY4d4l
-nyOA1xIMvh40x8JvY/GVpj+smuYuji9bya3b4f1hKcOpNVqfZ+AK3vx44KHeb69g
-YeM2EQ9v2RuvoP4icwd4eZucPvLTUgXZRardwafFIRt4FajN74U=
-=Pe4H
+klA1FA//fxuvUCzjmAOJ/FhdX9dt7N1YVBvWEae18FJE42ikcC7AbjwvjRw35JHT
+4JljzmvT3R5aDw/7UDdx4azESMhqcIrvaYTdSIdPbHlNo7cwTRgbpDYNQCTVWUeT
+ADRvuSnKwKJ2voK85OamhdC0Seu5ufjzLXLChvXPhvZGVjFl6jBf6bqMXC+e9uTU
+rsyTo+oN828wHGpi5xk1vLFwaUx5VVCug/CXJ0+1oA4sENR+hwt3FbzqnfHtSKzV
+DR1UZ5DVAb2Oo/q5TX6Ejb4Y6apQRN80ZWEsFgddat/1bniT8X20kPuGkyxhEmGQ
+Y1QAvyIfI9dTVZ008A3qGXf13oBf9gR0a5Z22a/DtWL/7399BSlnMbeTHHNaEbzl
+pmcBU44ada1gzX23GbWH6cd3KvgkKHrqSqeR67rCOxcGTbpoPcoiUpub6uYtJjur
+wj9iJIFKABMpGGHW1TcILqVWQxoolhpqtD5ijf+SEwsxmwALKiIFN4s1ijhKw6RD
+KBs0g3lA+dxKVqLQoqI61ISvzpjbwqgfUlNeMSQX+BN81nMuA7d2rHZTRpESBY8U
+Sk4sVdfK6Sd5ZDYM38qusn25O+hT4RWzArAwJvGIFV+xePLYGDmsBhSryJMljHMD
+PX61c0Z+vWcMc+PClpFl7gTJQ3rrDTvB+1uUhiry3PFbU8yg0P8=
+=8xqv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index d45ad1a1d180..33e3bcf4edc1 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5b75753b8450..3e5d4982e927 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jan 2018 18:08:23 +0000
+Fri, 26 Jan 2018 14:38:27 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index dd04996887a3..506d9dbc3c68 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-02938e6a5cfc29ad6f3bd2e777633ea66a7a70dc 1516468104 2018-01-20T17:08:24+00:00
+00797101a9f1a77aab802fde89ea51b3f169553d 1516816604 2018-01-24T17:56:44+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 19eec866c2ee..a3170208e0bd 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1741,6 +1741,7 @@
     <member>
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
+      <role>General system administration</role>
     </member>
     <member>
       <email>zx2c4@gentoo.org</email>
@@ -2121,10 +2122,6 @@
     <url>https://wiki.gentoo.org/wiki/Project:LiveCD</url>
     <description>Maintains packages used in the creation of LiveCDs.</description>
     <member>
-      <email>blackace@gentoo.org</email>
-      <name>Matt Kasa</name>
-    </member>
-    <member>
       <email>jer@gentoo.org</email>
       <name>Jeroen Roovers</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 6c2dfc6b0ecc..4857b00fcef0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 21 18:08:23 UTC 2018
+Fri Jan 26 14:38:27 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cdaa81aa6408..6d48f430265c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jan 2018 18:15:01 +0000
+Fri, 26 Jan 2018 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 40ffbe5e4771..8b1afe32161a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dd27e9b5f899b63e3babb0b39304e463d8789b17 1516557234 2018-01-21T17:53:54+00:00
+18d0514b77b1b7b801c701fac504b7abcd9a2fc3 1516976320 2018-01-26T14:18:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f2d6221ec65e..e67d30f36ab4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1516557901 Sun 21 Jan 2018 06:05:01 PM UTC
+1516977302 Fri 26 Jan 2018 02:35:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5b75753b8450..3e5d4982e927 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jan 2018 18:08:23 +0000
+Fri, 26 Jan 2018 14:38:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ccec3e4ca1b9..2bf5e5370820 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 8a43f312d17c..068ef0483e6a 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.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e
-DIST fail2ban-0.9.7.tar.gz 356410 BLAKE2B 0dc83741825299236e70f6544155ccefea9682b6b62ee98087918433fe5c3795331bdbc92ee003ec794739d9a826293fd0c20518dd4c0c0bc5c6b963941d11d4 SHA512 117b2cad742636c84ddd1f7de04abb603a74893eae062bd19edcde70a7246bc02157b644ee7192e5bcbd4c45ff6c541d5c598846bdd2dcbab21b884c6402f94d
 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.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0
-EBUILD fail2ban-0.9.7.ebuild 3141 BLAKE2B e19139d49d4f21526f9459c0e3bbbfa88fda00bebcb7258540d2c62329012997db48a52a06df32cb7b3d3759bb26d714cff4328b95a49e23ccb1e02ada6761da SHA512 f96a49ecd41a6da8dad3ec1b5e8e72d4a04f7c9cb373f46782f417a61040ef53b6c5c838bea3ff790552efdada721f4b47c37fc9e28610d94f048eb6b0ebe661
 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.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.2.ebuild
new file mode 100644
index 000000000000..1efe5233391c
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.10.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd vcs-snapshot
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="http://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux systemd"
+
+# TODO support ipfw and ipfilter
+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_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	eapply_user
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if python_is_python3; then
+		./fail2ban-2to3 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
+	systemd_dounit "${T}/${PN}.service"
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite]; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite"
+	fi
+
+	if has_version sys-apps/systemd[-python]; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
deleted file mode 100644
index eaa1dbd0fc89..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="selinux systemd"
-
-# TODO support ipfw and ipfilter
-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_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-	)' 'python*' ) )
-"
-
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	eapply_user
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	systemd_dounit files/${PN}.service
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index 0fd626e291d5..565bba0a81b6 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74
-EBUILD flent-1.0.1.ebuild 676 BLAKE2B 18253db04b0e20f6be5820693f67507882b722999c07c5bf3cb34c8496e9f314b2767ff880bd6dfcada75a6499059fd09b42c0ee754b469f354976c9dace76be SHA512 7a66698df50a2a909ae7be714d7f1e9092cba48b369909c4c0c4f8185261975e7769f2986bc7c5bef91ab4f23300326cda20f05fe14c76cda53fb8e5de4a2ac9
+EBUILD flent-1.0.1-r1.ebuild 626 BLAKE2B 94df6ebc79dd511ed928c96fe8f0aca8788cd80caf6151561d280850d9ac4c802585279f45345b01f457ca88bb2ca1c9192c55d7aecda2d916f24d8eba7f0afc SHA512 a1af9b11fd460ff7868e960a5b68a1e20b9e091164c4a17cc0f3872ac4b7353d012a903728b3d289f931d5668f0f533912c48faabc7ef8e1ca90d8ac72e2a72a
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..d90d41ace9b5
--- /dev/null
+++ b/net-analyzer/flent/flent-1.0.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="The FLExible Network Tester"
+HOMEPAGE="https://flent.org/"
+SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 +plots"
+
+RDEPEND="qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+		plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+		net-analyzer/netperf[demo]
+		net-misc/iperf
+		net-analyzer/fping"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/flent/flent-1.0.1.ebuild b/net-analyzer/flent/flent-1.0.1.ebuild
deleted file mode 100644
index 8582f7c7e512..000000000000
--- a/net-analyzer/flent/flent-1.0.1.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
-
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="The FLExible Network Tester"
-HOMEPAGE="https://flent.org/"
-SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 qt4 +plots"
-
-RDEPEND="qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-		qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-		plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-		net-analyzer/netperf[demo]
-		net-misc/iperf
-		net-analyzer/fping"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 49e766ef4e91..b9da3c956352 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -9,5 +9,5 @@ AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d85574650
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
 EBUILD ntopng-2.4.ebuild 1723 BLAKE2B 349113c042d144ffc60e4cda0aa7714af23506c5e88d3b0f6dd70e21de1d4f5b3835d6fccef9f2893705d60190d637b6153299a25974dec37cfb29fe8b629368 SHA512 f17de8331ace1f50eddf367bf25c1619edcb3d1a391f63adb2c205fc74f324135c010322e9f9c30ce25a72bd6f59730612d5fc6019a109ec1a785250e2161ddd
-EBUILD ntopng-3.0-r2.ebuild 1599 BLAKE2B a61f3399c62a0a988301ec4c80b7267c1fabfbd707364495ceb1dd9b439dc128ed89eac9c87e0e2083e4ea76e809a3ed86df16eb3b543ac4a23ea03ed94988d2 SHA512 dfa223781590d2bdd32e38bdc9a36598582dc5ea830aa8ee0b62338888c956776ae9fd46f61853e36352dd9b5508c82392db509b94d351927cbd111f96cdcb1e
+EBUILD ntopng-3.0-r2.ebuild 1628 BLAKE2B 5b9486c8c37cfe852366819fc6324b8fa6bd2bb058f9619cec00bde8259415f15a46ca898f4f1e60432c30a0def885a0d0322709faa757bce9a1f169189c9b87 SHA512 72af23df5efdf0655e38ab305987c93fe27c0e09d3404e8c5482c68138b9e4eb5887a48deb0da88c5d1742eec527d532f335ef42749a960f56630dfacc1b0e07
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index bdb49f1374ae..0fc8da9c6326 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.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
@@ -23,8 +23,9 @@ DEPEND="dev-db/sqlite:3
 	dev-libs/libxml2
 	net-analyzer/rrdtool
 	net-libs/libpcap
-	net-libs/nDPI
+	=net-libs/nDPI-2.0
 	net-misc/curl
+	sys-libs/binutils-libs
 	virtual/libmysqlclient"
 RDEPEND="${DEPEND}
 	dev-db/redis"
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 8b19f9e8e8f0..9365eda43183 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,5 +1,5 @@
 AUX prometheus-node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
 AUX prometheus-node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
 DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
-EBUILD prometheus-node_exporter-0.15.2.ebuild 1226 BLAKE2B d01056a5f223bb1a55cd13632a022d973a81c267a36da1329c3d79e6c8bd35b062db653e7140915d1d154fa2858a3b048eedbd301d3b804a3a6eaad377afd01f SHA512 4d2c05f64754001828474ed77d58078a8b9cacdf159ce7e93b36f61900d33c396d36e11f67fd4de9faa79a3dee2a82f24c8a31b3627bb48affb55a25db675695
+EBUILD prometheus-node_exporter-0.15.2.ebuild 1225 BLAKE2B 3e5633734ba2be8f83953b4851a17ba76a619aae1490348f4f0fdf83e34a26e07c561a5fce9e41bb6f86aef9cc537f48cea6bba74082821fbd7fe4395aec8e39 SHA512 54286e2c5957524374885335e512bfed3b609e8e2e293fb7e0d842603e1bbc026536a96a6a75ea141baed7a96fbe57f9fcb8067968ae162745c813855b9d7976
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
index 120e1bcf1334..c85ca942ce7c 100644
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.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
@@ -8,7 +8,7 @@ EGO_PN="github.com/prometheus/node_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
 NODE_EXPORTER_COMMIT="98bc649"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus exporter for machine metrics"
 HOMEPAGE="https://github.com/prometheus/node_exporter"
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index cabf2e3ab5ab..47a3d1ea8015 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,20 +1,6 @@
-AUX fortify_source-numeric.patch 407 BLAKE2B b86c288d6523ed4ebe80bddd2bb08204259d8cb72828835a2dd37015955b08cd4a8ce9b3269be8044d9caebe8d51e8e287263f1ba5c66892c4ce3baf5faf28a3 SHA512 7b8e2cd5353ad5b3129143a43ecd03d056bd71b048e52934efe5a50033fd8a62eee12cd9b773303b497834b1899ad69071f37cafe9c72d3ae180151788af6392
-AUX json.patch 276 BLAKE2B 8cb07aaf77195e230e1f046e7772e32fdd0a9ffc592705b0d46979a09b7900652ea016e8cccb39b3d8ba9b9d52c042848d31ee5c9b1e95359d026bb424b98919 SHA512 7deec6818ddad384bd6721e363599c0bcd38ba20f8f23673abf90559ccb67bc7c0b5734c0dec8e74501c4032f50dccf069f1d8ddd8c2d69aab79abfbe56181ca
-AUX magic-location.patch 352 BLAKE2B 6b7fc9f901a28c4825b5ba973b05e64b76dc12b3035f47492232b20060a54629cb7ca42906b0828ebbbed324198d86c2a00d35339263f4afe7592de0e206cc3b SHA512 0cb2fbcf65c3ce567da0492b0b0b0ff5e6ce50390e2879131e2b912433c5540f7822bcf15cc4eb556d023105bbbff554aa990cc366b6b995482e98ecdf61c07f
-AUX suricata-3.2-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
-AUX suricata-3.2-init 5499 BLAKE2B 401bc0000a91df7672a57f99c26d338ec675d347631bed781d8cf455c67f8124a48775c1d2d7e292fb4748f9e57fb80c5b112b0bdc171efa0306f3289b48a4ca SHA512 2f13036bd34e91760dfc53be3f6b9b2579a48e7e3146a5c2fcb9b83b949f5e979cab8001ebd4a6732d620f05c71b0a112028b86f423c126145941119c09456d0
-AUX suricata-3.2.1-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
-AUX suricata-3.2.1-init 5499 BLAKE2B 401bc0000a91df7672a57f99c26d338ec675d347631bed781d8cf455c67f8124a48775c1d2d7e292fb4748f9e57fb80c5b112b0bdc171efa0306f3289b48a4ca SHA512 2f13036bd34e91760dfc53be3f6b9b2579a48e7e3146a5c2fcb9b83b949f5e979cab8001ebd4a6732d620f05c71b0a112028b86f423c126145941119c09456d0
+AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
+AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
-DIST suricata-2.0.11.tar.gz 3091124 BLAKE2B 5cc99982d2041f0fd405ae1aee01c3955f8780a49148b64cd98061f60dbba9ced5d56e57247883480dfb06f587b231c4527eb59052d9e4c1341a8dafe6f20b90 SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9
-DIST suricata-3.0.1.tar.gz 3315637 BLAKE2B f92e8f4b9708b265eda2476dbedaaa3a5c417561befc4d4c0bca15669545f07cd681a6e4e60f9290c97072dffb9ced473ca5fbbd4250d1df002353f1de87b759 SHA512 cd10f5b19dd7b6ccbed668263b54d93738842191e71391b040aa7fc2049ac597feb38cd333f07b15d30ebeaf778f6abe18b72215e609891608dca094531c7fd8
-DIST suricata-3.1.3.tar.gz 3340627 BLAKE2B 6dff61a876591485fc32053912abfe8ec2ac23ff40ed63e4140d3c494adbf83b7310afae67f0b2c552f45c6ec9ed02db94635b3d90e4ac74e3da8de3a611f65b SHA512 d29c2c4344d52ba3d8c5ed4331a35b512e323c9a13a73e3039df6406d8c6389d05e3b311db6b561125c12dfbea67b121afbdecb7f0a5cb0594cf339b492726fb
-DIST suricata-3.2.1.tar.gz 11754332 BLAKE2B 1f72f9460c363aa86933a7105f0267d89e5b7e11db8668d30f2e84a545856cc53e4edc403f434533271697fc73d45fbd9ea2ce2cc4f07c245ba0724e3d0cae60 SHA512 6b0e5565368a085f059f62c9862364a9fcd970158b17671a25bcbed9b3ef8fcf857b1760a6d186ebe3227dde45070bc69a8b0d0bfd341f39a4d42ef93d12f290
-DIST suricata-3.2.tar.gz 11732080 BLAKE2B e5315edc7fb42792f165ebc6b43b3bef8ca8151857305adb6ac1cd2bbf93f5f679ac9762ac48836bf94dfdfc820e4dc7fdcaa73a2b609e3128524f39cd24c741 SHA512 327f5a62449af44f6cb95220e1ff9bf61b51db7bd25f2b1e8def3e8650ba754304cf9d02fc30b46b6cbaa6b5f94fa3d4be90edb8a293ff3b6c0927b596a2976e
-EBUILD suricata-2.0.11.ebuild 2786 BLAKE2B 0c55414968c2008e89fda539edacacf10a71733d95603ade94fffa4b80c30a9ea9f10ded92f096d76ff159208aa55b7973b2e644a46d419e807781be3756d6a8 SHA512 c077788ff428b1d52ed5d307463520292e71daf728676fd9be92ea23da6d5ba20ec6957f932efc33e801b4a7d6be5090df166167cdb429be70b9420607f7518c
-EBUILD suricata-3.0.1.ebuild 2658 BLAKE2B 9756a31bec97a9a139b3cc096225cc43d2a9fe08e36a948a048e0881ce737167e3fd112f474c34d56acf8124d2bfb3f99cf1748f2f2818a0b7a8eac613ba3cb0 SHA512 2d9cc77b9dd82db6ccacf0d9ed5711ccc204b8d02325523dbbde266da71347e2bcb74be79ddb2b70278916ef4a779fe6bf7e7037eb77092939ee33a2b5f3d948
-EBUILD suricata-3.1.3.ebuild 2770 BLAKE2B 7ebf69c30d6298847741db665b3900fcfe3760e958394ee5e359bba94bcc66ffc161e820b08b9e084a9ef8882348761aff78fcee7ab16677102c5e27e465578a SHA512 7d8a2e934c5f62aca4bc11faff14d39f92aaf8ab0ac802f6f1c1187061880ec3fa5b13c4192be19909000232eb91b1bcee76fc0af76543f00bb981e2b3542a3b
-EBUILD suricata-3.2-r1.ebuild 4490 BLAKE2B 14cbdf7d5825f31e56fa2841133ef475b935bef2930272b2421f0b7cca4180879563a5f521fc4d60c72809dc505c2f56f5541876f9f64f23a04fe1dc11b3e125 SHA512 b143e94b1fbc444c2af5676bfb859e9780261a1b5435bd2018329736e81ac386c4927edf494fced53bba349535b26d48276b2be8e4c23bb9870e8174625da3a6
-EBUILD suricata-3.2.1.ebuild 4457 BLAKE2B 0931805a4d5d68445d161a71791b43831865b5b871cb0ba4901f26d23bee6b4cc7f72825bda046e5020fec5a5db05434b5d31ffd1f31c9c84e024f4bab89764b SHA512 f379ff6dd6137a4fc8541941f62f401f1ca73b1d635336eec27db30009ac7d2c32b7ec81f66c76b52b277e9c37b45da1a367a37f0c6f5540250fd58dcb69a790
-EBUILD suricata-3.2.ebuild 3955 BLAKE2B ae6e8cf9d27d2558c659a3e831d43a8d92ed8c409e0a440eca772e960a129aaa7eb6a265e6bdca7db9f41cbf5b899bf320d55e661a540955c21abf7fd44cbb88 SHA512 a61cc818e963174184dbd3b1ba025138294856453c03ea60b8d6f66f41e040ad10e59982df750c7468cd3968789da0ea40f61ef8369c00c44ed3160cadab9539
+DIST suricata-4.0.3.tar.gz 12392388 BLAKE2B 9b6338b343ff85f070d61608ff9dc7f25df868fdffbc13b5a8d245cb3db5cd757cb1785c827c388653b2f8a7977129259671900bc1abfebeb878a668b4058bdf SHA512 aa6b6d1ae86efad0184ba4fa06375f34334e07c22b7b1f82bf17fcb0ae48ad7f867bced57ab4f713de01583965e1260cb82e1355f78002071b689dddd3b53892
+EBUILD suricata-4.0.3.ebuild 4490 BLAKE2B b8ed360001db9edfdd857317fdaaed4db8afec22edd90906de4568fd2d36a5fb564364cfe090f52e33b0292332a682bb21046bccb5c7d4672e6e9bd0bbdebdbf SHA512 1b5fd75daab456bfd1b15fde5d2a868b440557054b9a5c0d8ecc0bc825f5b79efbcf74ad5212ea4ca10b77fe745a2c3059704ef3c98fde7e559776ac268b7c94
 MISC metadata.xml 828 BLAKE2B 72f92cdf30fe468d7db186c525a6d51c06f9a2246ca42fb1d34b1630f208391c64367e4f3a373cddf6be419f1f5237125ae3da366bfe87665d4dab34ebf6cbde SHA512 b9508afecf680f4e4b48fa88853170ba30b4d7d3e0cb6696405a742dfeb1ae2039cb8979793e37526d082ca252fc828688973c1395dd50ff5a61b86c6433fe70
diff --git a/net-analyzer/suricata/files/fortify_source-numeric.patch b/net-analyzer/suricata/files/fortify_source-numeric.patch
deleted file mode 100644
index 0a7f4827ea05..000000000000
--- a/net-analyzer/suricata/files/fortify_source-numeric.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/suricata.c	2015-10-02 00:21:55.634213646 +0200
-+++ b/src/suricata.c	2015-10-02 00:22:39.143940007 +0200
-@@ -774,7 +774,7 @@
-     printf("compiled with -fstack-protector-all\n");
- #endif
- #ifdef _FORTIFY_SOURCE
--    printf("compiled with _FORTIFY_SOURCE=%d\n", _FORTIFY_SOURCE);
-+    printf("compiled with _FORTIFY_SOURCE\n");
- #endif
- #ifdef CLS
-     printf("L1 cache line size (CLS)=%d\n", CLS);
diff --git a/net-analyzer/suricata/files/json.patch b/net-analyzer/suricata/files/json.patch
deleted file mode 100644
index a542f351640d..000000000000
--- a/net-analyzer/suricata/files/json.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/output-json.h.orig	2015-11-21 21:56:24.996289587 +0100
-+++ src/output-json.h	2015-11-21 21:57:11.419622642 +0100
-@@ -28,6 +28,7 @@
- 
- #ifdef HAVE_LIBJANSSON
- 
-+#include <jansson.h>
- #include "suricata-common.h"
- #include "util-buffer.h"
- #include "util-logopenfile.h"
diff --git a/net-analyzer/suricata/files/magic-location.patch b/net-analyzer/suricata/files/magic-location.patch
deleted file mode 100644
index 02681f934b06..000000000000
--- a/net-analyzer/suricata/files/magic-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8b41eb0..3cdf0e7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -182,7 +182,7 @@
-     fi
-     echo -n "installation for $host OS... "
- 
--    e_magic_file="/usr/share/file/magic"
-+    e_magic_file="/usr/share/misc/magic.mgc"
-     case "$host" in
-         *-*-*freebsd*)
-             LUA_PC_NAME="lua-5.1"
diff --git a/net-analyzer/suricata/files/suricata-3.2-init b/net-analyzer/suricata/files/suricata-3.2-init
deleted file mode 100644
index 76dd521d7ada..000000000000
--- a/net-analyzer/suricata/files/suricata-3.2-init
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SURICATA_BIN=/usr/bin/suricata
-SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
-SURICATA=${SVCNAME#*.}
-SURICATAID=$(shell_var "${SURICATA}")
-if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
-    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
-    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
-    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
-    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
-    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
-else
-    SURICATACONF=${SURICATA_CONF}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.pid"
-    SURICATAOPTS=${SURICATA_OPTS}
-    SURICATALOGPATH=${SURICATA_LOG_FILE}
-    SURICATAUSER=${SURICATA_USER}
-    SURICATAGROUP=${SURICATA_GROUP}
-fi
-SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
-SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
-[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
-[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
-
-description="Suricata IDS/IPS"
-extra_commands="checkconfig dump"
-description_checkconfig="Check config for ${SVCNAME}"
-description_dump="List all config values that can be used with --set"
-extra_started_commands="reload relog"
-description_reload="Live rule and config reload"
-description_relog="Close and re-open all log files"
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -d "/var/run/suricata" ] ; then
-		checkpath -d /var/run/suricata
-	fi
-	if [ ${#SURICATALOGPATH} -gt 0 ]; then
-		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
-		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
-		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
-		if [ ! -d "${SURICATALOGPATH}" ] ; then
-			checkpath -d "${SURICATALOGPATH}"
-		fi
-		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
-		fi
-		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
-		SURICATALOGPATH="-l ${SURICATALOGPATH}"
-	fi
-	if [ ! -e ${SURICATACONF} ] ; then
-		einfo "The configuration file ${SURICATACONF} was not found."
-		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
-		einfo "Take a look at the suricata arguments --set and --dump-config."
-	fi
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
-		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
-	fi
-}
-
-initpidinfo() {
-	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
-	if [ ${#SUR_PID} -gt 0 ]; then
-	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
-	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
-	fi
-}
-
-checkpidinfo() {
-	initpidinfo
-        if [ ! -e ${SURICATAPID} ]; then
-        	eerror "${SVCNAME} isn't running"
-                return 1
-	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
-		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
-		return 1
-	elif [ ${#SUR_USER} -eq 0 ]; then
-		eerror "Unable to determine user running ${SVCNAME}!"
-		return 1
-	elif [ "x${SUR_USER}" != "xroot" ]; then
-		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
-        fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
-		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
-	local SUR_EXIT=$?
-	if [ $((SUR_EXIT)) -ne 0 ]; then
-	    einfo "Could not start ${SURICATA_BIN} with:"
-	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
-	    einfo "Exit code ${SUR_EXIT}"
-	fi
-	eend ${SUR_EXIT}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
-	eend $?
-}
-
-reload() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-relog() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-dump() {
-	checkconfig || return 1
-	ebegin "Dumping ${SVCNAME} config values and quitting."
-	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
-	eend $?
-}
diff --git a/net-analyzer/suricata/files/suricata-3.2.1-conf b/net-analyzer/suricata/files/suricata-3.2.1-conf
deleted file mode 100644
index 655b947fdd9b..000000000000
--- a/net-analyzer/suricata/files/suricata-3.2.1-conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# Config file for /etc/init.d/suricata*
-
-# Where config files are stored. Default:
-
-# SURICATA_DIR="/etc/suricata"
-
-# Pass options to each suricata service.
-#
-# You can launch more than one service at the same time with different options.
-# This can be useful in a multi-queue gateway, for example.
-# You can expand on the Suricata inline example found at:
-# http://suricata.readthedocs.io/en/latest/setting-up-ipsinline-for-linux.html
-# Instead of configuring iptables to send traffic to just one queue, you can configure it to "load balance"
-# on several queues. You can then have a Suricata instance processing traffic for each queue.
-# This should help improve performance on the gateway/firewall.
-#
-# Suppose you configured iptables to use queues 0 and 1 named q0 and q1. You can now do the following:
-# ln -s /etc/init.d/suricata /etc/init.d/suricata.q0
-# ln -s /etc/init.d/suricata /etc/init.d/suricata.q1
-# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q0.yaml
-# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q1.yaml
-#
-# Edit both suricata-q{0,1}.yaml files and set values accordingly.
-# You can override these yaml config file names with SURICATA_CONF* below (optional).
-# This allows you to use the same yaml config file for multiple instances as long as you override
-# sensible options such as the log file paths.
-# SURICATA_CONF_q0="suricata-queues.yaml"
-# SURICATA_CONF_q1="suricata-queues.yaml"
-# SURICATA_CONF="suricata.yaml"
-
-# You can define the options here:
-# NB: avoid using -l, -c, --user, --group and setting logging.outputs.1.file.filename as the init script will try to set them for you.
-
-# SURICATA_OPTS_q0="-q 0"
-# SURICATA_OPTS_q1="-q 1"
-
-# If you want to use ${SURICATA_DIR}/suricata.yaml and start the service with /etc/init.d/suricata
-# then you can set:
-
-SURICATA_OPTS="-i eth0"
-
-# Log paths listed here will be created by the init script and will override the log path
-# set in the yaml file, if present.
-# SURICATA_LOG_FILE_q0="/var/log/suricata/q0/suricata.log"
-# SURICATA_LOG_FILE_q1="/var/log/suricata/q1/suricata.log"
-# SURICATA_LOG_FILE="/var/log/suricata/suricata.log"
-
-# Run as user/group.
-# Do not define if you want to run as root or as the user defined in the yaml config file (run-as).
-# The ebuild should have created the dedicated user/group suricata:suricata for you to specify here below.
-# SURICATA_USER_q0="suricata"
-# SURICATA_GROUP_q0="suricata"
-# SURICATA_USER_q1="suricata"
-# SURICATA_GROUP_q1="suricata"
-# SURICATA_USER="suricata"
-# SURICATA_GROUP="suricata"
-
-# Suricata processes can take a long time to shut down.
-# If necessary, adjust timeout in seconds to be used when calling stop from the init script.
-# Examples:
-# SURICATA_MAX_WAIT_ON_STOP="300"
-# SURICATA_MAX_WAIT_ON_STOP="SIGTERM/30"
diff --git a/net-analyzer/suricata/files/suricata-3.2.1-init b/net-analyzer/suricata/files/suricata-3.2.1-init
deleted file mode 100644
index 76dd521d7ada..000000000000
--- a/net-analyzer/suricata/files/suricata-3.2.1-init
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SURICATA_BIN=/usr/bin/suricata
-SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
-SURICATA=${SVCNAME#*.}
-SURICATAID=$(shell_var "${SURICATA}")
-if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
-    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
-    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
-    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
-    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
-    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
-else
-    SURICATACONF=${SURICATA_CONF}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.pid"
-    SURICATAOPTS=${SURICATA_OPTS}
-    SURICATALOGPATH=${SURICATA_LOG_FILE}
-    SURICATAUSER=${SURICATA_USER}
-    SURICATAGROUP=${SURICATA_GROUP}
-fi
-SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
-SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
-[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
-[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
-
-description="Suricata IDS/IPS"
-extra_commands="checkconfig dump"
-description_checkconfig="Check config for ${SVCNAME}"
-description_dump="List all config values that can be used with --set"
-extra_started_commands="reload relog"
-description_reload="Live rule and config reload"
-description_relog="Close and re-open all log files"
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -d "/var/run/suricata" ] ; then
-		checkpath -d /var/run/suricata
-	fi
-	if [ ${#SURICATALOGPATH} -gt 0 ]; then
-		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
-		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
-		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
-		if [ ! -d "${SURICATALOGPATH}" ] ; then
-			checkpath -d "${SURICATALOGPATH}"
-		fi
-		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
-		fi
-		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
-		SURICATALOGPATH="-l ${SURICATALOGPATH}"
-	fi
-	if [ ! -e ${SURICATACONF} ] ; then
-		einfo "The configuration file ${SURICATACONF} was not found."
-		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
-		einfo "Take a look at the suricata arguments --set and --dump-config."
-	fi
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
-		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
-	fi
-}
-
-initpidinfo() {
-	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
-	if [ ${#SUR_PID} -gt 0 ]; then
-	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
-	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
-	fi
-}
-
-checkpidinfo() {
-	initpidinfo
-        if [ ! -e ${SURICATAPID} ]; then
-        	eerror "${SVCNAME} isn't running"
-                return 1
-	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
-		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
-		return 1
-	elif [ ${#SUR_USER} -eq 0 ]; then
-		eerror "Unable to determine user running ${SVCNAME}!"
-		return 1
-	elif [ "x${SUR_USER}" != "xroot" ]; then
-		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
-        fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
-		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
-	local SUR_EXIT=$?
-	if [ $((SUR_EXIT)) -ne 0 ]; then
-	    einfo "Could not start ${SURICATA_BIN} with:"
-	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
-	    einfo "Exit code ${SUR_EXIT}"
-	fi
-	eend ${SUR_EXIT}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
-	eend $?
-}
-
-reload() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-relog() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-dump() {
-	checkconfig || return 1
-	ebegin "Dumping ${SVCNAME} config values and quitting."
-	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
-	eend $?
-}
diff --git a/net-analyzer/suricata/files/suricata-3.2-conf b/net-analyzer/suricata/files/suricata-4.0.3-conf
index 655b947fdd9b..655b947fdd9b 100644
--- a/net-analyzer/suricata/files/suricata-3.2-conf
+++ b/net-analyzer/suricata/files/suricata-4.0.3-conf
diff --git a/net-analyzer/suricata/files/suricata-4.0.3-init b/net-analyzer/suricata/files/suricata-4.0.3-init
new file mode 100644
index 000000000000..f54ba3a5e23b
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-4.0.3-init
@@ -0,0 +1,147 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SURICATA_BIN=/usr/bin/suricata
+SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
+SURICATA=${SVCNAME#*.}
+SURICATAID=$(shell_var "${SURICATA}")
+if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
+    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
+    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
+    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
+    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
+    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
+else
+    SURICATACONF=${SURICATA_CONF}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.pid"
+    SURICATAOPTS=${SURICATA_OPTS}
+    SURICATALOGPATH=${SURICATA_LOG_FILE}
+    SURICATAUSER=${SURICATA_USER}
+    SURICATAGROUP=${SURICATA_GROUP}
+fi
+SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
+SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
+[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
+[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
+
+description="Suricata IDS/IPS"
+extra_commands="checkconfig dump"
+description_checkconfig="Check config for ${SVCNAME}"
+description_dump="List all config values that can be used with --set"
+extra_started_commands="reload relog"
+description_reload="Live rule and config reload"
+description_relog="Close and re-open all log files"
+
+depend() {
+	need net
+	after mysql
+	after postgresql
+}
+
+checkconfig() {
+	if [ ! -d "/var/run/suricata" ] ; then
+		checkpath -d /var/run/suricata
+	fi
+	if [ ${#SURICATALOGPATH} -gt 0 ]; then
+		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
+		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
+		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
+		if [ ! -d "${SURICATALOGPATH}" ] ; then
+			checkpath -d "${SURICATALOGPATH}"
+		fi
+		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
+		fi
+		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
+		SURICATALOGPATH="-l ${SURICATALOGPATH}"
+	fi
+	if [ ! -e ${SURICATACONF} ] ; then
+		einfo "The configuration file ${SURICATACONF} was not found."
+		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
+		einfo "Take a look at the suricata arguments --set and --dump-config."
+	fi
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
+		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
+	fi
+}
+
+initpidinfo() {
+	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
+	if [ ${#SUR_PID} -gt 0 ]; then
+	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
+	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
+	fi
+}
+
+checkpidinfo() {
+	initpidinfo
+        if [ ! -e ${SURICATAPID} ]; then
+        	eerror "${SVCNAME} isn't running"
+                return 1
+	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
+		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
+		return 1
+	elif [ ${#SUR_USER} -eq 0 ]; then
+		eerror "Unable to determine user running ${SVCNAME}!"
+		return 1
+	elif [ "x${SUR_USER}" != "xroot" ]; then
+		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
+        fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
+		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
+	local SUR_EXIT=$?
+	if [ $((SUR_EXIT)) -ne 0 ]; then
+	    einfo "Could not start ${SURICATA_BIN} with:"
+	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
+	    einfo "Exit code ${SUR_EXIT}"
+	fi
+	eend ${SUR_EXIT}
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
+	eend $?
+}
+
+reload() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+relog() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+dump() {
+	checkconfig || return 1
+	ebegin "Dumping ${SVCNAME} config values and quitting."
+	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
+	eend $?
+}
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
deleted file mode 100644
index cebe46b654e3..000000000000
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.18
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fortify_source-numeric.patch"
-	epatch "${FILESDIR}/magic-location.patch"
-	epatch "${FILESDIR}/json.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	econf LIBS="${LIBS}" ${myeconfargs[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
diff --git a/net-analyzer/suricata/suricata-3.0.1.ebuild b/net-analyzer/suricata/suricata-3.0.1.ebuild
deleted file mode 100644
index 90010bf2a045..000000000000
--- a/net-analyzer/suricata/suricata-3.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.18
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	econf LIBS="${LIBS}" ${myeconfargs[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
diff --git a/net-analyzer/suricata/suricata-3.1.3.ebuild b/net-analyzer/suricata/suricata-3.1.3.ebuild
deleted file mode 100644
index 5b883f9be78a..000000000000
--- a/net-analyzer/suricata/suricata-3.1.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.20
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	if use redis ; then
-		myeconfargs+=( $(use_enable redis hiredis) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	econf LIBS="${LIBS}" ${myeconfargs[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
diff --git a/net-analyzer/suricata/suricata-3.2-r1.ebuild b/net-analyzer/suricata/suricata-3.2-r1.ebuild
deleted file mode 100644
index f6aa21dbcc46..000000000000
--- a/net-analyzer/suricata/suricata-3.2-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
-
-REQUIRED_USE="lua? ( !luajit )"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.20
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )
-	logrotate?      ( app-admin/logrotate )
-	sys-libs/libcap-ng
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	if use redis ; then
-		myeconfargs+=( $(use_enable redis hiredis) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	# avoid upstream configure script trying to add -march=native to CFLAGS
-	myeconfargs+=( --enable-gccmarch-native=no )
-
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
-	else
-		econf LIBS="${LIBS}" ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-
-	newinitd "${FILESDIR}/${P}-init" ${PN}
-	newconfd "${FILESDIR}/${P}-conf" ${PN}
-
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}-logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	elog "The ${PN} init script expects to find the path to the configuration"
-	elog "file as well as extra options in /etc/conf.d."
-	elog ""
-	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-	elog "then create a symlink to the init script from a link called"
-	elog "${PN}.foo - like so"
-	elog "   cd /etc/${PN}"
-	elog "   ${EDITOR##*/} suricata-foo.yaml"
-	elog "   cd /etc/init.d"
-	elog "   ln -s ${PN} ${PN}.foo"
-	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-	elog ""
-	elog "You can create as many ${PN}.foo* services as you wish."
-
-	if use logrotate; then
-		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
-	fi
-
-	if use debug; then
-		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-}
diff --git a/net-analyzer/suricata/suricata-3.2.1.ebuild b/net-analyzer/suricata/suricata-3.2.1.ebuild
deleted file mode 100644
index 419c56ac26d8..000000000000
--- a/net-analyzer/suricata/suricata-3.2.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.20
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )
-	logrotate?      ( app-admin/logrotate )
-	sys-libs/libcap-ng
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	if use redis ; then
-		myeconfargs+=( $(use_enable redis hiredis) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	# avoid upstream configure script trying to add -march=native to CFLAGS
-	myeconfargs+=( --enable-gccmarch-native=no )
-
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
-	else
-		econf LIBS="${LIBS}" ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-
-	newinitd "${FILESDIR}/${P}-init" ${PN}
-	newconfd "${FILESDIR}/${P}-conf" ${PN}
-
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}-logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	elog "The ${PN} init script expects to find the path to the configuration"
-	elog "file as well as extra options in /etc/conf.d."
-	elog ""
-	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-	elog "then create a symlink to the init script from a link called"
-	elog "${PN}.foo - like so"
-	elog "   cd /etc/${PN}"
-	elog "   ${EDITOR##*/} suricata-foo.yaml"
-	elog "   cd /etc/init.d"
-	elog "   ln -s ${PN} ${PN}.foo"
-	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-	elog ""
-	elog "You can create as many ${PN}.foo* services as you wish."
-
-	if use logrotate; then
-		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
-	fi
-
-	if use debug; then
-		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-}
diff --git a/net-analyzer/suricata/suricata-3.2.ebuild b/net-analyzer/suricata/suricata-3.2.ebuild
deleted file mode 100644
index a8763bf9ff89..000000000000
--- a/net-analyzer/suricata/suricata-3.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.20
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	if use redis ; then
-		myeconfargs+=( $(use_enable redis hiredis) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	# avoid upstream configure script trying to add -march=native to CFLAGS
-	myeconfargs+=( --enable-gccmarch-native=no )
-
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
-	else
-		econf LIBS="${LIBS}" ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-
-	newinitd "${FILESDIR}/${P}-init" ${PN}
-	newconfd "${FILESDIR}/${P}-conf" ${PN}
-}
-
-pkg_postinst() {
-	elog "The ${PN} init script expects to find the path to the configuration"
-	elog "file as well as extra options in /etc/conf.d"
-	elog ""
-	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-	elog "then create a symlink to the init script from a link called"
-	elog "${PN}.foo - like so"
-	elog "   cd /etc/${PN}"
-	elog "   ${EDITOR##*/} suricata-foo.yaml"
-	elog "   cd /etc/init.d"
-	elog "   ln -s ${PN} ${PN}.foo"
-	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-	elog ""
-	elog "You can create as many ${PN}.foo* services as you wish."
-
-	if use debug; then
-	    elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
-	    elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-	fi
-}
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
new file mode 100644
index 000000000000..604eae665be7
--- /dev/null
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
+
+REQUIRED_USE="lua? ( !luajit )"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.20
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )
+	logrotate?      ( app-admin/logrotate )
+	sys-libs/libcap-ng
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	if use redis ; then
+		myeconfargs+=( $(use_enable redis hiredis) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	# avoid upstream configure script trying to add -march=native to CFLAGS
+	myeconfargs+=( --enable-gccmarch-native=no )
+
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
+	else
+		econf LIBS="${LIBS}" ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+
+	newinitd "${FILESDIR}/${P}-init" ${PN}
+	newconfd "${FILESDIR}/${P}-conf" ${PN}
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}-logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog "The ${PN} init script expects to find the path to the configuration"
+	elog "file as well as extra options in /etc/conf.d."
+	elog ""
+	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+	elog "then create a symlink to the init script from a link called"
+	elog "${PN}.foo - like so"
+	elog "   cd /etc/${PN}"
+	elog "   ${EDITOR##*/} suricata-foo.yaml"
+	elog "   cd /etc/init.d"
+	elog "   ln -s ${PN} ${PN}.foo"
+	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+	elog ""
+	elog "You can create as many ${PN}.foo* services as you wish."
+
+	if use logrotate; then
+		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
+	fi
+
+	if use debug; then
+		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a21022986728..1cebb9de73b5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,9 +7,9 @@ DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc576005
 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
-EBUILD wireshark-2.2.7.ebuild 6481 BLAKE2B 167c80ea9d3f41234ec9324d37ed3886776fac88863fd47e264eebc35014cc1c8da5c191da741d2fa2d8d7239eb8de649819c544deed346102627bc723e5ae29 SHA512 f7c45d28f9b5dd2a10b1575e4f9d071e435dcd34d6b7638ea2d8fc0ec3ca7c8ac4e8d73d23b2bc093c623b87e32b25ac36d80ca0d309daa32a18ebe5813529bb
-EBUILD wireshark-2.4.2.ebuild 7379 BLAKE2B 6b2e91ce48323c78b8182774e87140e8f1b6db3187074d11d671ee3597aae4e6ba1a487458e144ece58a69bb89e2d254a73f4809714c0b5038bd488ca0a982f1 SHA512 219ada160e01d499ff48ec40e161a64ffc0e709169fafccf41d6b428ee10eb00e34c0d2db8198f151c893a425c9781583eb56f6216f3162c2e87dec63d0d8fcb
-EBUILD wireshark-2.4.3.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
+EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
+EBUILD wireshark-2.4.2-r1.ebuild 7379 BLAKE2B 6fcdc1ff65fd095506bbb7b42849f397b8bb44bfd1a115654c1e9edc7e4532ee01faf937197603e3f260659cc3cb22433a2224d60b776bd3087f9b4a01903d9c SHA512 2609025b5816eac956f3e84caa017ee665cc5429e21522bbbfd07680a14b05f10ca2e5978f1396b0886dbf7a7deaa41907c19d48a17aa67a0b7939e1eacc489e
+EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
 EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718
 MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
diff --git a/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..06faecde42e4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.7-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha"
+IUSE="
+	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
deleted file mode 100644
index dcdf77d1de68..000000000000
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha"
-IUSE="
-	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libssh? ( >=net-libs/libssh-0.6 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		|| (
-			media-libs/speexdsp
-			<media-libs/speex-1.2.0
-		)
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		--disable-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_diag_control.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-2.4.2-r1.ebuild b/net-analyzer/wireshark/wireshark-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..fdcc3747b787
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.2-r1.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
deleted file mode 100644
index e886059b19aa..000000000000
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="
-	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
-	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
-	tfshark +tshark +udpdump zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libssh? ( >=net-libs/libssh-0.6 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		|| (
-			media-libs/speexdsp
-			<media-libs/speex-1.2.0
-		)
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
-		$(use_enable androiddump) \
-		$(use_enable capinfos) \
-		$(use_enable captype) \
-		$(use_enable ciscodump) \
-		$(use_enable dftest) \
-		$(use_enable dumpcap) \
-		$(use_enable editcap) \
-		$(use_enable mergecap) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable reordercap) \
-		$(use_enable sharkd) \
-		$(use_enable sshdump) \
-		$(use_enable text2pcap) \
-		$(use_enable tfshark) \
-		$(use_enable tshark) \
-		$(use_enable udpdump) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(use_with nghttp2) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with snappy) \
-		$(use_with spandsp) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		--disable-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_diag_control.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3-r1.ebuild
index e63e4d8f74f3..e63e4d8f74f3 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3-r1.ebuild
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9adcda5ee1c6..bd8a1ebe5388 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -23,61 +23,19 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server.service 281 BLAKE2B ca25d550875bc16ebc2cbe3193ec46072d288fa2d87e292949677c66bb7e3e4b9290274a43d88551bc320775fe0efc9fb8302a43147b3f7541c877726c40222e SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
-DIST zabbix-2.2.17.tar.gz 15494053 BLAKE2B c55ea5a2641838067308a4b93609c2e5b67e3872e51bce91c1d1e3b99fc2a64adfc2200b80544e6034a803af57307508e5d4e19c630a022dc980baeeacbfa004 SHA512 1abd60d05443cdb7b7ecdeca4d0b97414b249fe8be8c3ceaca137722af93e77101151bde59faaac4a3b61b8256bab68b0d1416192d8f72480703575794068a1f
-DIST zabbix-2.2.18.tar.gz 15495920 BLAKE2B bf3f452f3110841b4718fd5a7118063f7d143e493c89563c489186ffcf7981dd96a02094938a605403a19d668dfd13e42248850d54b0d945e350ac5aa092584a SHA512 3e24827b2739aefa12e3d189b856d836b85a1fa45928343c08620ce1ef16c664a8ad806d051f5cffed10837a326245dd5617034f83cdd00432b81eb05be40491
-DIST zabbix-2.2.19.tar.gz 15497840 BLAKE2B d56946296791948531555663e05135a3ad3576263873e83b4afac33e3069524559ef0a29fd435b8dfc11e72b60f27cfc7279caaf4802b8414203a112e3e4b0ba SHA512 f9a35093cd63fe433ae67a01d526e65387455cc0c82b33d4015ad428991289f711857e089c169fc46fad51697e3a07a2b310026789099e6f42fa88f2f573c560
-DIST zabbix-2.2.20.tar.gz 15503661 BLAKE2B 1303daf261694abba39e2ce86f532b09ddb422cf69a3db68c7f43055a891b03e0fa72b26890793867146e3f36b0b0b8ce7eb9faa7bcd217c02d9b8767dcce527 SHA512 ca63237c1eece870c2f54a1c35c5165062d0e875e9aa05ce9654657de59e52a131b2ddc1f94dbfb1e2d3f4e6f202e4d6424ba97de06fa008fc15ff859ab8e0c6
 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
-DIST zabbix-3.0.10.tar.gz 15573988 BLAKE2B 81ab75246bf4a05fa4ee5cf1d6ebdeafe2351fa8f59f979a87c930c06712cd4499f1ae55d8107d0d6ee4b6bb664310901eccea87a3cfb39bb48e8f2c4133c28e SHA512 cb5602a6fdb78f4f5e3b6b0193e707497e8c04a7558da8345e2e9130f3058be670a48d501b36bca87d10a1964188ae81eb6cd83a573499086ce1f2152dfa9936
-DIST zabbix-3.0.11.tar.gz 15642949 BLAKE2B e4fea226b551db0e84998d2a1bd3b1c81a799028dda91057257bf2a8ec1351fec2a8565ece8a9db6e502b541dfada65beb1dc7ca08c6307c9c082560b8a163e6 SHA512 880b69677833ed636c866fec731d84540a0269975c767bbcb834ca0bb22b8b881095b80b359e30e965282935650e6533d0e930bb6c21b2f6245d57a0e6e73ec6
-DIST zabbix-3.0.12.tar.gz 15647628 BLAKE2B 01a21b0c3779d97428dc355884bd1cd8e0b1ab299aa3ba9d7049db76a8b8ad8b3a87035b8f24b247db4afb205350bb8fae55e3ff9859df6198f427656dfbd283 SHA512 2aea3def2a5a656afde9728c18cc92a201a3d04203f163d3e67c3cb283bb23b94eb3c4d98b1905343080b0740b9670a2efd10f60229f26bb0c9b82c368b3fabd
-DIST zabbix-3.0.13.tar.gz 15648338 BLAKE2B cd0a6530d74c0d3b49d034643779ba9d23e85243c0d226d5792d06cc698b85cbc87643035454952be7496ef5a524101106e177851c88912f6519f0f76ddc264d SHA512 824fba8d4a31919af358d6085e366a4d758c7fd12486a40de79595dff628467d1a46fa84d0af287ab06ad22da7dc855c5cce1a44b5033b0981cac0ca02686acc
 DIST zabbix-3.0.14.tar.gz 15643983 BLAKE2B 129bcde3318c049932ad24d6b20fcd3cdf3a0a0f246aadb81663265eb31550fd5966745486e4e863236801d41e6cefec3bdc82eca024be94bc2437f44b2d81a1 SHA512 b024de610b86bd45fc0be655e8275daf53b1de813e13a1e78cfad149b1191a7f118862646f5ded43938bc489ff0b0f325de36d4b2c076ce6fe768ee4234eb944
-DIST zabbix-3.0.6.tar.gz 15513412 BLAKE2B f478c608f5196c98bf7e646d5125047fa6a89ae3339f5e937141d1f9e105ebbb294172e2bec971e046b7c7e5c05dba640655314a1cc8631e83d1b661fd137c2b SHA512 ccffc58f3555bea62011bad272e8a3085d1723d8cb200e00a3e657696104c3fd055b8b963a26d9c726ef45a5381c7f9625498e99b756a3dd97b147d8b7884d1f
-DIST zabbix-3.0.8.tar.gz 15514547 BLAKE2B 72c57038e762662605ff850666d6f7bcb417b9ec696fd623cb8d9918171a29d2bcc76d1603808580d9fa94394c4a25e90535eabc8f2e86265a819baaad48dd3c SHA512 9f5fec7f3888f34ad9659a5d34d5fc089efc86a5fcf78f8cabf6704fbf95fd52a8caaab6f4291cb76d15cc2d69c986c95346fbe4fdfdc407c5506f3b8946aa1a
-DIST zabbix-3.0.9.tar.gz 15516440 BLAKE2B 4689a1d5ec2fbf5085fceda2bdf2507e46105bcb9fff8e8da9158abd18bf487b56775637837f259e6eda533d4648104c8a856c9b3260f808efae0566e4080d63 SHA512 f34d0fde48e64dfb6bea152ab6c63eb28be66e3647cc781d430b56b13bc91ac9f194ac80d264b2e837f8fceb929e0ebeda0221bf8363eb0a66e53461088a4ef9
 DIST zabbix-3.2.10.tar.gz 16089723 BLAKE2B c69b8b00781198b8e4845f94e5a42e3910950954bd240703165be15630788f22e486a2ebbd941902eb92b06b42bc7923869f7b885fcc7248508d9e535ad23170 SHA512 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
-DIST zabbix-3.2.2.tar.gz 15915015 BLAKE2B 1cfac6134da5464a1c7e850a62c9cd012496df449f18303177bcc807f9adb4bb812d063a691e41a9b993363510e954f05f82db52ce2998a83d4d981951e75f7f SHA512 1f6cb6344d24ed91c49fa116d6862cfd78caab9cd3297329369dd2df5cf9c83fda67bc9faa1a59f2b605bfeda73a69a3e29653fca320eda1b67f4d0931bfdb9b
-DIST zabbix-3.2.3.tar.gz 15922416 BLAKE2B 2f25b47b85332736eeaf2593b0c3ca674d5f777056e34cb2c51d3205e2ff93c2beb7c7e21352e662791a5d26f98000c027f4d8ff5f1b9a4aabd9cf6aff935ca2 SHA512 5a704282765fa66d1aa53ae546d3a49a35050d6830a25a3a9ad64d73f8aff48b31e8d13f37d147c8d6244bb0f2dab21bceb5d022f1c3ffa726c10edc6e7bd1f6
-DIST zabbix-3.2.4.tar.gz 15924840 BLAKE2B 95ceba99a7766aeedb0c9acc988875bcbb48927cd5112c4583c3f67c7d12779cb3354f6564f64ee79973b6fc335f7dd4b05d2e663a9197d9e548000e9a1487e2 SHA512 62e532bcf6a5ab82b1f943e28d46d1e64782758a405680d2c1a54e9c1092a340a50987045acbbad2b57439e3c2640d8a11fe1a29a234764859befa6a7fd779d1
-DIST zabbix-3.2.5.tar.gz 15931390 BLAKE2B 2059a443e5d93b76006f440a5d0f6a20d6346df76b5bfb1bc3e7293c26762fe3fd2144f84cb76d2982d0212b780c99a1eafbcd498ba8f6a7b4f12a240287ab58 SHA512 313eda7d26d4fe443440ff20f355a51ee0a14d7dbce2aef7ce21f95543588eb69f111dc4b19e17024f82e629bcb8fdf5739dace6f05517aee744f4e68518ea37
-DIST zabbix-3.2.6.tar.gz 16008047 BLAKE2B a1230707d749873a55ac384814498bbf5e5eeba9ae7d7c7ddaa2471c17b119cbda6a4b3885745e31e9f4fed0b7d02f5ace76d624093d8ca9e244d52dabab806e SHA512 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844
-DIST zabbix-3.2.7.tar.gz 16016367 BLAKE2B 1e18c46af65c84555f97f3c51f95debb3eeef72709dcdbe514d5c3d10dd626c9229b2ecb61672d2bf3ee966e6b1767b2996ae998531087ff1770a90a253d5ba6 SHA512 f60c82829c076a7f8b9d2f0c7dc91f7b65594ac4dcfaa08b19a61b730d8d21afc161636f793416613a47220535334fb675bb105738b130677c729fc0e31cd3e3
-DIST zabbix-3.2.8.tar.gz 16092939 BLAKE2B 05fea67513d7e56b3f75e7fb5a0d39d3bc46789f7d12b46db623300fa5bf438ae0ec39ac2a9da8157e607c619a57471fd457f29b90de2b679fa73fd94844bc42 SHA512 ba4356218c41c7bdf580906d58589ffd71baa357b26ae12f414bfa47592d61a8dc4de900f4ab24377475d5ece3723526eb170d678ea6083f0dce5ca0c4e594da
 DIST zabbix-3.2.9.tar.gz 16098846 BLAKE2B a8d7ab803cab075889bbaee10806c1f35be42a91c78e1ee62e8fa458987865401d2fb677d4ebf42267e13acb38b8689bb6d232fbc3247ffba3f06f5e8c3cd692 SHA512 e8d82d4cadd8f6d5124de5d1b93f4768086c9543bfea676f321df86a76e001400330ea3650d3c295b25fa76858a205dac49caa97d61af30cc31fac544025d347
-DIST zabbix-3.4.1.tar.gz 17010519 BLAKE2B 54d2b576905d6b420fcbd8f31b5bd00d8f4c9c971368d792aa2d4fda3dd5e276454436fa815806cd9789caaedbc1de2a5573f0f6348b6f6c9978401da2e946eb SHA512 e3ce49cbbb6ada1d12fa80ff366b9e819b8d7b8c60474698457f8250682614af0d2e5de6c2f6a9e34ab10bb8fd01eac51d8365489606b6d0aefc103c5780ebce
-DIST zabbix-3.4.2.tar.gz 17113290 BLAKE2B d0458a035bf3dec7707eebc40752c31a9e85314c69242fa8b2c935310cbb806f9c449f6e78508fe9b9d36a89eab514edcb6b948991ca3f270b6ada016fefb8f7 SHA512 42feff59e1e1dd5d69a66cc857e9076b9a6f1410b5796a719cb660ea97ccd2544fe87f3cfabc27590cc53a321d24a7977daa320be1fdff31653b3650602dd385
-DIST zabbix-3.4.3.tar.gz 17130788 BLAKE2B 9f90242a4c86719e5a76e0057aec6f61481ae9fcd635034634251eb6ba317ab1c180dab7a88e33045429828cf392b57fdc5674d116a46f1a959c2652db77c9fd SHA512 338f4c367d906252ad762ffff60652f6f3d8f0027684e1562fbf26a4628002b72671dd6a2a3547c1681277a9cdef544d671b89edac886e96914a0b3850e639a8
-DIST zabbix-3.4.4.tar.gz 17132537 BLAKE2B c91a8248edc9d42c8a924fafa9a38903d8eb1c3f9c7f90dd188f615c0ca06859c8bfe902b3099d18fbd23bf19fb68313e71bf9cc20831debf2af523018aadc06 SHA512 2d9724ded1e3388c24ce9defbbe1ccd4804a925175ae76bc352a86332cfde3a692b4f447d6809a0d8394ffe51ad1a2fa3cff4459e850a6e8f7b1596811c441a2
 DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a SHA512 e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4
+DIST zabbix-3.4.6.tar.gz 17162881 BLAKE2B cf8a461f720b2f1d4910d8f512ac9949c56b9116fb9ddd1a26687b22da2c3938c4f10e6d0029bf348101e897fe6d352880964aaf5a0f55dd377fb6eec59a5006 SHA512 02300b103278f6f2867629a958a8bc5ea8e6cfe5743056b7e2f9d59afdeea04e29f51cae7c5d9847899c45c321a4c15cdaf66203c627fb1d85b3af619afe73ca
 EBUILD zabbix-2.2.16.ebuild 9411 BLAKE2B 695aa532dcd84bc0ae58d065e5fe3b95a717462d126927981e19011918a92630a6fb2626598b6022f6f7677c9c8e31bb0a9b2d684bdff9f1f490c9120ac7682e SHA512 522fdcebd45a24c517c7a74b9e80969d4573f63205440ca61c0252d6280529f83019864c3ae24f89493974c06be09f7fe9872fc56332b1d8b950de6782b8d95c
-EBUILD zabbix-2.2.17.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
-EBUILD zabbix-2.2.18.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
-EBUILD zabbix-2.2.19.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
-EBUILD zabbix-2.2.20.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
 EBUILD zabbix-2.2.21.ebuild 9413 BLAKE2B eb875afcae273c71166dd96e3e06e438326ee692997a30a0bb73e3f14ae4a4ec24080ff8d0c8539a23a4b021e6dac291b6ce9d225e75c94ef0725d2ca4059d22 SHA512 1127ec9fba4f124bd506faaf6dd9679441a5defc726655a05520af818a8f226634bca5e3b73bb721c83554992731179a3dcfad15d3767e784099c9d89cffda55
-EBUILD zabbix-3.0.10.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
-EBUILD zabbix-3.0.11.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
-EBUILD zabbix-3.0.12.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
-EBUILD zabbix-3.0.13.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.0.14.ebuild 9276 BLAKE2B cce198f1a7554d02976347c0bf80330fe564294de9566da18a8ad055e0ad73356abdd3f250fa53827298f2ba3abd8491e26d56d14e7e055f731e4eefbe45fdf9 SHA512 67895e8069a0c97517a3771d681a152aa333b876143a8d4c137d6997d19764e52b73bd45cbce58d1d1dbcc8793bbc987c749634cfb0c419c2505c4956166a623
-EBUILD zabbix-3.0.6.ebuild 9276 BLAKE2B ab51e9fc2e1a85ed145b01664230b57e8741b09812bb4a8690e1e332cdfe7ca2ef1bc229e971c102d6d3b5fe082e9cd9ad07649f4701710d2b7ee84138afc54e SHA512 4275953f472eb7a4e6fc0988f93eb1f3d1f133d15dd245120fe5e48a1f4a3276debf412667b248bead4045e9c067818f1a2aed03b9b14d18cc45515d8232881f
-EBUILD zabbix-3.0.8.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
-EBUILD zabbix-3.0.9.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.2.10.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
 EBUILD zabbix-3.2.11.ebuild 9240 BLAKE2B 1a9bccc597365723fa97e1ae0ed072bebbf10d716f59be126c21dfc5bf440b9117e56990132efeaeba18c37d2a9bd8cc40f98c095eda6d66ccbe5fae447124fd SHA512 63d1cd271fc8603b0a0252e8d896a5af9f7d72c6cf4648426d76c9d7a6751582875fb91ecaf433c4da13fb6f823f0ec13b8190fb56b4b98231207a3d3d0a6d7f
-EBUILD zabbix-3.2.2.ebuild 9240 BLAKE2B 67d9734f61b8b5d5566e88eb995ce79d0de0ec8cc3898331f322cb10871ebee9ef831c07c3619e0a8d2530686a298180b3543895c9078087bcfbe2305563ba70 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a
-EBUILD zabbix-3.2.3.ebuild 9240 BLAKE2B 67d9734f61b8b5d5566e88eb995ce79d0de0ec8cc3898331f322cb10871ebee9ef831c07c3619e0a8d2530686a298180b3543895c9078087bcfbe2305563ba70 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a
-EBUILD zabbix-3.2.4.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.2.5.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.2.6.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.2.7.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.2.8.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
 EBUILD zabbix-3.2.9.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
-EBUILD zabbix-3.4.1.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
-EBUILD zabbix-3.4.2.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
-EBUILD zabbix-3.4.3.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
-EBUILD zabbix-3.4.4.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
 EBUILD zabbix-3.4.5.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
+EBUILD zabbix-3.4.6.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.17.ebuild b/net-analyzer/zabbix/zabbix-2.2.17.ebuild
deleted file mode 100644
index 6a201569afd4..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.17.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.18.ebuild b/net-analyzer/zabbix/zabbix-2.2.18.ebuild
deleted file mode 100644
index 6a201569afd4..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.18.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.19.ebuild b/net-analyzer/zabbix/zabbix-2.2.19.ebuild
deleted file mode 100644
index 6a201569afd4..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.19.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.20.ebuild b/net-analyzer/zabbix/zabbix-2.2.20.ebuild
deleted file mode 100644
index 6a201569afd4..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.20.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.10.ebuild b/net-analyzer/zabbix/zabbix-3.0.10.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.10.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.11.ebuild b/net-analyzer/zabbix/zabbix-3.0.11.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.11.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.12.ebuild b/net-analyzer/zabbix/zabbix-3.0.12.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.12.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.13.ebuild b/net-analyzer/zabbix/zabbix-3.0.13.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.13.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.6.ebuild b/net-analyzer/zabbix/zabbix-3.0.6.ebuild
deleted file mode 100644
index c914ecab5213..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.6.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.8.ebuild b/net-analyzer/zabbix/zabbix-3.0.8.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.8.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.9.ebuild b/net-analyzer/zabbix/zabbix-3.0.9.ebuild
deleted file mode 100644
index 13448bdf670d..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.9.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.2.ebuild b/net-analyzer/zabbix/zabbix-3.2.2.ebuild
deleted file mode 100644
index 6a018fcf0c91..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.2.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.3.ebuild b/net-analyzer/zabbix/zabbix-3.2.3.ebuild
deleted file mode 100644
index 6a018fcf0c91..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.3.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.4.ebuild b/net-analyzer/zabbix/zabbix-3.2.4.ebuild
deleted file mode 100644
index 31176f59177a..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.4.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.5.ebuild b/net-analyzer/zabbix/zabbix-3.2.5.ebuild
deleted file mode 100644
index 31176f59177a..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.5.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.6.ebuild b/net-analyzer/zabbix/zabbix-3.2.6.ebuild
deleted file mode 100644
index 31176f59177a..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.6.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.7.ebuild b/net-analyzer/zabbix/zabbix-3.2.7.ebuild
deleted file mode 100644
index 31176f59177a..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.7.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.8.ebuild b/net-analyzer/zabbix/zabbix-3.2.8.ebuild
deleted file mode 100644
index 31176f59177a..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.8.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.1.ebuild b/net-analyzer/zabbix/zabbix-3.4.1.ebuild
deleted file mode 100644
index ae1d5666084c..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.2.ebuild b/net-analyzer/zabbix/zabbix-3.4.2.ebuild
deleted file mode 100644
index ae1d5666084c..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.2.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.3.ebuild b/net-analyzer/zabbix/zabbix-3.4.3.ebuild
deleted file mode 100644
index ae1d5666084c..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.3.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.4.ebuild b/net-analyzer/zabbix/zabbix-3.4.4.ebuild
deleted file mode 100644
index ae1d5666084c..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.4.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.6.ebuild b/net-analyzer/zabbix/zabbix-3.4.6.ebuild
new file mode 100644
index 000000000000..d51a6c625af6
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.6.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index a1651a9e5b56..45c739b6bfb9 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 15f3225f8fdb..94edd603bac8 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -3,5 +3,7 @@ AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e677
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
 AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49
 DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40bb2c9d100a55161f2edfc388efba991ff85ecd0f546bc2008cc0c50f2753cf93ece8e67dc3fc0fe13a8b935193ff1f68514b9 SHA512 9b92045b445032bde9d421499fdc0f6a08d602c501730c31a8d3974b21cc5c12c78abb024ed62a176c7aa7fe260fe1d19386aaf558e0fecfcd3a0ba7aa47499c
+DIST freeradius-server-3.0.16.tar.gz 4833927 BLAKE2B 48a991da9fec7594f1bd5bd9c713138755b746473b30d54bbbe2be06759375c1b1ba3925234ebf683a9686e5535a37122a38a708a058909c8cde22bd36641aeb SHA512 ec2fa1d28fb722d84327eed8670931f5a9220e724e0c12965f0a217ae63b0bc089ea1cfb4878420c1f2a7cf9e2abbb8d3be645c4e21170732c915f1f2953d84b
 EBUILD freeradius-3.0.15.ebuild 5931 BLAKE2B 31a7e822e7b08c263e8c859343cc858875af7e0a8a9a89cc14f9f7b75c9257caccf125d36e1103f00126522198f00a49ef66feef25322454b770e98beb671a09 SHA512 58f8e2b97d09f327d1f857326e86701d580b11369517fafdb8af3525c228a30701ccf2e547e0d513cd09a58feb2d679437cc2113f89c92ca9dede91e5f1ece58
+EBUILD freeradius-3.0.16.ebuild 5916 BLAKE2B 8f1133c8039e55fbae8a0c0a00857c281aabb1301cce31d01d02d00f5a3885e4e8a4535d278d8d5cebbe333de44fa0426ccc6d1fbdb3b11c6036eaf2f5380156 SHA512 7c058fd69a1d21121a8d316f74978e18af08bc4051e15b00ab8d996a2694f8d3bb16431c9947c06bf9d1e37f275ef5b60c6915532a354c87ae258acec1482506
 MISC metadata.xml 295 BLAKE2B 6b974fb9bc56043133ad2b9df88f5499018638e806eec1520b676ee15e181243735c2474f53fe312c05615c713734debb9ce18470c6533c77d1f450f3d7829d3 SHA512 4f6cbe1b6931f4d672943e6cbb8e82dc66af63245027d4c1b791697bc492f8a9cc1dfe937fc59fc19f03713293458b27fc721d9b9a6bf43d2938d09a91ca4fbc
diff --git a/net-dialup/freeradius/freeradius-3.0.16.ebuild b/net-dialup/freeradius/freeradius-3.0.16.ebuild
new file mode 100644
index 000000000000..abbb1380d9eb
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.16.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools pam python-single-r1 systemd user
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	postgres python readline sqlite ssl
+"
+RESTRICT="test firebird? ( bindist )"
+
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	sys-devel/libtool
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	firebird? ( dev-db/firebird )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl:0= )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+
+	python-single-r1_pkg_setup
+	export PYTHONBIN="${EPYTHON}"
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	use python || { rm -r src/modules/rlm_python || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_redis{,who} || die # requires redis
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	fowners -R root:radius /etc/raddb
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r4" radiusd
+
+	systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf
+	systemd_dounit "${FILESDIR}"/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs
+		./bootstrap
+
+		chown -R root:radius "${ROOT}"/etc/raddb/certs
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a3521f15637d..9c8f2e6fcf39 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,5 +5,5 @@ DIST ppp-2.4.7-patches-5.tar.xz 38680 BLAKE2B 56e4d3a5bc2486144791adf6ffb8a6cf07
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 EBUILD ppp-2.4.7-r3.ebuild 6801 BLAKE2B dbd9ede10dbfd48f8cadd08a49fbad552711438c936940fe55257181d718162822345fa397cfcf808dca2251b15ebe95aa8776bb94ba0d0a4cc4b2a278630188 SHA512 5b688e6be27e555e27021dd971aaaca3278fe5f301eadc8ac1dcee0d006b8afe587911ec913c8b51efaecb05d895e9f9a5225add0710def0692214f895bb7e48
-EBUILD ppp-2.4.7-r4.ebuild 6811 BLAKE2B 9775a52a7df42939294f82e9e490e822e35d5cea2be3d4bef9993a61558970a03620572ad1cb5efcedfff2a62a53537cf71dd7b633950561e5ea15a3c2411c49 SHA512 c49aa2614d0de78a4b9c90a7bc1ea1d279a09b090d9d53b1d0dfedc33de5faf31dbe22260a25d9e40de200821ed6f846a94a30eab76dba8bd2f4e79f49acfc69
+EBUILD ppp-2.4.7-r5.ebuild 6842 BLAKE2B f26e980aa3a1ca698058990c53864d78650a6804178f3e905a72dc1f7b366248f8ed65346c0720b5e5bf643cd7ccadb01d11fe998a12c74f18a5a25d8a7d2c8d SHA512 d91756f0ae964e1b82406f9234669dabae266b7e916841d71cd658f7413b6cf4ca978013a3b4bb7b45e46c1d31a43aaeba198e939dd0f7220a50c270ef2b1ca4
 MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r4.ebuild b/net-dialup/ppp/ppp-2.4.7-r4.ebuild
deleted file mode 100644
index 06151c548336..000000000000
--- a/net-dialup/ppp/ppp-2.4.7-r4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib pam toolchain-funcs
-
-PATCH_VER="5"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
-	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? (
-		net-misc/curl
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-PDEPEND="net-dialup/ppp-scripts"
-
-src_prepare() {
-	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/patch
-
-	if use atm ; then
-		einfo "Enabling PPPoATM support"
-		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
-			pppd/plugins/pppoatm/Makefile.linux || die
-	fi
-
-	if ! use activefilter ; then
-		einfo "Disabling active filter"
-		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
-	fi
-
-	if use pam ; then
-		einfo "Enabling PAM"
-		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
-	fi
-
-	if use ipv6 ; then
-		einfo "Enabling IPv6"
-		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
-	fi
-
-	einfo "Enabling CBCP"
-	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
-	if use dhcp ; then
-		einfo "Adding ppp-dhcp plugin files"
-		sed -i \
-			-e '/^SUBDIRS :=/s:$: dhcp:' \
-				pppd/plugins/Makefile.linux || die
-	fi
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8} || die
-
-	if use radius ; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" \
-				pppd/plugins/radius/etc/radiusclient.conf || die
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/* || die
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
-	fi
-
-	epatch_user # 549588
-}
-
-src_compile() {
-	tc-export AR CC
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
-
-	# build pppgetpass
-	cd contrib/pppgetpass || die
-	if use gtk ; then
-		emake -f Makefile.linux
-	else
-		emake pppgetpass.vt
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8
-		dosbin ${i}/${i}
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	emake -C pppd INSTROOT="${D}" install-devel
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example
-	newins etc.ppp/chap-secrets chap-secrets.example
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
-	# closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so
-	doins pppd/plugins/passprompt.so
-	doins pppd/plugins/passwordfd.so
-	doins pppd/plugins/winbind.so
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so
-	doins pppd/plugins/pppol2tp/openl2tp.so
-	doins pppd/plugins/pppol2tp/pppol2tp.so
-	if use atm ; then
-		doins pppd/plugins/pppoatm/pppoatm.so
-	fi
-	if use dhcp ; then
-		doins pppd/plugins/dhcp/dhcpc.so
-	fi
-	if use radius ; then
-		doins pppd/plugins/radius/rad{ius,attr,realms}.so
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/p{on,off,log}
-	doman scripts/pon.1
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/*
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/*
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-}
diff --git a/net-dialup/ppp/ppp-2.4.7-r5.ebuild b/net-dialup/ppp/ppp-2.4.7-r5.ebuild
new file mode 100644
index 000000000000..d4a55aff1e0d
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.7-r5.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info multilib pam toolchain-funcs
+
+PATCH_VER="5"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/"
+SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
+
+DEPEND="activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( virtual/pam )
+	gtk? ( x11-libs/gtk+:2 )
+	eap-tls? (
+		net-misc/curl
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+RDEPEND="${DEPEND}"
+PDEPEND="net-dialup/ppp-scripts"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	if ! use eap-tls ; then
+		rm "${WORKDIR}"/patch/8?_all_eaptls-* || die
+	fi
+	eapply "${WORKDIR}"/patch
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+		echo "+ipv6" >> etc.ppp/options || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+			-i pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8} || die
+
+	if use radius ; then
+		#set the right paths in radiusclient.conf
+		sed -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" \
+			-i pppd/plugins/radius/etc/radiusclient.conf || die
+		#set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/* || die
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+	fi
+
+	eapply_user #549588
+}
+
+src_compile() {
+	tc-export AR CC
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats ; do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+
+	pamd_mimic_system ppp auth account session
+
+	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+	# closing " for syntax coloring
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/ppp/radius
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	insinto /usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	# create *-secrets files if not exists
+	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index f3b047b2440d..4a0d00eded93 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 8ba6f1a9e554..bc967b7a6ffe 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,7 +1,7 @@
 AUX bind-tools-9.11.0_p5-dyndb-dlopen.patch 2932 BLAKE2B ec9b7d84b5f0ccb29ed8bdf6701adddf10c3d57298955c86f565b4d98f8031074f07e589edb9268c82726ebc7c19330aae8ea1ef7fd6a0272def963a7557cc68 SHA512 4aef9a107e15953ff81b8354e5e68756650e951ce4e12181d8ac200bd006f6d10c75f0af496a0755d883b921af2aa7984fbe15fdbd5ef8ec47ab6e185027f646
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4e8fd243b50ef0845be3008066fa0b45915f4e2db585d3f64896782e7bf94362235fc31c1f869169d92996cdaf081935a4047 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc
 DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f1932076c042a7096dc04f69b45da9df8b2d56ec0f1f0d0fb136e7f61a39b3cb20d1912075f3a4138cbdf47f859cf0a SHA512 bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96
-DIST bind-9.11.2.tar.gz 9782180 BLAKE2B e64a85126a0fd7c735a54ec2a3b9a260e3068571f16923365af636b7fdb686a378ec6782bfcfc0f25ec19792475a8bd24fdd34acf8b33456809ebc8b8eb562d0 SHA512 c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9
-EBUILD bind-tools-9.11.1_p3.ebuild 3176 BLAKE2B b8a831facd0fe67b5852bf690584146a769f6593bd536a148877aceb91b2ffa55cf63543cd1b47f69b4d329667fed3b338d8554e423836c341ad7fcfaca1c5b4 SHA512 b292d3062aa5c37800945446ee05b27d918551cde436dee09b92ac19f26e104cbbac1aaf2f486eca9f591fbea89f4f420e3a75c85fcfbaeb243203ca4accf138
-EBUILD bind-tools-9.11.2.ebuild 3109 BLAKE2B 7ff1c313a05aa842eb768ddad2e68a16524993fbffb48d7ee4da14a0107e1c0bf70cc375cf3419ac030528ec61ce57c056735866da0de17c5e30c7d70f3e6445 SHA512 c5f85c61ece7258929af980566958c7591e67703ea28ffa1b4c8d0bfcf30eace5a88180ceff8957cab23327829ea0eb4864d3d6f5092eb5238d084b713e66d5f
+DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
+EBUILD bind-tools-9.11.1_p3.ebuild 3188 BLAKE2B b312b7c843926fd4efc2c72faed439f3b83008db49d79a556741989361e5c7c2781b2cec328d117f19f9b60a85a10e305e7849d7117da4327bc159ed458ab48c SHA512 7915e28f89343b3aa70b7855bb241b336c6c5181cd1d1d552cd7e52540fe945bca3dcfaa1b0b7651c6c9e6dd0ce5fa42e52a2cb493e60ce948a14a682c57cbbd
+EBUILD bind-tools-9.11.2_p1.ebuild 3152 BLAKE2B 025d406f8402012210c9bfa698ba6bbe33c482becbfec5e73fa842a5d0228d3291a36a234601567088e2b7151ea5d557b364b832555820bb78f1082c87b8e800 SHA512 699991b8c2a93d3285bc9e1850e94707e4f483d47777fef31408e3470a096105383758676cc0842e10a06f5290f7b5e7f7632174828c8e34a55ae9d13f54ebc0
 MISC metadata.xml 513 BLAKE2B bfb78568f9c2b262000c297e06791ddee8455c24a29e0fc822e272ed7d1cc3b90cd106f4faf3eff1da3824aca8dbe359b7fb3f767d72a967464edc649728066e SHA512 5c817f1afce4f096d912de9f0cd82b92e2b97f86db24de5eae8aa1a877c78e1800582b4615666c43f139049e179dbc30134692d7039517f97cf53ba9a2dcbd4d
diff --git a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
index 95f347c1a18c..c89e19f2d774 100644
--- a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
@@ -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"
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.11.2.ebuild b/net-dns/bind-tools/bind-tools-9.11.2.ebuild
deleted file mode 100644
index a29d483558c5..000000000000
--- a/net-dns/bind-tools/bind-tools-9.11.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/idnkit )
-	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline:0= )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf \
-		--localstatedir=/var \
-		--without-python \
-		--without-libjson \
-		--without-zlib \
-		--without-lmdb \
-		--disable-openssl-version-check \
-		$(use_enable ipv6) \
-		$(use_with idn) \
-		$(usex idn --with-idnlib=-lidnkit '') \
-		$(use_enable seccomp) \
-		$(use_with ssl openssl) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		dohtml nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			dohtml dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
new file mode 100644
index 000000000000..c91aa87a3b6b
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="gost? ( !libressl ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/idnkit )
+	gssapi? ( virtual/krb5 )
+	readline? ( sys-libs/readline:0= )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+
+	mv configure.in configure.ac || die # configure.in is deprecated
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf \
+		--localstatedir=/var \
+		--without-python \
+		--without-libjson \
+		--without-zlib \
+		--without-lmdb \
+		--disable-openssl-version-check \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(usex idn --with-idnlib=-lidnkit '') \
+		$(use_enable seccomp) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_with readline) \
+		$(use_with gost) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		dohtml nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			dohtml dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7bb063d93260..8cc2cffd57cb 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,8 +9,8 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B 1b68b57b9aed1a5210464e9c47a4e0569f1932076c042a7096dc04f69b45da9df8b2d56ec0f1f0d0fb136e7f61a39b3cb20d1912075f3a4138cbdf47f859cf0a SHA512 bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96
-DIST bind-9.11.2.tar.gz 9782180 BLAKE2B e64a85126a0fd7c735a54ec2a3b9a260e3068571f16923365af636b7fdb686a378ec6782bfcfc0f25ec19792475a8bd24fdd34acf8b33456809ebc8b8eb562d0 SHA512 c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9
+DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.11.1_p3.ebuild 12500 BLAKE2B 2c1f6df537c01239c7f08421f76bb3a57b24215703c67833f86415c06cdc0ad8bc78bba68cc56fe3658456c4ade80e2a9a4f225f701f09764d4b20fb8515b029 SHA512 618cf728933b41521cf50c0e6c3d40f596d8fe4ca3c0f1725051e8f3d05800e9ff9e9b67c35719086c723e37efca22f0d42ff40eaab989557b14a9fd772d3d5d
-EBUILD bind-9.11.2.ebuild 12433 BLAKE2B 475ede7195a2178f901dbf5fef22f8156fc4638a03adc13b30790ddc55dc8a23be524bfe44ef8f99f69e4245cb78151e3f905ba93508be69d357531e964c4f6f SHA512 c6ed5b06fcb776aa012afa5e54815bf5c620faddf3566eb20650a8a9fdc3f508399afe9658d37ed3099e61b16e276cbe047af395a83815679eaa5109c718bd71
+EBUILD bind-9.11.2_p1.ebuild 12454 BLAKE2B 5fd095c8734fe27a490444bdbf36c4e697db0b65810a1ece110b9c1fa31b9f921bbd8abc719657523052cc1e3a13d6f21560b8dbba5e292f4124e9803d7e4468 SHA512 2257e8533427d6dd6e33c85a275ba10e564565c2f3d10e31d8c864748cad7ba5e819800ba8c9ebbae6e4082d37b8404a0a5a16dce4fa77dcb4ab79c9c5e02363
 MISC metadata.xml 1085 BLAKE2B 2de8c47ab09298e6d526d2b3d19fcdde83aa7975918acabca68243f690c90ed2a656073b047c7d032b53acad70a8a08b3d95c0e1ce143d28cb9ac2729b0b738e SHA512 a04b103703aaebc79738193b378f94df74461e918bf8fa7a99459e42b41b59a1b294113040cf5892d77b4c7c31b1448d9869b53cd2a9fb2f885ab1a1a6ba2f3b
diff --git a/net-dns/bind/bind-9.11.2.ebuild b/net-dns/bind/bind-9.11.2.ebuild
deleted file mode 100644
index 076b0aeaa543..000000000000
--- a/net-dns/bind/bind-9.11.2.ebuild
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-NSLINT_DIR="contrib/nslint-3.0a2/"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
-+threads urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	gost? ( !libressl ssl )
-	threads? ( caps )
-	dnstap? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
-		libressl? ( dev-libs/libressl )
-	)
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	seccomp? ( sys-libs/libseccomp )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	if use nslint; then
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
-	fi
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	use geoip && myconf="${myconf} --with-geoip"
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		--enable-full-report \
-		--without-readline \
-		$(use_enable caps linux-caps) \
-		$(use_enable filter-aaaa) \
-		$(use_enable fixed-rrset) \
-		$(use_enable ipv6) \
-		$(use_enable rpz rpz-nsdname) \
-		$(use_enable rpz rpz-nsip) \
-		$(use_enable seccomp) \
-		$(use_enable threads) \
-		$(use_with berkdb dlz-bdb) \
-		$(use_with dlz dlopen) \
-		$(use_with dlz dlz-filesystem) \
-		$(use_with dlz dlz-stub) \
-		$(use_with gost) \
-		$(use_with gssapi) \
-		$(use_with idn) \
-		$(use_with json libjson) \
-		$(use_with ldap dlz-ldap) \
-		$(use_with mysql dlz-mysql) \
-		$(use_with odbc dlz-odbc) \
-		$(use_with postgres dlz-postgres) \
-		$(use_with lmdb) \
-		$(use_with python) \
-		$(use_with ssl ecdsa) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with xml libxml2) \
-		$(use_with zlib) \
-		${myconf}
-
-	# $(use_enable static-libs static) \
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		econf
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use nslint; then
-		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		dobin nslint
-		doman nslint.8
-		cd "${S}"
-	fi
-
-	dodoc CHANGES README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc doc/misc/*
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dohtml -r doc/arm/*
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	if use gost; then
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
-	else
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${D}usr/sbin/dnssec-checkds"
-		python_replicate_script "${D}usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
-	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		if [ "$(get_libdir)" = "lib64" ]; then
-			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
-			ln -s lib64 ${CHROOT}/usr/lib
-		else
-			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
-		fi
-	fi
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
-
-	mknod ${CHROOT}/dev/null c 1 3
-	chmod 0666 ${CHROOT}/dev/null
-
-	mknod ${CHROOT}/dev/zero c 1 5
-	chmod 0666 ${CHROOT}/dev/zero
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9
-		chmod 0666 ${CHROOT}/dev/urandom
-	else
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 0666 ${CHROOT}/dev/random
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.11.2_p1.ebuild b/net-dns/bind/bind-9.11.2_p1.ebuild
new file mode 100644
index 000000000000..b5e999209ff2
--- /dev/null
+++ b/net-dns/bind/bind-9.11.2_p1.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+NSLINT_DIR="contrib/nslint-3.0a2/"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+#	sdb-ldap? (
+#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+#	)"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
++threads urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz !threads )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	gost? ( !libressl ssl )
+	threads? ( caps )
+	dnstap? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+		libressl? ( dev-libs/libressl )
+	)
+	mysql? ( >=virtual/mysql-4.0 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/idnkit )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	gssapi? ( virtual/krb5 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	seccomp? ( sys-libs/libseccomp )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+#	if use dlz; then
+#		# sdb-ldap patch as per  bug #160567
+#		# Upstream URL: http://bind9-ldap.bayour.com/
+#		# New patch take from bug 302735
+#		if use sdb-ldap; then
+#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+#		fi
+#	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	if use nslint; then
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
+	fi
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	use geoip && myconf="${myconf} --with-geoip"
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		--enable-full-report \
+		--without-readline \
+		$(use_enable caps linux-caps) \
+		$(use_enable filter-aaaa) \
+		$(use_enable fixed-rrset) \
+		$(use_enable ipv6) \
+		$(use_enable rpz rpz-nsdname) \
+		$(use_enable rpz rpz-nsip) \
+		$(use_enable seccomp) \
+		$(use_enable threads) \
+		$(use_with berkdb dlz-bdb) \
+		$(use_with dlz dlopen) \
+		$(use_with dlz dlz-filesystem) \
+		$(use_with dlz dlz-stub) \
+		$(use_with gost) \
+		$(use_with gssapi) \
+		$(use_with idn) \
+		$(use_with json libjson) \
+		$(use_with ldap dlz-ldap) \
+		$(use_with mysql dlz-mysql) \
+		$(use_with odbc dlz-odbc) \
+		$(use_with postgres dlz-postgres) \
+		$(use_with lmdb) \
+		$(use_with python) \
+		$(use_with ssl ecdsa) \
+		$(use_with ssl openssl "${EPREFIX}"/usr) \
+		$(use_with xml libxml2) \
+		$(use_with zlib) \
+		${myconf}
+
+	# $(use_enable static-libs static) \
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use nslint; then
+		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		dobin nslint
+		doman nslint.8
+		cd "${S}"
+	fi
+
+	dodoc CHANGES README
+
+	if use idn; then
+		dodoc contrib/idn/README.idnkit
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc doc/misc/*
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/*
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	if use gost; then
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+	else
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
+		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${D}usr/sbin/dnssec-checkds"
+		python_replicate_script "${D}usr/sbin/dnssec-coverage"
+	fi
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+	dosym /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_dotmpfilesd "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key
+		chmod 0640 /etc/bind/rndc.key
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
+	mkdir -m 0750 -p ${CHROOT}/etc/bind
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
+	# As of bind 9.8.0
+	if has_version net-dns/bind[gost]; then
+		if [ "$(get_libdir)" = "lib64" ]; then
+			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+			ln -s lib64 ${CHROOT}/usr/lib
+		else
+			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+		fi
+	fi
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
+
+	mknod ${CHROOT}/dev/null c 1 3
+	chmod 0666 ${CHROOT}/dev/null
+
+	mknod ${CHROOT}/dev/zero c 1 5
+	chmod 0666 ${CHROOT}/dev/zero
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9
+		chmod 0666 ${CHROOT}/dev/urandom
+	else
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 0666 ${CHROOT}/dev/random
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/
+		cp -a /var/bind ${CHROOT}/var/
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 6d7879328f39..22128565863f 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -4,12 +4,6 @@ AUX dnsmasq-init-r2 457 BLAKE2B 29b6844617774b6aa31c596839e4a29a85a24b322716385f
 AUX dnsmasq-init-r3 481 BLAKE2B 8ae305209c9005387da1e5a4b0f44370744e803a5a8ecc609c815998a63f9e586e361d1ac5159bb3701d3721d860ec0cbc8770e1971cefe808ffb18da6ab77a2 SHA512 23f292dbf479479ef9d23c0c23ccb2735995f97d37156df3a3818a69ce938ffc2ec7be636771f960038a2e876521f144cc2f2a6fd154de94ff309b50f0cbfa44
 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
-DIST dnsmasq-2.76.tar.xz 480796 BLAKE2B 09dd0e97bcd70fa2beecd80ed157692a217a8a5b71f5d9491c419bedc909b1dcee043c5aeaab333a44d1775785182658ac999c5d3c4f4bd48f1683122697e326 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a
-DIST dnsmasq-2.77.tar.xz 487244 BLAKE2B 4671dd47f87c4554b7d18413cff22cd5ed8338d2d97a8c2ecb57a92d0c7efa6a7fd9ff208b529f124cd8678e0d7f9328366a18039162647bed6076a05a882b1a SHA512 6ca98a71a8fdfd606e29c58b34dadfa63148c39f931570cca67a287e044d52c6ec2f8acbf5620ada3312e9db3a2fd63877188d829c070beaa730607e3309e768
 DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b
-EBUILD dnsmasq-2.76-r1.ebuild 4381 BLAKE2B 944decd725b60468fd5e24dfd03306e3c02caa859e16213b820283532309e25110e764d55da800d8430309cbb776802384dca2c5abbebe356a7001210ffd16b3 SHA512 b5751ff008cf1e81c54f984e6f9fb69af8d1d6598af1efd22dfffe56ea9e257932a1cdc7abd920fd4fe106620aed15038ef255748f506e8d317ff8fcb510a338
-EBUILD dnsmasq-2.76.ebuild 4260 BLAKE2B 16b873db306175a8e222b97d2d5692fea52143d88a12e977f9f13a83d6e932c6d2bd8846aa380b5fbe75bbcd9f81f09ac8895233f576c1484863d2af2cac8f0d SHA512 8e87b85b3a49f51357110d35f27d71b3f8a803f702d54e7cc21e45f430a674c2100de632a8a01a2b2cf27391955ee7ac0ab39dd61a1efaff9482cc2a7527f59f
-EBUILD dnsmasq-2.77-r1.ebuild 4527 BLAKE2B 427026b251afc91a374c6ebc836ec28e0889a3bd9aa913f1ce56885689b90000a7a66482cd1b859825b0233958ab5fecd0e464809e435e202d56f1db7f7ad447 SHA512 2a016687619f37c460737a2623d364d0a302ae7e3c062e6d6bc75c7ed130daeb4f8f02edf48c5c4cb626b8621c0404fde3c6ff2781c6fe9af88a6d49fa1e8b52
-EBUILD dnsmasq-2.77.ebuild 4495 BLAKE2B a767a8432ceb5232d70a368012d95729f7b154b98d86004ad1a0114ec8736fd0cdaac85fd52183ea9ef6df8d20c72d96976b0caf56dbd331a31ef9e9e5914169 SHA512 8bc8a3c2a222cb1715afbcb0d6ec38c8d61b2ff31c42351a39a4e0420605f1c7202850dde125cfaf47ccbd96d89440cb4afa99f6c60345ca1d67e77e358aa614
-EBUILD dnsmasq-2.78.ebuild 4519 BLAKE2B 5a77fab9bc9a9fa34bf725bbbf0ce3f762f092a203c43bdf24d86a01b98524dcbf97810cfb040d2f39c6651b670bc2114efe207e352a1b3f2177d07f69ed1a64 SHA512 e2b43fdf906f99765ef1503a724d31df154cb8d87e12aa17bb56b79e31e71874a0f0ee41ac1943b88f14d03dddd538f5c614b57afed73abf0c42fd788ba7b154
+EBUILD dnsmasq-2.78.ebuild 4507 BLAKE2B 15472be6911ec12f64e3f0ff322d15bde8c15857f1b01e1e9053ba476c832ae852049e558b05b54b74dde2fe60e34202835e90d68c7ec4381a5a4e268fd023d6 SHA512 b7db6c09a5a0febfa1bc0437e34b793cbd1c6f5aba8a96769e2c85fffa7aabd88eb3bb198ba5bf0263c3b113ac9f1ab608a36421ab64120e7f62fd6815ec1ca3
 MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
deleted file mode 100644
index 95de5790dac2..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	nls? (
-		sys-devel/gettext
-		net-dns/libidn
-	)
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? (
-			dev-libs/nettle[static-libs(+)]
-		)
-	)
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n inotify)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS}" \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in ${DM_LINGUAS}; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.76.ebuild b/net-dns/dnsmasq/dnsmasq-2.76.ebuild
deleted file mode 100644
index 77842fc8f919..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.76.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	nls? (
-		sys-devel/gettext
-		net-dns/libidn
-	)
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? (
-			dev-libs/nettle[static-libs(+)]
-		)
-	)
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n inotify)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS}" \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in ${DM_LINGUAS}; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
deleted file mode 100644
index 17fb4b4ab3a6..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
-IUSE+=" ipv6 lua nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? (
-		!libidn2? ( net-dns/libidn )
-		libidn2? ( >=net-dns/libidn2-2.0 )
-	)
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? ( dev-libs/nettle[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	libidn2? ( idn )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use libidn2 || use_have idn)"
-	COPTS+="$(use_have libidn2)"
-	COPTS+="$(use_have -n inotify)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have -n id id)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS}" \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.77.ebuild b/net-dns/dnsmasq/dnsmasq-2.77.ebuild
deleted file mode 100644
index 3c45c1db5b18..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.77.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
-IUSE+=" ipv6 lua nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? ( net-dns/libidn )
-	libidn2? ( >=net-dns/libidn2-2.0 )
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? ( dev-libs/nettle[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	libidn2? ( !idn )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have libidn2)"
-	COPTS+="$(use_have -n inotify)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have -n id id)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS}" \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
index ee66cd35d3b7..8ffbd1829a6f 100644
--- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
 IUSE+=" ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/hesiod/Manifest b/net-dns/hesiod/Manifest
index 7397c346292c..73f8b51eb8a4 100644
--- a/net-dns/hesiod/Manifest
+++ b/net-dns/hesiod/Manifest
@@ -1,4 +1,4 @@
 DIST hesiod-3.1.0-patches.tgz 2389 BLAKE2B 61e99b3139044d5e83edfa6811886fd62de14bf4cb7414715c4fa38bf227a81646ea36d5704bf7364ad3461cc139c072a600d3c8c9d90d23441b2e9e889eff3a SHA512 e2cc00aa38069f52fe9e38d34c42c8edae8e8e0a25702d3cd4b4a5a4fa96e098c7f62f13be69b8f91b92e1c5d18fc8eaedcd19d1946ce3319554d34e94f7b84c
 DIST hesiod-3.1.0.tar.gz 224294 BLAKE2B 969f6771340327356637a77420b99a043f808c7021fa93e34fad04ea6d528c14863e9805ea770acb6d2dadf7f04af4cc7a125f1c0952a7bfecda309bdaec63ac SHA512 a224702378e950216633b0a54e6299bb04b473a65455eb302a3b8435e9d718ad21aa2de03d2865ca2ef96a1d6aa240b2b5c957f065755a0d1c2ad627385f3f9b
-EBUILD hesiod-3.1.0.ebuild 1006 BLAKE2B de2bf55f739f1d4259565bd513964088c1fd5214a6bda9da10280177dd37409163eb58b4bdaef02709f07c171e8ef651f5ed451ff6ba30ea03f3525f904c91cd SHA512 ce9959d7d4c976dba4da28ee3130cd3d7c8ca9beaa9c5a41d33ab71ce03478028cebfd98ea85aeb219041a88e5b6b19ebb655e20dc7ab84e3a4faa6fad90ceb8
+EBUILD hesiod-3.1.0.ebuild 994 BLAKE2B 8e43113681a9c4d3212c673c4e5f49ca3f046a1fe329c39db82117f0b36965cbef3bacbc1b4f6c58f412c6503dd9854b263432cd9090db25f7fcc01d14ca87c9 SHA512 f3784537081bf7409e71372b424aa841bc264cf40f701b2850218cdb53e5c30b13dabd22b4db481dab89b336dfb9b24e2ac2316cd9eafc0a95589afc16d57cf3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/hesiod/hesiod-3.1.0.ebuild b/net-dns/hesiod/hesiod-3.1.0.ebuild
index 25f80626772c..f56fd27b9498 100644
--- a/net-dns/hesiod/hesiod-3.1.0.ebuild
+++ b/net-dns/hesiod/hesiod-3.1.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="2"
@@ -11,7 +11,7 @@ SRC_URI="ftp://athena-dist.mit.edu/pub/ATHENA/${PN}/${P}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 933eca8681d9..40abe73464bf 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,6 +1,3 @@
-DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7eb3f1d2cdc4ff51c98e6b78f93fab96d19d665f2dc8592f80d92ec5d3dd16da9760124f0604eb48c09ffd201 SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
 EBUILD ldns-utils-1.7.0-r1.ebuild 1192 BLAKE2B 6a8d02048c735ca3853cbd5456202e10802652b619e63c31b549b6fc5ec34d7146415ffd3a615620f4b8f9a4df60fd4a5d0e40940af74d7fb93b39a48b955784 SHA512 f9eb08a53bb37e225312ee5f4c13c036f7522a77bdfdc368d8bc99165048ab9ee00dce4d3a4b263b69e2f52d5f88caa6eeb683e348bd3a1d2a2c496d13b8a75a
-EBUILD ldns-utils-1.7.0.ebuild 1138 BLAKE2B 7a7d609335d3ee0e6f7591953a3a4217db3685268a9243d89fbdb67014ed5b906522745bad4ed0ab1fc3a36be6e48519991b92377b78578f4f1fbed6cb50ca60 SHA512 7969ea780081157652a9e3c601f19b34b1aef9565c53fdab51e5d4a8f55fc7b29186d5c2a47eb3eb0cf54f2785a1d2cf0ae52b57d83962ecb6b564c588992363
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.17.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.17.ebuild
deleted file mode 100644
index 0bee257bbba9..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.17.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dane ecdsa examples gost ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?,ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl)
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(use_enable dane) \
-			$(use_enable ecdsa) \
-			$(use_enable gost) \
-			$(use_enable ssl sha2) \
-			$(use_with ssl)
-	fi
-}
-
-src_compile() {
-	emake -C drill
-	if use examples; then
-		emake -C examples
-	fi
-}
-
-src_install() {
-	cd "${S}"/drill
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog.22-nov-2005 README REGRESSIONS
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install
-		newdoc README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
deleted file mode 100644
index ba579b15a5cc..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="+dane ecdsa examples gost ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?,ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl)
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(use_enable dane) \
-			$(use_enable ecdsa) \
-			$(use_enable gost) \
-			$(use_enable ssl sha2) \
-			$(use_with ssl)
-	fi
-}
-
-src_compile() {
-	emake -C drill
-	if use examples; then
-		emake -C examples
-	fi
-}
-
-src_install() {
-	cd "${S}"/drill
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog.22-nov-2005 README REGRESSIONS
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install
-		newdoc README README.examples
-	fi
-}
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 79294f0e34da..8f976d8043c3 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -2,7 +2,7 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d
 AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e423008d928991b23c5a05a8de794eea18f236aa8f4b53b7945f4340aa3b2f4f7aa9c63d5dadaf3bc0513ee3f5e27ecb9040a7a SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb
 AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
-EBUILD libidn-1.33-r1.ebuild 2985 BLAKE2B 55e2923d045ba06bb02ac9a56cbe3c05f8828cc088062fb90a809d9522612a27714314bc7f6151a2812ba4bb43c08113f6f24401863888c68e74814ef9d532c5 SHA512 e63496fa71b9ad23a725f0be9dbbf864970a506fc92033efa178c92d515cf21785ebeccf33065b7c096e052a1f0c60c4c9d5dd98586b0ed5ae0f17d7808daa14
-EBUILD libidn-1.33-r2.ebuild 3033 BLAKE2B 5dcb80c32820b2e70ec0e49a4bcbae937024152a63857defbfe72eeeb6bd9b14fafd1b9ac2f564faf4062073800d240e1bd02f4933d77bc1a48a3819652bb18d SHA512 74f704b27b17b215de6908cfd6b1c853892a856010200052bfcd74f0969d9c652e3306fca092890f4de0ac8dc03ea8f19c5fd0e0f44742544b5e29cc32be078c
-EBUILD libidn-1.33.ebuild 2805 BLAKE2B 6a59cccf9c5152341e304217d6a5e162158b0b8c3fcc8f60b74f1aebf1c76493d1542f67eb278ddfb0db5c942bee992b7706e694179318685f62ae065ea54f54 SHA512 863f325f2ed868a6b78d542fe584538d67ff6bbe99b1e181416b43c919cfdfc417bd92dc424657d0a632c838735826be7bbfdc82632e04cdeaf5e3bbd4351a15
+EBUILD libidn-1.33-r1.ebuild 2973 BLAKE2B c34576f6c0104090b1c2a1602028d60ef6199973e13209b28e434fc69fa2a47980ba2132a2ab0265b0a96f40044ee4b0a9d3fb577534485ab8c9ff7ee1dc5f03 SHA512 b77bb63c075538a59ccdbefd9ccdbd4059ada9efc899482d9b793a10f81ef6f582f9aada266cc4537f3c403b0b3dcacd50f7896a271a283f0c90b3729e0bc9ef
+EBUILD libidn-1.33-r2.ebuild 3020 BLAKE2B 7132cac94f93da3b750022983e41448be7b309c41ae768d596d5568bea452d43d415c20a11061c7e711cf6966f6cf75770894252649dd9b51c4b1a7e4b58f88e SHA512 b6de4cd4ad233aa34117473687ce0fb2a8858ccaf900a22709895fae2c0ee12710950edd962b0acf52a2ca04857e7b16d4437f09bc90c6bb9ac93440faac25d0
+EBUILD libidn-1.33.ebuild 2793 BLAKE2B 0d451ba20b772d3343503a122c92a5de5f98a67e3e95246adb2220f03ec9a96b887704c0bfd40fab0eecec3839f43705e00c19949fe7760a187b4d0a49b7b71f SHA512 56ea6fce689533f562410a2a3e15328873c76c6b1e231a3272162ea7c786369fec86e0332785d0170b81632126c75c2adbf880da7e9ee9152eb4548eb3b0ca5d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r1.ebuild b/net-dns/libidn/libidn-1.33-r1.ebuild
index 26af233dcd71..cfefa3741eee 100644
--- a/net-dns/libidn/libidn-1.33-r1.ebuild
+++ b/net-dns/libidn/libidn-1.33-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 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index 5e498c6299e0..fbb9668bd66c 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-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 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild
index b494bad73965..9d732304a1f0 100644
--- a/net-dns/libidn/libidn-1.33.ebuild
+++ b/net-dns/libidn/libidn-1.33.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="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 03cf0178ebe2..3539d428374f 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,6 @@
 AUX 3.8.1-restore-newline.patch 508 BLAKE2B 932f891ed7372ba56058a364d0e8bab41972c82b43f7b4bcc61c68f5204f8121bc79e8641325cd6ffa9407b473d36097eefa81afaeaaa3c415feea17053cbb47 SHA512 ca2c79192f808e16d0aa876fbb35eb28330a86cc4f2bd7ef618bef16f623c127327b1ce16369aadfb73413b103aa5790d7b9e7f44a9c0b26131b17cab22c0552
 DIST openresolv-3.8.1.tar.xz 18396 BLAKE2B bddfb919728cb49baba6df6226abe2f893d36770643e735b41717dfd98edf17255d8b293f01b335d6ae31c7075884ea65aa150ebac9d34f252be724aa0a695ec SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.8.1.ebuild 1138 BLAKE2B 5fa12be67ceb812f7cdd4671e392139dbb66f9fd335f9e29c479ba7cfa6e0bf96670680b1af5b186f795fbefc8a43befa7309b2878c01604059daa2b4804b14b SHA512 e372fd7ddbf638112830b475e0f37393d7f3b7834622296adce85ccfdd636073c803810ffd426fbd014cde789ee5572c38f066be3a4f33b1a31eb5967b1ad0e2
-EBUILD openresolv-3.9.0.ebuild 1091 BLAKE2B f32dc9dd4c165e094ce432aa1dbe80e754ab01edcd08bc6244ab37b8cfcde67830af9bda02b7920316173f628dda5bd5c776a8ce71dc33f395b430e9507387ec SHA512 75281841e57d410abd004adfab31333ac5352f5ce3ae25eef8dda7f2ae8f92da71c7785f9a86171ae03c0a7876e4fda0d0a5629854f5945df45ebec9417e3b14
+EBUILD openresolv-3.8.1.ebuild 1126 BLAKE2B cd61e274bc7cc1075699e41c12513779d10a835d744efa9a22a511abd2da7258d9546945c0f9f6789f9a510ad72fa277813b7783b4b054755b0550055f2cda34 SHA512 8f59bf9989aa71b959f61cf2491d8623bd641f9da1189e031b5b07e4c892bd3d7c5dbee8c165b2bfd01815ee987c7e03d9e6443a1510af80afe5601ed9760e2e
+EBUILD openresolv-3.9.0.ebuild 1079 BLAKE2B 759d5131a801c406e79c30273afeb8d3373e1ca15c4f9e49fa169115d31fc6a71061a2fd106adbcafc4557565db736285f6c715fcf8ad258e8d4dc3a1fe017f3 SHA512 bed3c2a8ed2440b6666a960457d16e2e575d42c8e22c89c751914f257e76f0802867aea4362b9b874f771a2561559df540f11939a7e9abb7768c93355500775a
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.8.1.ebuild b/net-dns/openresolv/openresolv-3.8.1.ebuild
index 0a45484ffa59..d5f96351f52d 100644
--- a/net-dns/openresolv/openresolv-3.8.1.ebuild
+++ b/net-dns/openresolv/openresolv-3.8.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
@@ -9,7 +9,7 @@ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 1d4d055cae34..881fc5125a91 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.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
@@ -9,7 +9,7 @@ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 00bfc3fde441..881508acec60 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,6 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
-DIST pdns-recursor-4.1.0.tar.bz2 1222751 BLAKE2B b2b5a7dee227b28eb3a1451a4d07cb1804e039e6b405c332f30fbb8df39f395906607f3c074b2469b01885b702d12e86e4ffd6114811404134c16956905c744f SHA512 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c
+DIST pdns-recursor-4.1.1.tar.bz2 1224544 BLAKE2B 886353fabed5795696e84c6f70872577ff3832e449c5b88c81fec007777eb39b764091b92c9c8b5dfc7aa0af2fdb305a3ec3578ccaff469e9c305903bcea8089 SHA512 a8561bf0688752f30c4c997930f13d55c506b2a2113d22b074443757a51cde9be182ef948e61eb8c4d639bbf8679d8a4139aafb6983f483b3a917e049fa64e45
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
-EBUILD pdns-recursor-4.1.0.ebuild 1826 BLAKE2B 07f2d1113ff90503c702e1306f0d9ef87573a04b86f4eeb94dd51be8da29158e4cab390f1a57cc2066760c621e1c87413c0be265c9cd5a94443cce100227c654 SHA512 ab9825a07f4057d8f1a33a5162d0a76f01b55383e62647a9756ea1796405d5f92ad5cc254e2ef3c0ce849cf06a5ffa83519cce8af25ad7874c5c7b510d0929b6
+EBUILD pdns-recursor-4.1.1.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 MISC metadata.xml 1076 BLAKE2B 4f68267d5dfcf3cff38f306f440ed2e9a7f5193c14c1029bcfcbbfca4f8f310c94969001c781e1b78a14cec2a6e313e44d82bebbd9694fe46f97759372e63711 SHA512 374be5aa98c4bab340d8d63c859ab08a392e926fbb4d55e1f5a2967d41c401d13d5e8d5997c0790c3b8f96662b56e4492343248d7c8e0a067dc7eaf3f4b56e95
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
deleted file mode 100644
index 346091e0ec16..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.1.ebuild
new file mode 100644
index 000000000000..7e2d4e9bfdb5
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.1.ebuild
@@ -0,0 +1,80 @@
+# 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 versionator
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		version_compare ${old} 4.0.0-r1
+		[[ $? -eq 1 ]] || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 3b15e126292c..cd5e2a6df3cd 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -13,10 +13,12 @@ DIST unbound-1.6.3.tar.gz 5381240 BLAKE2B eb10c20a7e7ddc106f5ec9552e516b329bdf74
 DIST unbound-1.6.4.tar.gz 5477897 BLAKE2B b78c80e9a18649f6a12da820f15915f0508f4f01d93aa316fa413452545c93fd80a82f93f265291787210f90b888704671f840e12b1b13852c3a2aa017b4cf50 SHA512 1abf50552c97b304884f07372f9fb05f9f30354647cf5299192deac81fa28a41d89d84ee092baef644a6069d0f545d36e7e814c9b8f83f21a7a53572d9a91907
 DIST unbound-1.6.6.tar.gz 5460482 BLAKE2B af0d9ca0e5eeaebc3a2023dc7179a3bc80952d0e4c75ae92035ace648952f0ec1d0760aeb9d5104dda1abea2498a15f668b610c39ad79e86774c376647c94613 SHA512 910fd0956b8828d3db0511a85bf6ab6c4c3982f17c70ccb7123d1de1650d24c2906bc29ac4ea83fd7d95d8af29e2cbc88df666f365e51296f552292ef9753016
 DIST unbound-1.6.7.tar.gz 5466931 BLAKE2B 57a051d5ac6d7fbc3d51613305651987670d0f50fbebf661505b42b6c8980543b34b52a4f9ca9e6ee4dbad59d9acf547b78cf35a691d0c00884da979ae22d8c4 SHA512 6e3d1a057081252183343d0d1b8ace742ab15e8f5244e61287340f49289d7449bed93fbfdaa3194c0e99ca23948f4b33038f75af5c5b26c938004d06fc3031e0
+DIST unbound-1.6.8.tar.gz 5467536 BLAKE2B 06caffbd905c339b3d0667382114bb3e5d5da90988402c8f488f789f9bf6ab87377e6a26aa083a7e9ba3d023f37d3eeba1e069adf8a8a266b23fb8361aeb6e26 SHA512 653d88d5dbc8cf25f7261e4a9869b6591843c7ff27b5d63f979a94505daafbbb61e05d46bedd2d01230355d5f08dd9fe14ed04c5c7340f3f27581b61ad6edfa3
 EBUILD unbound-1.5.1-r2.ebuild 3427 BLAKE2B 193c35ecb00ae6303e6ab97852f79dffdf2bef64ce0b7c6e961370eb87d9506569e8aadfa6386624ce121162380b24fde713b36865b18bf228aacb3651defde8 SHA512 d3630f81fd44b40f5deb155473dc5835cc68e444be26afd0207fa734f285b566694b92dc073185cb24c9588a0ca5cb9ebf9c9268c2725c24a6c61d7ca73d1bcf
 EBUILD unbound-1.5.10.ebuild 3465 BLAKE2B 765d3f8f6a987a22195a235e515fb4fd29005a8e2b8d2eeadc9328993ba41d95655db10e1f8426b449311b08516b8dbd4abae382bf6d9b2f3608716c7f57f30c SHA512 28fb9da2c9bf08fbdd8e440c7c0f61da5ef25f7ca179b18e7c189e5c23f70dea295e1dd9b0fa289c75f5a4ee24ed9e1b3248f62fb0dc05d78068f22c00d100a7
 EBUILD unbound-1.6.3.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b69cb66cf30e73dba3c51e0b21df130da9fdcd35d458afff547960a27c690d13075c43a950d986b8f16e0ea88f5 SHA512 d7d1035bab213ff950883ecac04f7c3ff972b6f83465a2c09afba1339ef1e74e560cb9cc818800d02a79462d2b857832596bc80b2088b5db9083f82a9032a5a6
 EBUILD unbound-1.6.4.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b69cb66cf30e73dba3c51e0b21df130da9fdcd35d458afff547960a27c690d13075c43a950d986b8f16e0ea88f5 SHA512 d7d1035bab213ff950883ecac04f7c3ff972b6f83465a2c09afba1339ef1e74e560cb9cc818800d02a79462d2b857832596bc80b2088b5db9083f82a9032a5a6
 EBUILD unbound-1.6.6.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
 EBUILD unbound-1.6.7.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
+EBUILD unbound-1.6.8.ebuild 3676 BLAKE2B 568771ffa57f6ec9711aafe2ba7e808772d898a3476a5d11c0aaeb40538e37a5a7d3a4b091a206b5828605162a59f33dfe50b6c0b4840794f655090c1a1bb641 SHA512 403febbc597a6beccce1eb4394df04dcbbec1c65cd1b8e4c444e53ace5fd6b3cf87dfaa1cf69c11203e3cdcb7c99de7d43f36a202188e4e6c58b4f8650d109ae
 MISC metadata.xml 1008 BLAKE2B 1852e514f97f9305848144ae0f9aaf8fb49546cd9afcd873ab67dcefee0503d5047809dc8c650006ccdb236c9ba9ff02cc5ecf726d61c25e17167409f91d3fb1 SHA512 f6654d6d254a4d51a8c454c542f1fbbff16bfeaa1cb681f110b9ae99a4231cdb7c073a5d42faba71168079330f9e01781df7a5b3e1bd70d771c874a5bbe9742a
diff --git a/net-dns/unbound/unbound-1.6.8.ebuild b/net-dns/unbound/unbound-1.6.8.ebuild
new file mode 100644
index 000000000000..47b29fd1f46c
--- /dev/null
+++ b/net-dns/unbound/unbound-1.6.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid below error messages, set 'trust-anchor-file' to same value in
+	# 'auto-trust-anchor-file'.
+	# [23109:0] error: Could not open autotrust file for writing,
+	# /etc/dnssec/root-anchors.txt: Permission denied
+	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound.initd unbound
+	newconfd "${FILESDIR}"/unbound.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index d297ec66f8a0..749d174377ab 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 5fd110c241fb..823090a9dc00 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,3 +1,3 @@
 DIST pgl-2.3.1.tar.gz 605656 BLAKE2B 1fbce4b3c7d116915b303093ef18f434c8bb9dd23e1065d42dc573face9274c68321477529b536868eca9c03f23f3aad67f371960d7e547ae8c07fdee09f6d10 SHA512 f23d44ad6448814ba0a2c90292ff4a933d31fed942886d63c50bb62fb56e1af70df72e09070ad3cd27c878f322576326040c330fbdbda63128ad304375b02a1e
-EBUILD pglinux-2.3.1.ebuild 2364 BLAKE2B 926b2509fe15d746efd2cf586768b7f28377d7d5302010a2e0d5768778877f28c37e5dda62567917408d38841afff856803254e3309751d298d05bca22272f1a SHA512 5cec196b62f8654d4da1d03732ecbb63aa263118277c998c127b7f69a4e594d432a93e6e04c9bf51af2af0202b451167c6ee583ec6d17cd51eccbc93d053511d
+EBUILD pglinux-2.3.1.ebuild 2308 BLAKE2B 44ae501c906b12eff81c9eaed9ea349dd6f9a26994abf20f8726359d1bedc12bb592e8572f9a4691d6d50c380a8865b69cff4edd62982b2126448d790f48117d SHA512 1dcbe221e7e000b0611682aa9a08ef14f06bc2bbcbcbc5d41773899cb944c04b6bc7b13b1f386fe9189132ea308b7227e9552c890fdb2e1c1198860cabd92ff1
 MISC metadata.xml 882 BLAKE2B 2b560a49bdffc79a914f1a2227187090f60305a123f8084b66d18ecdac72866860a4faebd58c71a78bcf45bb3f1d426afdf845beef2a87afd699c149ec33a2e2 SHA512 34297f9b8e083798fedc61991300cb4d9a2eb5fff8065656590a51d732e2d4e187f05db08b336ace3b24982362e1aa3b0b18b6eebc8ddf9a72e81f27be424672
diff --git a/net-firewall/pglinux/pglinux-2.3.1.ebuild b/net-firewall/pglinux/pglinux-2.3.1.ebuild
index e524edf5a018..30e9caebccae 100644
--- a/net-firewall/pglinux/pglinux-2.3.1.ebuild
+++ b/net-firewall/pglinux/pglinux-2.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils gnome2-utils linux-info systemd
 
 MY_P="pgl-${PV}"
+inherit eutils gnome2-utils linux-info systemd
 
 DESCRIPTION="Privacy oriented firewall application"
 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4
-		|| ( kde-plasma/kde-cli-tools[kdesu] kde-apps/kdesu x11-misc/ktsuss )
+		|| ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss )
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -84,10 +84,6 @@ src_install() {
 	prune_libtool_files --modules
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	elog "optional dependencies:"
 	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 56b8c37d40ad..f014330da0a5 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 17d902b69549..41fd21513198 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -7,6 +7,7 @@ AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd
 AUX samba-4.2.7-pam.patch 1273 BLAKE2B 41a17b701a592500f3b85be29fd134048ebd9403c510c339d1094f915c5eeae729972c7231169fa890dfde802797276a9c419eb17ed7a23e5ad1aaa46cdfd8ec SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
+AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5
 AUX samba-4.7.4-no_ads.patch 603 BLAKE2B 1da70c2fd2856f6270404f5b42bd6687507977234f2951d152e20ed99fcc76b7e0d67cc7f7abec89e4d7c50b2982f3abf770dde2694bf17213bc1d5bae7f19b7 SHA512 0310f45f4e060ffcd6ab17edfaba84a81f54147af6256f1d59c5b7314d4d638be35e0db79a6723a9adf9b54c87fc51af62b528ab52e3bcaa6102d1970715722e
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
@@ -25,15 +26,15 @@ DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.3.tar.gz 16845436 BLAKE2B d38f58a944d19f4475ab636f09a4f9b97b92897b1d8d041efc07e1d2724d07fafa3686b5d38b847b896c4f024f5cf7330eaca4b6eb4cd34da73a32fe94e8c69e SHA512 3fd9d5f208201e3137c5966e10878ba2fc00fa80b3468e8b402e08f941b5508edd7181720033aaa25fcff0ee0ae5438619423d41a9b9b3d14dc3743fbe3f902f
 DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
-DIST samba-4.8.0rc1.tar.gz 17624979 BLAKE2B 9f2cf10aadf0c45c0489f59fd9dab6d0e9ce6bbfda8e3ddd4df712db5e805237761e6838f49738fb3abf7f68eec467f92a28e65dde13300ee90bc097b7f34db1 SHA512 6e3680cc2a472fc4acaf1c37bcd3a03b097bfc7f117e8ab79431c90d2f0c4159fcffa95f65dc5f3392366e4b0b6137991d5fe03ef4db839e130e93d1c1f73a61
+DIST samba-4.8.0rc2.tar.gz 17619396 BLAKE2B 3fc9a7f696df012ba1e1c9d131d650aaec27296b50a2a56d7941b066d164252b34bf9dad3119bb4f99b5a09eb11501a39bfb23d64e33c72e245fa825b418b573 SHA512 215c093b2144a858e646a075eeabfdd90790c7e6eeaed39cede98b254a68fc74dd93e3be314659d60437cbcdfc604b74f3b7faa75088bcf858e23a4a34dfb105
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
 EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e
-EBUILD samba-4.5.15.ebuild 7872 BLAKE2B faa2930eeba57e377f9141d7673cb8ae5af5a04565004239c530347558dc308797e8e2e2a95ff95e18c6bd9a64514360b002e0d3c6a2d3d00bcbd53532ad83c3 SHA512 911eca475b841445608c70acb325005d0490993810df4c00209231032cee32a41992778cd4a5fc7e03f5f57463c1b4a0beffcca53b6c11ed9fcd265aea276964
+EBUILD samba-4.5.15.ebuild 8078 BLAKE2B 2d2dadac94370b98430bc608b14b2e34b9d44c55662fec3672f80064afdd8dc1cfb81920fc2bca83eaf23b139ce5f3f1972e0508ea075ca5f7b65d7aa5ee9fb5 SHA512 3e03a2351511f07c3fb92172230ae943293bb420b21cfa3eb5c4fae95fc89978a7e809e8cafda9871e2f590dcc97316e4370dee92a908d0dec6983c0bac3cca5
 EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
-EBUILD samba-4.7.3.ebuild 8492 BLAKE2B 4a8d81457333d6057633946ac5c50a309c0ff3f0ffe60b6d6706d614dc9c1a72de07ec2006e2a5363cc01f9a73ab776121eb568c0f8e442344f274dc28007b60 SHA512 2b6c5bdd753f9f941ef38a59540f13881bd209337eca6bc84d9d8e7053f2a6d68229a47f3866cb934eeaa235596f14634a0d10709782126183dc4563c4a0a30f
-EBUILD samba-4.7.4.ebuild 8525 BLAKE2B e98a537cbda904db990f35c9867bc51bfa96419f5a8f9f100d5533ed1eaa0e73d5455e1ad98799101114e97dded90563e812acf5494dfacf4e2f2fa603a31e76 SHA512 1639cfad70328394bbca2334c5ca71ba95e7aa39fe869992680caf15a131b637af7a609dc3e9edbbf78c7526813fbd2b5ad78e86b1e04b1783825f696c7b204a
-EBUILD samba-4.8.0_rc1.ebuild 8257 BLAKE2B 65d7061376de0a4267a2c74dc9564890177b932f375340bb12fd7a2ee52551313bc759b7b834efa55858881138ca799bbbabad58e431aebf6a38ccf28af20e79 SHA512 f0e47fdc3550725627f487cb94aada1270ed337ccace51da293f47be924032ede17b2cc67d65f06f180ec5950fdae80e03c3716b05406c3bc0636d9e4e25455b
+EBUILD samba-4.7.3.ebuild 8543 BLAKE2B b0a27da26793c0d740df166accadeba7737a025166815694f6b4de21957f5ecc724f0897abda4081b6a26ff0c4c2655918f4c46f1f1dc26a4acaeda528c847a0 SHA512 c94b897fd42f8acd4c069ba7b30a0c969024bc08c22962f273d4d1dcf1642147b93c238fd280d9a496ad0188e1fd09911631feec564dd9b35e94270ee6b0adad
+EBUILD samba-4.7.4.ebuild 8576 BLAKE2B d7984124f1f0afab7b5870d207f2b532cc03faad0160e569681312f363475f5ecdf4aa10008c3d20b22e1e96a70f15526b53fe3545644ae59fd1e3e9a6e37fb1 SHA512 09ba72839aa22463427b9e3a42e626bf8ed312b6294369b8167ad63a5bedb511e7181d3108200ecb73fdbffeb67d108b5b30cdcaa340811908b5165db59e3a4c
+EBUILD samba-4.8.0_rc2.ebuild 8204 BLAKE2B 4d6bc1fa225090a4566d0c421477d7dbc58d48767b2bcd2bd3ce62aec61e55e947425be6ce04fbbef3a098767e995a0b7a1f91b12c16a4b3affec3385492bad4 SHA512 71aa87b597b21afd7a69f6778883fbd4cd25fe0882a98229e86a0e77630911b96db07dce11031dab32f6956c78e62375d440385e8b2b8d11e74dbfb6b855051d
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
new file mode 100644
index 000000000000..9fad9fca44fb
--- /dev/null
+++ b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
@@ -0,0 +1,40 @@
+https://lists.samba.org/archive/samba-technical/2017-December/124344.html
+https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836
+
+From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001
+From: Zentaro Kavanagh <zentaro@chromium.org>
+Date: Mon, 11 Dec 2017 12:41:16 -0800
+Subject: [PATCH] Remove unsupported colon from configure msg.
+
+- When cross-compiling an answers file must be supplied via
+  --cross-compile --cross-answers=<path to answers>.
+- The lines in the answer file have the form;
+    Config Msg: Answer
+- The colon is used to delimit the msg and the answer when reading
+  the answers file.
+- WAF doesn't support the message containing a colon.
+- It's not possible to override this variable so cross compile fails.
+
+Signed-off-by: Zentaro Kavanagh <zentaro@google.com>
+Reviewed-by: Uri Simchoni <uri@samba.org>
+Reviewed-by: Andrew Bartlett <abartlet@samba.org>
+---
+ wscript_configure_system_mitkrb5 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
+index 9c351131ad1a..803dad7ab63b 100644
+--- a/wscript_configure_system_mitkrb5
++++ b/wscript_configure_system_mitkrb5
+@@ -282,7 +282,7 @@ conf.CHECK_CODE('''
+        ''',
+     'HAVE_WRFILE_KEYTAB',
+     headers='krb5.h', lib='krb5', execute=True,
+-    msg="Checking whether the WRFILE:-keytab is supported");
++    msg="Checking whether the WRFILE -keytab is supported");
+ # Check for KRB5_DEPRECATED handling
+ conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
+        #include <krb5.h>''',
+-- 
+2.15.1
+
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 228698438157..05538c6aadf3 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
@@ -27,6 +27,12 @@ SLOT="0"
 IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
 quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
 
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
 	/usr/include/samba-4.0/dcerpc_server.h
@@ -79,12 +85,10 @@ DEPEND="${CDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
+		>=sys-libs/nss_wrapper-1.1.3
+		>=net-dns/resolv_wrapper-1.1.4
+		>=net-libs/socket_wrapper-1.1.7
+		>=sys-libs/uid_wrapper-1.2.1
 	)"
 RDEPEND="${CDEPEND}
 	client? ( net-fs/cifs-utils[ads?] )
diff --git a/net-fs/samba/samba-4.7.3.ebuild b/net-fs/samba/samba-4.7.3.ebuild
index 5656d87fe613..96bd7cdf5f9a 100644
--- a/net-fs/samba/samba-4.7.3.ebuild
+++ b/net-fs/samba/samba-4.7.3.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}"/talloc-disable-python.patch
 	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
index bcab7bd8aec3..13fa3acc76c3 100644
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}"/talloc-disable-python.patch
 	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
 	"${FILESDIR}/${P}-no_ads.patch"
 )
 
diff --git a/net-fs/samba/samba-4.8.0_rc1.ebuild b/net-fs/samba/samba-4.8.0_rc1.ebuild
deleted file mode 100644
index bf0eef6a4ea5..000000000000
--- a/net-fs/samba/samba-4.8.0_rc1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# 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(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.35[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls )
-	test? ( python )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.0_rc2.ebuild b/net-fs/samba/samba-4.8.0_rc2.ebuild
new file mode 100644
index 000000000000..28420233a0a4
--- /dev/null
+++ b/net-fs/samba/samba-4.8.0_rc2.ebuild
@@ -0,0 +1,277 @@
+# 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(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.35[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 36626c2eba57..e2d4ca9e4910 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index fbd08ce75066..a264feb2d0e2 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -4,8 +4,8 @@ AUX lftp-4.7.0-gettext.patch 421 BLAKE2B 3d1583173e610983d93e44c8411729a0ed90f64
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.2.tar.xz 1598920 BLAKE2B 2946a0ac3e915983e85f08f4c8a293cfd76b837dff007c60230522f4633dac9f9f198ee1d0e9e0d13217b83a55e46bd024d18d863e44bc17071561da6ec917a6 SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e
 DIST lftp-4.8.3.tar.xz 1602324 BLAKE2B 196a9a08f97512952ea8c9e95b85c7222765a9df05d300d6c2cc3bd934b746d0c62a3d4c93a5c6eb3f1eca138495ae1c09edc31ad4f5516128c44fd3b8bbf2de SHA512 16d0ddc36ac00db009fd4e634a2eaa575bd1c690ea7e1af396317ccc677704d2a4dfa19ea0c46dab83450072714086ed2b15ac00ffe51ec5c9bb900e5e744583
-EBUILD lftp-4.7.5.ebuild 2228 BLAKE2B 2f940a04fcc3c22d4d073e323dd8ea88b8b324a3afcf900d0e58fb7419245fca2f8b1010db8059c43c5045ed642312513b5ec2d8905446177ab3b9a03b614d7b SHA512 0096c51191b49f190a8fec6b48446c0b303bea9f1d3221d5db2bdf923156a772aed8e1f65a29c81d2c2cb8faf0899f22fe675d980895f0b5929be225f947f9f3
-EBUILD lftp-4.8.2.ebuild 2243 BLAKE2B 975768c9434557880f0e1b898a5571ec2007124128d114400a11ff2044a4b2180391270d5b4d87d38c8e06367449fabd64c2257f661459b44a4f778c72b4e2d9 SHA512 ffc9a4928b43c80c6c30e771b6c615b5233407c77a0455d4c5ec704b8e7b239d89a4e0bf2f78edd09f1c08d392aabeb2db6845b23498e14259b5cdf4d952e8ca
-EBUILD lftp-4.8.3.ebuild 2243 BLAKE2B 975768c9434557880f0e1b898a5571ec2007124128d114400a11ff2044a4b2180391270d5b4d87d38c8e06367449fabd64c2257f661459b44a4f778c72b4e2d9 SHA512 ffc9a4928b43c80c6c30e771b6c615b5233407c77a0455d4c5ec704b8e7b239d89a4e0bf2f78edd09f1c08d392aabeb2db6845b23498e14259b5cdf4d952e8ca
+EBUILD lftp-4.7.5.ebuild 2216 BLAKE2B 670c49f7842629a237aa6681fe43ac619d7901b7f2cc44f5a0942dc0aa044536ddfa3d419ce4ce898afefe53c1317839ca198e3e9aed117bc34ff1c987eaca43 SHA512 d60cf04b48d0cbe304ecdd992498daecbf41676527ab9b077de372d24c1bc911e3eaaca9fb93446b38394360e1624d1a2703b16051b85b5b395845573026040d
+EBUILD lftp-4.8.2.ebuild 2231 BLAKE2B 86ea2e95f38363b752bebba735d430f876e6462d4f43a923f73288dca7d38fe591cb234ebce38edd957f5b092635598d3d8adaf8c546434a068bc6aa16e05dbf SHA512 551403c91d808b0663632cc9c234a69f3c2b77c8e9c03c171a658bf959ed2c3efdc87d0ed9d6bab0834c17c0b5665f9c8a4c46e455459f22907fd82563f1947b
+EBUILD lftp-4.8.3.ebuild 2231 BLAKE2B 86ea2e95f38363b752bebba735d430f876e6462d4f43a923f73288dca7d38fe591cb234ebce38edd957f5b092635598d3d8adaf8c546434a068bc6aa16e05dbf SHA512 551403c91d808b0663632cc9c234a69f3c2b77c8e9c03c171a658bf959ed2c3efdc87d0ed9d6bab0834c17c0b5665f9c8a4c46e455459f22907fd82563f1947b
 EBUILD lftp-9999.ebuild 2063 BLAKE2B 1d1cfe0a113347da4ff6abe33835caf308823e26254c755f6c6c5326b0418cfc65d8b6a63e576fa9e10af42c0101ac71370935e9df3676770dbf73b926ca7315 SHA512 03c489b52a31ae0f534f916c682577125aac10448d782fc06aa3ab242fc40ed980448bce578306efab264bc5fd5c0d47f32e8c344a1f29fadbe9f73f05ef1d7b
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index 68309e82d64f..087b60b4d88a 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild
index 182b37dabbda..ca93056b2641 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
index 182b37dabbda..ca93056b2641 100644
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ b/net-ftp/lftp/lftp-4.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7727b496f0f9..5fd41ad90f00 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 1605ff4d3fe7..4912051d0bb5 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.1.0_amd64.deb 65522064 BLAKE2B 4128a5d3ceca998fb36dc48a19c7cb520f5ea9a162881e1bcd578b6e68861113164c636a0159e937b42492ecfa5624de66376871a61133a4c3fc4be85e535322 SHA512 2bb1c92ccc070325d38bfaacca6998a1ce465801e70736bea9eee3f46fb321882bbe052460cdef8c4767ea971b3be248f31467f301feebed428048541a613524
-EBUILD signal-desktop-bin-1.1.0.ebuild 993 BLAKE2B 993fa775204a10f965419e0bdada2e59614c7e93d954948a9b23b93375bb652df763099e1138c179ad49bfe371c93de4880fd048cb417d614bcfc4b23ad109ed SHA512 1b32b20d4c671e5ec50cf850d83651a7ef39c2ab487ecddf75cb83c68ad3ba7a85a570bac822d502f011d693cb7a14d3f4443647c324d2e4c1c0a65f92a6b0ce
+DIST signal-desktop_1.2.0_amd64.deb 65769490 BLAKE2B 04155c4e60da75aa09d909d543ba4713f725e1eafed26689f84e782a972f5526d4be520bec26809cc10adf419989bb296e2917a0ab9c1aeb1b95eb2458bd519f SHA512 597ef22cde7f38c1fa20f70cc66f2d3f69c68776ee294cea3daca36dd958439306ec335c9ced7001157631a05202569f26563453137d0f6c73beada04b88cf6c
+EBUILD signal-desktop-bin-1.2.0.ebuild 993 BLAKE2B 993fa775204a10f965419e0bdada2e59614c7e93d954948a9b23b93375bb652df763099e1138c179ad49bfe371c93de4880fd048cb417d614bcfc4b23ad109ed SHA512 1b32b20d4c671e5ec50cf850d83651a7ef39c2ab487ecddf75cb83c68ad3ba7a85a570bac822d502f011d693cb7a14d3f4443647c324d2e4c1c0a65f92a6b0ce
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.1.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.2.0.ebuild
index 55ac05c96d96..55ac05c96d96 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.1.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.2.0.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9547e908ff85..2a64ad34d3ee 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 37239e32de26..ccb0fe977fed 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -5,5 +5,5 @@ AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501a
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
 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 2218 BLAKE2B 40657072c79eba74198882f83e6054c11466bbc7992e23349aee2969659053ff478fd7b66d75c1e2f424273af0a3861036885c7383d908fe1f2b042433131e3e SHA512 2e16408ba7ee0246f7b6ad7389675208cd6d25ff94dfb8454a467e6572e57c5e17a78c27d5b07cb174423ddc4253106e223b06f6a257060f119f4dc2c00a26f3
+EBUILD epic5-1.1.10-r1.ebuild 2211 BLAKE2B 66eadd474ad71e72267844f1cec015b4fd12ce811d55262df74b7624b0f36fbc9151f4e1674146afaa47a4ef8b95a4a88b2557b2cacabfac96de8a88630d6bd2 SHA512 16c5a47784f0d8ed534b8f269f693497be01079b3b6a8fa563f36116f3aea65f3af829af938db002775aa59613e09281cc1b4071710065d4a8fe721c000ad6d4
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
index b10edb0ea041..97036b79137d 100644
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 RUBY_OPTIONAL=yes
 inherit autotools eutils multilib ruby-ng toolchain-funcs
 
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 36c23eb44ab1..1c1acb97451e 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -6,5 +6,5 @@ AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9
 DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30.ebuild 2654 BLAKE2B 0d00c4f5ef9339ffb88729313ed2c2522ae06c56e74cc9e0962f793e0a32c21223064e4f5ed4d8c8b5469cef67632cf19171c9e8f3adcc43269867d05131bbe7 SHA512 5101cf63561a1b87763568f94d06efd192e25ca4176d2a8ef31774f796f9c4f092b321c3d8f31bfa671c69bc98fccd15e750c0fe361f025ed4a8cc179f1184ad
+EBUILD iroffer-dinoex-3.30-r1.ebuild 2656 BLAKE2B 3dcc55257208076808e114ec96afd7ad9f9c73c63096977c84cb1e0ea012a59e4ef3d74c87c1445b2993e65d3c7607fcf297315d22dce1ca0012e803173b7b05 SHA512 de3d95e51e24b78d3a948d8a8187dc47cc2772304ef7df0638cbcb584e02333657955816d4e0cb7d5827c2acea9e0359f35f76d6338aa3179a8a21c7fd11bd70
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
new file mode 100644
index 000000000000..1776b3620bb7
--- /dev/null
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de en fr it"
+PLOCALE_BACKUP="en"
+
+inherit l10n toolchain-funcs user
+
+DESCRIPTION="IRC fileserver using DCC"
+HOMEPAGE="http://iroffer.dinoex.net/"
+SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
+	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
+
+REQUIRED_USE="
+	admin? ( http )
+	gnutls? ( ssl )
+"
+
+RDEPEND="chroot? ( dev-libs/nss )
+	curl? (
+		net-misc/curl[ssl?]
+		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
+		!gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) )
+	)
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( !gnutls? ( dev-libs/openssl:0= ) )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup iroffer
+	enewuser iroffer -1 -1 -1 iroffer
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.29-config.patch"
+	eapply -p0 "${FILESDIR}/${PN}-Werror.patch"
+
+	eapply_user
+
+	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+}
+
+do_configure() {
+	echo ./Configure $*
+	./Configure $* || die "configure phase failed"
+}
+
+src_configure() {
+	do_configure \
+		PREFIX="${EPREFIX}/usr"\
+		$(usex debug '-profiling' '' '' '')\
+		$(usex debug '-debug' '' '' '')\
+		$(usex geoip '-geoip' '' '' '')\
+		$(usex chroot '' '-no-chroot' '' '')\
+		$(usex curl '-curl' '' '' '' )\
+		$(usex gnutls  '-tls' '' '' '' '')\
+		$(usex upnp '-upnp' '' '' '')\
+		$(usex ruby '-ruby' '' '' '')\
+		$(usex kqueue '-kqueue' '' '' '')\
+		$(usex blowfish '' '-no-blowfish' '' '')\
+		$(usex ssl '' '-no-openssl' '' '')\
+		$(usex http '' '-no-http' '' '')\
+		$(usex admin '' '-no-admin' '' '')\
+		$(usex telnet '' '-no-telnet' '' '')\
+		$(usex memsave '' '-no-memsave' '' '')
+}
+
+src_compile() {
+	# TODO: default compile targets always include chrooted target, which is not good
+	emake CC="$(tc-getCC)" $(l10n_get_locales)
+}
+
+myloc() {
+	emake DESTDIR="${D}" install-${1}
+
+	dodoc help-admin-${1}.txt
+	use http && dodoc doc/INSTALL-linux-${1}.html
+
+	insinto /etc/${PN}
+	case ${1} in
+	"de")
+		doins beispiel.config;;
+	"fr")
+		doins exemple.config;;
+	*)
+		doins sample.config;;
+	esac
+}
+
+src_install() {
+	l10n_for_each_locale_do myloc
+
+	dodoc README* THANKS TODO
+	doman iroffer.1 xdcc.7
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use ruby; then
+		insinto /usr/share/${PN}
+		doins ruby-sample.rb
+	fi
+
+	if use http; then
+		insinto /usr/share/${PN}/htdocs
+		doins htdocs/*
+	fi
+}
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
deleted file mode 100644
index f9ffa93b3675..000000000000
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="de en fr it"
-PLOCALE_BACKUP="en"
-
-inherit eutils l10n toolchain-funcs user
-
-DESCRIPTION="IRC fileserver using DCC"
-HOMEPAGE="http://iroffer.dinoex.net/"
-SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
-	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
-
-REQUIRED_USE="
-	admin? ( http )
-	gnutls? ( ssl )
-"
-
-RDEPEND="chroot? ( dev-libs/nss )
-	curl? (
-		net-misc/curl[ssl?]
-		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
-		!gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) )
-	)
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls )
-	ruby? ( dev-lang/ruby )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup iroffer
-	enewuser iroffer -1 -1 -1 iroffer
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.29-config.patch"\
-	       "${FILESDIR}/${PN}-Werror.patch"
-	epatch_user
-	l10n_find_plocales_changes "" 'help-admin-' '.txt'
-}
-
-do_configure() {
-	echo ./Configure $*
-	./Configure $* || die "configure phase failed"
-}
-
-src_configure() {
-	do_configure \
-		PREFIX="${EPREFIX}/usr"\
-		$(usex debug '-profiling' '' '' '')\
-		$(usex debug '-debug' '' '' '')\
-		$(usex geoip '-geoip' '' '' '')\
-		$(usex chroot '' '-no-chroot' '' '')\
-		$(usex curl '-curl' '' '' '' )\
-		$(usex gnutls  '-tls' '' '' '' '')\
-		$(usex upnp '-upnp' '' '' '')\
-		$(usex ruby '-ruby' '' '' '')\
-		$(usex kqueue '-kqueue' '' '' '')\
-		$(usex blowfish '' '-no-blowfish' '' '')\
-		$(usex ssl '' '-no-openssl' '' '')\
-		$(usex http '' '-no-http' '' '')\
-		$(usex admin '' '-no-admin' '' '')\
-		$(usex telnet '' '-no-telnet' '' '')\
-		$(usex memsave '' '-no-memsave' '' '')
-}
-
-src_compile() {
-	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(l10n_get_locales)
-}
-
-myloc() {
-	emake DESTDIR="${D}" install-${1}
-
-	dodoc help-admin-${1}.txt
-	use http && dohtml doc/INSTALL-linux-${1}.html
-
-	insinto /etc/${PN}
-	case ${1} in
-	"de")
-		doins beispiel.config;;
-	"fr")
-		doins exemple.config;;
-	*)
-		doins sample.config;;
-	esac
-}
-
-src_install() {
-	l10n_for_each_locale_do myloc
-
-	dodoc README* THANKS TODO
-	doman iroffer.1 xdcc.7
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins ruby-sample.rb
-	fi
-
-	if use http; then
-		insinto /usr/share/${PN}/htdocs
-		doins htdocs/*
-	fi
-}
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 5e52882e86c2..1daca189fda1 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -5,5 +5,4 @@ AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
 EBUILD rbot-0.9.15_p20160325-r1.ebuild 5325 BLAKE2B 2648782ddb6029ed133b1c1093e9ddd43d1a98c26b8346441e96173da00443617de8f2ad115b62f71fb84cb884c031e5016dafb88c02dd1143b306b40ca446de SHA512 42df0523d058827fcac570f4f6e1790774f42b781f2cee460823c56b717fa7b3540d5b4b388bfa59c1edfa650dcfdba7951ca0fcbeec47bd95da95c1aaa1ea14
-EBUILD rbot-0.9.15_p20160325.ebuild 5021 BLAKE2B 1a8db5a4f0f31cc86032ebb0132448829679ae53f784f86a6e9982e312d3a83066bc18b5c547cd25ac454370817fc0a3240b7a0c17a5046584dd64d4bdb5c8fe SHA512 e2bb206bcc8439fe93474caa8d77b639340c42b77bbc48f425fbc1bdb818d97d726e4f9eda023c7f31963ffaf71a3d1b70e775d4769c1e34a59824327b38f35f
 MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
deleted file mode 100644
index ee7d5458ae7e..000000000000
--- a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
-inherit ruby-ng eutils user
-
-DESCRIPTION="A ruby IRC bot"
-HOMEPAGE="http://ruby-rbot.org/"
-SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( feh GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="spell aspell timezone translator shorturl nls figlet
-	fortune cal host toilet"
-ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
-RUBY_S="${PN}-${GITHUB_COMMIT}"
-
-RUBY_PATCHES=( rbot-rakefile-gettext.patch )
-
-RDEPEND+="
-	spell? (
-		aspell? ( app-text/aspell )
-		!aspell? ( app-text/hunspell )
-	)
-	figlet? ( app-misc/figlet )
-	toilet? ( app-misc/toilet )
-	fortune? ( games-misc/fortune-mod )
-	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
-	host? ( net-dns/bind-tools )"
-
-ruby_add_bdepend "
-	nls? (
-		>=dev-ruby/ruby-gettext-2
-		dev-ruby/rake
-	)"
-
-ruby_add_rdepend "
-	dev-ruby/tokyocabinet
-	timezone? ( dev-ruby/tzinfo:* )
-	translator? ( dev-ruby/mechanize )
-	shorturl? ( dev-ruby/shorturl )
-	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
-"
-
-pkg_setup() {
-	enewuser rbot -1 -1 /var/lib/rbot nobody
-}
-
-all_ruby_prepare() {
-	# Avoid tests that are only compatible with ruby22
-	rm -f test/test_journal.rb || die
-
-	# Fix deprecated code that was removed with ruby22
-	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
-}
-
-all_ruby_compile() {
-	disable_rbot_plugin() {
-		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
-	}
-	use_rbot_plugin() {
-		use $1 && return
-		disable_rbot_plugin "$2"
-	}
-	rbot_conf() {
-		echo "$1: $2" >> "${T}"/rbot.conf
-	}
-	use_rbot_conf_path() {
-		use "$1" \
-			&& rbot_conf "$2" "$3" \
-			|| rbot_conf "$2" /bin/false
-	}
-
-	local spell_program="/usr/bin/hunspell -i"
-	if use !spell; then
-		disable_rbot_plugin spell
-		spell_program="/bin/false"
-	elif use aspell; then
-		spell_program="/usr/bin/ispell-aspell"
-	fi
-
-	rbot_conf spell.program "${spell_program}"
-
-	if use !figlet && use !toilet; then
-		disable_rbot_plugin figlet
-	fi
-
-	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
-	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
-
-	use_rbot_plugin timezone time
-	use_rbot_plugin translator translator
-	use_rbot_plugin shorturl shortenurls
-
-	use_rbot_plugin fortune fortune
-	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
-
-	use_rbot_plugin cal cal
-	use_rbot_conf_path cal cal.path /usr/bin/cal
-
-	use_rbot_plugin host host
-	use_rbot_conf_path host host.path /usr/bin/host
-
-	local rbot_datadir="${D}"/usr/share/rbot
-
-	# This is unfortunately pretty manual at the moment, but it's just
-	# to avoid having to run special scripts to package new versions
-	# of rbot. The default if new languages are added that are not
-	# considered for an opt-out here is to install them, so you just
-	# need to add them later.
-	if use nls; then
-		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS+set} ]]; then
-			# As the the language name used by the rbot data files does
-			# not correspond to the ISO codes we usually use for LINGUAS,
-			# the following list of local varables will work as a
-			# dictionary to get the name used by rbot from the ISO code.
-			local lang_rbot_zh_CN="traditional_chinese"
-			local lang_rbot_ru="russian"
-			local lang_rbot_nl="dutch"
-			local lang_rbot_de="german"
-			local lang_rbot_fi="finnish"
-			local lang_rbot_fr="french"
-			local lang_rbot_it="italian"
-			local lang_rbot_ja="japanese"
-
-			for lang in ${ILINGUAS}; do
-				has ${lang} ${LINGUAS} && continue
-
-				lang_varname="lang_rbot_${lang}"
-				lang_rbot=${!lang_varname}
-
-				rm -r \
-					"${S}"/data/rbot/languages/${lang_rbot}.lang \
-					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
-					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
-					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
-					"${S}"/po/${lang} &>/dev/null
-			done
-		fi
-
-		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb config --prefix="/usr" \
-		|| die "setup.rb install failed"
-}
-
-each_ruby_test() {
-	pushd test || die
-	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
-	popd || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb install --prefix="${D}" \
-		|| die "setup.rb install failed"
-}
-
-all_ruby_install() {
-	diropts -o rbot -g nobody -m 0700
-	keepdir /var/lib/rbot
-
-	insinto /etc
-	doins "${T}"/rbot.conf
-
-	newinitd "${FILESDIR}/rbot.init2" rbot
-	newconfd "${FILESDIR}/rbot.conf2" rbot
-}
-
-pkg_postinst() {
-	elog "rbot can be started as a normal service."
-	elog "Check /etc/conf.d/rbot file for more information about this feature."
-	ewarn "DEPRECATION NOTICE:"
-	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
-	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
-	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
-	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 53c2c1a68f44..e2a3d9b7d0f6 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index 04299cca5a6c..b80328e0f07b 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,5 +1,3 @@
-DIST accounts-qt-1.13.tar.bz2 544655 BLAKE2B 62e9a4a5d387729c179c088ab12715d1a5dc99874758676ef939f6ab59ee2f870715bdeb828e5fcda795d17866a5587a4e12a14043d189265e11e782bcdec99e SHA512 e39da214bd4aa72ac745fa2b7735de41985f9d854b6278d0c69c4dccb24ff411d20052454854dce423a2e6cb40bb1fd4b1f82328dcf6acd10cb290881e5c8c54
 DIST accounts-qt-1.15.tar.gz 64190 BLAKE2B a00f4677d9e99304729af4768c288bce1b19f357e50db0db1264760114b6a9cea821bda112605a49dafa192e10d4d6454155fa94a3dd3cea2a6525d63c129bb4 SHA512 36c80a237bc2d427ce3acb62ac3b2e7878ac7e02b00f17022af326b52edbc7ad3d0cf428fb4e1e2bcc1d0d410054102926f549dc18bea137a9d9ea19a2d268d3
-EBUILD accounts-qt-1.13.ebuild 917 BLAKE2B 6689e4b99499cef81f12ddeae91c8dedeb113fa1997f7606b110dfb814386cbd726b472a5bcc35ac3dab25ad22b0d5a8bad61e7dbc1fe6580ac55dcdac704c21 SHA512 2eb9874c3cec114fd6cef5bf7a30c7ead77824630af2fb8fd1112d85e5f0ac9277babf2893fe7711525c5e201ad31aba07e8bba6327f74083b1cf78418cc39c8
-EBUILD accounts-qt-1.15.ebuild 1012 BLAKE2B ab5170ad603a167c9625f9ce2ac66428ef80181df472a962ef0bc9424fcca19eb027feac892858e1074f76013c62edb923a4e97c0904075142d473cadd6d5253 SHA512 353f7989378e88fc76ddedee0f060ed4a151cd81bf012867677ea29eba9237eaf4eda09e765aa946836ed7ff688ecfac0cf738c42dbb52b0e23e524d4f553ad1
+EBUILD accounts-qt-1.15.ebuild 1010 BLAKE2B 937b03c87b2f684a35d43d0444ea681dbf9236b0f29a172afac27ddc7646f3d3f3fef1f9188a16ad8f0b2b441d8443053588614b1484fd937976c96e2c18e8a2 SHA512 9dc1be27be463c2caa16e9fb2a6523c67b43020386f8c99b5667bfe56234b109e3fb16b47855ea485eee6a6c383684d572ca785c529bf392134d4a8af3610612
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.13.ebuild b/net-libs/accounts-qt/accounts-qt-1.13.ebuild
deleted file mode 100644
index d3a5206b66b1..000000000000
--- a/net-libs/accounts-qt/accounts-qt-1.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 bindings for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc test"
-
-# killed by stack smashing detector
-RESTRICT="test"
-
-RDEPEND="
-	net-libs/libaccounts-glib
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:5 )
-"
-
-src_prepare() {
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
-	use doc || sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die
-	use test || sed -i -e '/^SUBDIRS/s/tests//' accounts-qt.pro || die "couldn't disable tests"
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/accounts-qt/accounts-qt-1.15.ebuild b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
index 234671c8ca8b..29a33e581299 100644
--- a/net-libs/accounts-qt/accounts-qt-1.15.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.15.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://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc test"
 
 # dbus problems
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index e36eacba3bda..414d7a68c8de 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,9 +3,9 @@ DIST gnutls-3.5.16.tar.xz 7559812 BLAKE2B 5b2fded412823b3f947c000f71bb816e2e248c
 DIST gnutls-3.5.17.tar.xz 7261864 BLAKE2B 3b7cbdda3763f05c769c020c517afced3fe27e8b1ec03754d44ef0c183e7985cf0a71f1d176bbcda8aa9bb814a6c53d7da3f2193e084f6d9eea214edbdeba1f2 SHA512 0cb3405dee64737e314bfa9eed6afa57a8951190fe576122aecaf587c07ec1a5df1ac4819078bff0d292271639019c76d9a708027b502e3f55e2cf6576555ea6
 DIST gnutls-3.6.0.tar.xz 8024972 BLAKE2B 754ec0c097430ef0d5c8c998b94e85c53ac6d34ec0e8b47c83c55f5e6235f783013572040998eb4a163e46ff569827c7c20c81f4e02a129b65e8b0c5d6d59f99 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03
 DIST gnutls-3.6.1.tar.xz 8064408 BLAKE2B 1a573f476261532d516ec7a2c4640cbf8aaaebbbdd129ccfeb1b88d3a66f919ff0eed142a91df19ca9c2f69f90c8c65b965c5659024d54db03606aae811bbc14 SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23
-EBUILD gnutls-3.5.15.ebuild 4248 BLAKE2B 412742096c0cf5327dac3ac77ffe90fd0495afe8ddda47080ef27d61779c70182cc7f03adeb4d3e52c3b00c7a4476b98951bae6a6d5a967ca3507c08f952e634 SHA512 5625f06936ec207c097a49b30caa5c9a32e9c03b1ab7bc757682eda6100205fa90d4fa10b668e80b7d106804529f174cd4e854dc424cbeec022b6713d27f2cfc
-EBUILD gnutls-3.5.16.ebuild 4261 BLAKE2B 5ac1b43fa40442f63ab6a3af56ee283b343e11029bf001a61ae567da37b1b86032eae96cefd9410faf35d5e598e3827535d4e6e980e9d94cdd3cbbd59969b25f SHA512 fe0b4b2a9fd99971ec631eacd7e66f45b23b4bd50c14fe5bd45e065cfd0c587eba19c9d25abba894ae7cb36199ea75e4af17b6d41e968f971a4b8cc115fa95e3
-EBUILD gnutls-3.5.17.ebuild 4261 BLAKE2B 5ac1b43fa40442f63ab6a3af56ee283b343e11029bf001a61ae567da37b1b86032eae96cefd9410faf35d5e598e3827535d4e6e980e9d94cdd3cbbd59969b25f SHA512 fe0b4b2a9fd99971ec631eacd7e66f45b23b4bd50c14fe5bd45e065cfd0c587eba19c9d25abba894ae7cb36199ea75e4af17b6d41e968f971a4b8cc115fa95e3
+EBUILD gnutls-3.5.15.ebuild 4236 BLAKE2B 80918bc1f10b26536115060993a944da85f2722fc712096d52b8b3cc3a8475c2eb03c33d758dddbf3153c0bf39490617d5486d4201f007f52802f7d45b3b1baf SHA512 f730783f61a95a88bfccce7ed4d8e8c8252422ac10607e9c9b2d5ce2256e55b7992b1d4e1404597707aaea248a2bff86d6e70a725dbfbf4c9436e6a83f890859
+EBUILD gnutls-3.5.16.ebuild 4249 BLAKE2B a96ce6697af48f8328fa68585e71f30025fb55f18c684053eb1d6d488e6e81a972af779856d7e2e9ce4ea0ffd43a5b5620144b8dae74781b7c3ab66486b75c42 SHA512 2f2f669bcb86912d7674a88d08ee7370d279dd3c0ebe75120b826c157d0b1ed26ce4db09088cf382a4350caa3adacff96fbab2f2856c480209b9ccfbceb15463
+EBUILD gnutls-3.5.17.ebuild 4249 BLAKE2B a96ce6697af48f8328fa68585e71f30025fb55f18c684053eb1d6d488e6e81a972af779856d7e2e9ce4ea0ffd43a5b5620144b8dae74781b7c3ab66486b75c42 SHA512 2f2f669bcb86912d7674a88d08ee7370d279dd3c0ebe75120b826c157d0b1ed26ce4db09088cf382a4350caa3adacff96fbab2f2856c480209b9ccfbceb15463
 EBUILD gnutls-3.6.0.ebuild 3878 BLAKE2B 0cebd0411d0d453de815977333a51635b63a53e4fa64a27fc8b570285a48555f19a2f0be451dc228e82d02af9c812a57716a07105767104b59f4838a0f5e3f3a SHA512 ea857f52bce797a16893eea5bc18ac2a79d12203abf0e477307f2e6676b1c8d54b9e1f8540640d617ae605fd7cf8e9a4915d51985cd8296c84b7e67843ed7bce
 EBUILD gnutls-3.6.1.ebuild 3878 BLAKE2B 0cebd0411d0d453de815977333a51635b63a53e4fa64a27fc8b570285a48555f19a2f0be451dc228e82d02af9c812a57716a07105767104b59f4838a0f5e3f3a SHA512 ea857f52bce797a16893eea5bc18ac2a79d12203abf0e477307f2e6676b1c8d54b9e1f8540640d617ae605fd7cf8e9a4915d51985cd8296c84b7e67843ed7bce
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index ea87930e307c..7e0a5dd1b45d 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.5.16.ebuild b/net-libs/gnutls/gnutls-3.5.16.ebuild
index bd0df06f98b6..5f47775ad57d 100644
--- a/net-libs/gnutls/gnutls-3.5.16.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.5.17.ebuild b/net-libs/gnutls/gnutls-3.5.17.ebuild
index bd0df06f98b6..5f47775ad57d 100644
--- a/net-libs/gnutls/gnutls-3.5.17.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/kimap2/Manifest b/net-libs/kimap2/Manifest
index 23764644ae2f..e7c0536df716 100644
--- a/net-libs/kimap2/Manifest
+++ b/net-libs/kimap2/Manifest
@@ -1,5 +1,3 @@
-DIST kimap2-0.1.1.tar.xz 91572 BLAKE2B daae1a27674b8d2b05bdfac7fa3365753f98b66b9e3538655281e3ce039bd0a2b1498715577d9b233541cf0017dee2d28c22954a47ddd75406676611d740cfc1 SHA512 165d6399f409d39a92aaee5337b78e15ec7ab4820816765942a8d86c05b11038c856c1be43e79f0b0a44784671714426b64f33ca3779126539e97ed347d38d69
 DIST kimap2-0.2.0.tar.xz 91624 BLAKE2B 37065978c80739415a7b0acc9491b3344865d452c65e50cde5941fa45bf5c2423cf5389d85b46f229e28adb644f8ed12bab8af9c8cbe50ecfffa5b88fd30435a SHA512 33258217767cec2f0a3b7f47d733701fb90239b32ae8ae96bcac4215b059e7ab245d4c151e18f924c13f5a7bbfc890ecac6ccdccc40c91e008e44b67c322a8d4
-EBUILD kimap2-0.1.1.ebuild 501 BLAKE2B dd1a255530ceb84105f22659812eb31d2a2b578e84a256c23b3646faf2a52814848e3167bf4a38a92d5a3788711a652d278aa0a9ff5006b80b925bd1b5205a3c SHA512 386ad70ff988d9e1ef7cbd90ede90aee829a843e615b1b1462bc940a0b844dad6be3f91b8636b42aa92dfa52b5f71fe5e2e8e06f3d6d70c22a8a069f586a6e0d
-EBUILD kimap2-0.2.0.ebuild 501 BLAKE2B dd1a255530ceb84105f22659812eb31d2a2b578e84a256c23b3646faf2a52814848e3167bf4a38a92d5a3788711a652d278aa0a9ff5006b80b925bd1b5205a3c SHA512 386ad70ff988d9e1ef7cbd90ede90aee829a843e615b1b1462bc940a0b844dad6be3f91b8636b42aa92dfa52b5f71fe5e2e8e06f3d6d70c22a8a069f586a6e0d
+EBUILD kimap2-0.2.0-r1.ebuild 507 BLAKE2B a2276690049b8537cba1be9bf11444751f284520713369dea25c53ece53d58ba76d8a0b5b17b646e1b6a90dd916b52bf549064e8947ae56a23a24c9a0a874e95 SHA512 8e9ff153160d02eec093dbeae8b1353453bf7d00cf1241839b4d21b14c2d5fc50066b33887c1ae2c39e5e21f46651e4efd6f79af4e51f5d6ca13207713099d44
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kimap2/kimap2-0.1.1.ebuild b/net-libs/kimap2/kimap2-0.1.1.ebuild
deleted file mode 100644
index f949479249a0..000000000000
--- a/net-libs/kimap2/kimap2-0.1.1.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
-
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers - successor of kimap"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl:2
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
diff --git a/net-libs/kimap2/kimap2-0.2.0-r1.ebuild b/net-libs/kimap2/kimap2-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..a19b4c4ac695
--- /dev/null
+++ b/net-libs/kimap2/kimap2-0.2.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers - successor of kimap"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtnetwork 'ssl')
+	dev-libs/cyrus-sasl:2
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
diff --git a/net-libs/kimap2/kimap2-0.2.0.ebuild b/net-libs/kimap2/kimap2-0.2.0.ebuild
deleted file mode 100644
index f949479249a0..000000000000
--- a/net-libs/kimap2/kimap2-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers - successor of kimap"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl:2
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index e70809682de3..87a52792b46e 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,10 +1,6 @@
 AUX ldns-1.6.17_perl522.patch 313 BLAKE2B 2c4883a034c3c8e3570fb1db99701e82e930cb1789287d7dcb716bc594ecce8e45d1dbd30bc62f0f4a77b228ce67d14eba380261af1a5940a1f926a5a4e0857f SHA512 e9239eedaaa54712454133c1750da0e02b71e89df6e43fb787ac1c4c6dbe548dc7a52f7bc7632c7aa52c003a641d00616fef0bed28ecf5e27dffb56a65e48d25
 AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
 AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
-DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7eb3f1d2cdc4ff51c98e6b78f93fab96d19d665f2dc8592f80d92ec5d3dd16da9760124f0604eb48c09ffd201 SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-1.6.17-r1.ebuild 2502 BLAKE2B b1b54f8308b887e0f3e06d0bdc993cc29e7dc89a660dab105b943cc125025f545796917b940861c11afd311e5c2351be8d941689c2fb2e0b2a80b684cb7ab85a SHA512 30aa360319dd0e9e3a4095fa988ed940a899af72b448b2d4d33fa18f57eee3557eaa20fcc4988deb7821d7ec6a12de88a9f687edb7b964883ffd51e58d14ae83
-EBUILD ldns-1.6.17.ebuild 2196 BLAKE2B 5edd80744d5bed7892bb56a5a80305e04780cebd8ef064f3c2f63494eb46eaba4a7580ec285cce6d32e273b3b162024a0388503364abdca6ac0dc7f9e20e6df6 SHA512 70b0785d6380ae4ce03702a5ce396b00275e7dd1548abc96a49444a23e9e370aabc7585d5683fabfca6f512f70ce5acdb7e793d72417a451582920d1f9a7fad5
-EBUILD ldns-1.7.0-r1.ebuild 2623 BLAKE2B e1674ee9f5416ad7af79558c1477ae918bb8cf44936b5746643d7351a4fbe16d586de0f123090bf06951e615e2647508ae3b4a370d7e2b2efe7a429661d1be1f SHA512 512475f5857766024ebe7ac8b852825a4737d1a08122fb337fefe0e36fc5a1294c1067b6a8ad63fadc1f0f665aaccc390f42b8859b54338fd1f31f5a7818e39d
 EBUILD ldns-1.7.0-r2.ebuild 2250 BLAKE2B f39a9af93e5e1b759824203b25d58861197b5a0cb783ade47ef1e2cde182f89bba869fed308e09ce7721e45ae80e3b1825f36296312e48b5a4deaf44a2a125f6 SHA512 3006861462b80aeb942b791a08e8a1cea3e3947d03777137b92d7a379fd5c07ff4425eb34d8c8d9ffba4bc30ad822b23bced00df444106309a5b9ae0db4ea1f1
 MISC metadata.xml 743 BLAKE2B 31fe371130dca55cc2950a0892ddf2e97f1c7260b57e893932c14d2af254b1c9272a678a4365762247b5fd7a6e2e6c1a58dd326f3837e0e12389bb08f493562a SHA512 b8d5c5fd107fb7dd7dc2d7d19fbb91a07a2a619b6c9ddd9146d9359c06ed96059c87d169b7c2022760e4117283372c01b6f5231edf975bbab9c72a3ee8347f35
diff --git a/net-libs/ldns/ldns-1.6.17-r1.ebuild b/net-libs/ldns/ldns-1.6.17-r1.ebuild
deleted file mode 100644
index c0b67b5178fd..000000000000
--- a/net-libs/ldns/ldns-1.6.17-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="ecdsa? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	dane? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	gost? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_perl522.patch"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable ssl sha2) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable dane) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--without-drill \
-		--without-examples \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/ldns/ldns-1.6.17.ebuild b/net-libs/ldns/ldns-1.6.17.ebuild
deleted file mode 100644
index c83ddb745d94..000000000000
--- a/net-libs/ldns/ldns-1.6.17.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="dane doc +ecdsa gost python +ssl static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="ecdsa? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-	ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
-	gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_perl522.patch"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable ssl sha2) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable dane) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--without-drill \
-		--without-examples \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/ldns/ldns-1.7.0-r1.ebuild b/net-libs/ldns/ldns-1.7.0-r1.ebuild
deleted file mode 100644
index 50cea5972721..000000000000
--- a/net-libs/ldns/ldns-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="ecdsa? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	dane? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	gost? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable ssl sha2) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable dane) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--without-drill \
-		--without-examples \
-		--disable-dane-ta-usage \
-		--disable-rpath
-
-		# >=openssl-1.1.0 required for dane-ta
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
-	epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index e323d9c35456..0f859656e20c 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,5 +1,3 @@
-DIST libaccounts-glib-1.21.tar.gz 127061 BLAKE2B f0446c4318e810b1cff40c08ee8aace3f3981776c4fcdc2e9d08e42de76f1be2dc2a4d6380feaa4ef0cd94ec10dfd27652c6131653c863db78f11d7c6e14f175 SHA512 3eef882597392387a962dddbc49e4428f7e11e329fac1c3f4d39f3ef315118274b253e36095754d6392802cf298f2bfc0adf30b9a114b047082cda231bb10f60
 DIST libaccounts-glib-1.23.tar.gz 127931 BLAKE2B 2379786bb4a658eaba632a1788782a0b5620e69fa058e991a41feeedf5b8f4786592077f237513fde9ed4ea00db015a7dd0be6ad852c265a5b7f8b1180ac01e4 SHA512 88fec1fed7a135375516363e4b7f1330d45a6337bbfb45dd35dabce87097ee4e550e968870541e1b496c2ee3db1bd26e0665f4155f1e64d1cc7b6b74d5b71b5c
-EBUILD libaccounts-glib-1.21-r2.ebuild 826 BLAKE2B 800b33308573e359db16570d27af3739a917b5f793a1617e81ba1332539c986d1ee885de6c27968322a9edd3fd93f0fdb6ed05e87a71f03c527e2ed20a36f757 SHA512 1e5c60ace5100e2a7a1bc5c7643ab93401725a152716b2e412f2885612450653477caea0ac4ec05e31b18cbd265112227a27fece5cca3b78454248d42d962c78
-EBUILD libaccounts-glib-1.23.ebuild 820 BLAKE2B dfd868d4287bf2c733ed2d249401b91684be135981cb3dc7c6ee9ee9ba99676df5ad46b3dd49d22f45c7822088c44743edceb1b287b6be00562a6c81a005a776 SHA512 481f1a558781fc31905fcc8a6599e77f52cf80721868a74f7882bd767dc1247fe05f4dfe4d2f873498eeb75ad34bee2a00f1cd48ad1ab95c3542a4297a3585a3
+EBUILD libaccounts-glib-1.23.ebuild 818 BLAKE2B 5dd620e3cffa76ef1bfe5b28d51c59a2484026dd246fcf8f8c9d874023133aa2252564288d703ff7cb90fda7a5e85c0814e4eaddac654963a62144c4b741c501 SHA512 ed750fec2937c287744effc8bd5059779b7c042a5bee1e6ceb0a1ed20356d4349a17f6df598cfc068b2c7824e60f385e5c1a82abaa3cd631d8e3a067b96ca981
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.21-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.21-r2.ebuild
deleted file mode 100644
index e7b1dda81e88..000000000000
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.21-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils vcs-snapshot xdg-utils
-
-DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS NEWS )
-
-pkg_setup() {
-	xdg_environment_reset
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-python \
-		--disable-tests \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
index 928af3370a31..94c1a275a838 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.23.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://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index e9a3c53cb40b..f8b7803872c6 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -5,7 +5,7 @@ AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc SHA512 509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
-EBUILD liblockfile-1.09.ebuild 1258 BLAKE2B 7c347a5e693a53765d5cf219c99cfdd085e82be969b659433e3649d7a641d644f6fc45f887d747b435718431953b207dcb98c824917d0f88513bfeb08fe002ef SHA512 d4ff70a13d3f7353b6f2173671c0f077f3db0444c9c11557de2f4fd44fdf57690bce9105a40d6d419bafb6335f22ce3ccaca08f33406224e138ae53e8fecf86b
-EBUILD liblockfile-1.13.ebuild 1140 BLAKE2B 47f439df557df4600a52765bd1edaf12485430b86629c1bac968a2f0220cab3d45c7c3daf98ff1f17c5cf7aae1603fec64b79ecc9794b0504da3c4a2d19085f7 SHA512 d7adc46092440ce4cb1398fb05226da2bf67a514267e60550e10c46748ba6b48be07c0ed2a3f37c31ecc590a36a72b3dab9bfc22bf1beef2bdc383ef32ee3a96
-EBUILD liblockfile-1.14.ebuild 1140 BLAKE2B 47f439df557df4600a52765bd1edaf12485430b86629c1bac968a2f0220cab3d45c7c3daf98ff1f17c5cf7aae1603fec64b79ecc9794b0504da3c4a2d19085f7 SHA512 d7adc46092440ce4cb1398fb05226da2bf67a514267e60550e10c46748ba6b48be07c0ed2a3f37c31ecc590a36a72b3dab9bfc22bf1beef2bdc383ef32ee3a96
+EBUILD liblockfile-1.09.ebuild 1246 BLAKE2B 2f90142761b3c608945b407923b03b99d7d4124eb77ca4ec7711deb75e06a287b49c4cca5fbfe57f6d8b582ac59d474e772da1117a12eb9110cdf154d2107601 SHA512 9daddb4de76567557989902f824f1eeb77e2810055f7aaf36c2ce9e4b7086b364a4f06c620b5d6e1c02a18cef46868a62a4e2714ffc916c2417d542b1ed8073e
+EBUILD liblockfile-1.13.ebuild 1128 BLAKE2B 51ed506fd479c36cf5deb22b8b0469222120a17d874cd231baa9f66c6692d57fdb54012d9db89f215460695658278f466f8e5f54f9d7d7981c052cadcd235cde SHA512 de74d533a77f35c2755c1ab773a56559ecd8b58afdc1cd392df59597349b9b128201a1f3e918da646f2b9bd4ff152c2bdcedcbc638569a412a1bf2cc80cfb848
+EBUILD liblockfile-1.14.ebuild 1128 BLAKE2B 51ed506fd479c36cf5deb22b8b0469222120a17d874cd231baa9f66c6692d57fdb54012d9db89f215460695658278f466f8e5f54f9d7d7981c052cadcd235cde SHA512 de74d533a77f35c2755c1ab773a56559ecd8b58afdc1cd392df59597349b9b128201a1f3e918da646f2b9bd4ff152c2bdcedcbc638569a412a1bf2cc80cfb848
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index dd4aa4765458..b7bcd744ac06 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.13.ebuild
index ff11cb8dd7c6..f70344e97a96 100644
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.13.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="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/net-libs/liblockfile/liblockfile-1.14.ebuild b/net-libs/liblockfile/liblockfile-1.14.ebuild
index ff11cb8dd7c6..f70344e97a96 100644
--- a/net-libs/liblockfile/liblockfile-1.14.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.14.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="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index b72b78386cb3..26298fde302e 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -3,7 +3,7 @@ DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5
 DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
 DIST libmicrohttpd-0.9.58.tar.gz 1333687 BLAKE2B ef3dfb4684f2c387399d9044eb46de70c387b89bc4600529a9cdad7f2f31a25e0b0996b91d03cf42421979279781161b72d35eeb94d4bb101dd4d73bb6181bb7 SHA512 f68268bb0a0776ac0654a682fc598f4778561c2cc775e7315505c0e2f26f0633590d01f157984d348fdcedfb63d31d39add760a4ddb041694330015293d161b6
 EBUILD libmicrohttpd-0.9.52.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
-EBUILD libmicrohttpd-0.9.55.ebuild 1196 BLAKE2B 68af28e1587b2d0203cd4c9ae1f81c29a7333d1c3532fb5297978436b648fa65efbef7556171cca54994e3796dcfe74b2d46296fb8c07f4b2366423ff3ce2e83 SHA512 7941d19b31cac3122f301c321df14f6c86ff44193a45a4e146ac68b8e9b6379b45ac8d828e376aa0f49dd3bebee68af2b40622e6223d01ea5bea1ed4440b2217
+EBUILD libmicrohttpd-0.9.55.ebuild 1195 BLAKE2B e9133561165018a4c03134cebc940c4d636d789dff1dbd76a4c635bcb47a20aab909ca05ae5641bf4a1e25b2165fcd02312fab7d0c7608b4f0ce39ba0e053993 SHA512 a319e69ead4556143002662c33ac17954b6cfef74015739eadd31e2ff81c8ca36a9421201d326e8448e8efdda4de9ad6c460f9fed684993d4009bc75c522b8bb
 EBUILD libmicrohttpd-0.9.57.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
 EBUILD libmicrohttpd-0.9.58.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
index 68d95fed28e3..c669e3a7e3c9 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.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="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 3f662a0d0572..2f31ffe5d9f0 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,5 +2,5 @@ DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0.ebuild 513 BLAKE2B f0a52dade80a235cbee14c1191d15da82f08a86ae649c4fee6099af8ea20f0eddf9087b420d8e162b3818537a61db2ef8626e4d3d00843fa13948e69b379ecd9 SHA512 6b692a95a11c03c567c35c781bd5a71e9da74cacb11c62471d246c7ef232e06e4b716bceb368c094f395a7afefc0061388ff37dec6640d2b52b399dc3035dcd2
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 886 BLAKE2B f57d67db05d0aa41f5aea6db34bfcb28d013a0729638c8c023c93aa6cb4e46a8ad7bfe27a53245ea3e2a73cdf6cc3b239677ef93e539d536e28e143209b92e86 SHA512 573c7b004f9c87349a590eb9723d129bfa5b310bf06608011ab06e91b5d50fb20ed6029d31782f11f829307ba35e21d91e96d9354884dad465e910450aed8dc5
+EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B 415ef94be97fd29ffa1896127e2305a5d9c09cc34356ab5b62b0af437e38482f830405c80593200c9a0802138a749b86df9b673ed6eddf760c51f57f905ebebd SHA512 29fa40468e080863124f088e70c828e9bba02ff2fb64b39ebf6c47e03122d9526f627759a06ed8d9d6a47b4b106f5235efbbd41f8c92335ee5e13b6fd97a9a65
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index cf182e06e36b..016c30ac64d5 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.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 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-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 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 910d5a60479e..62cd6ae6d1bc 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,3 +1,6 @@
+AUX nDPI-2.2-libcache-include.patch 1038 BLAKE2B 654e66477b6fa32589d57dde8ba44baab2defaf2a001cc82eb46486fe62d840b25f5480c1512c0f4947162cca767530794eb2a6e74ef6edb02a0712d44603b8c SHA512 b93a74066e94ba767973cf1f2ca7dd8776459d8fe9eb352185ded766bbabcc6a28fb57f5acaca1e7660be0778c3298e22e5066969c6298c6782925c077e2ff35
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
+DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 EBUILD nDPI-2.0.ebuild 630 BLAKE2B eea945c7fdb4c68e7dc87fd754dc58d6816470b4872639c2ac867978d8e1507c1b9f49f6f07adcc24a87a6343fc09b8af0c917f12b5951893fffbddfe1886493 SHA512 269357550fde0644e13e2597ad9af379c2eb11525d00579bda9a8d67442ec233eaf8b501686c81069f9e1fffa41bf85133d9b94ca8eef0da11566b31238b6fb8
+EBUILD nDPI-2.2.ebuild 1007 BLAKE2B 1af51273f98e60a3b00dae950f500b7cb709bba212efc12e8722afe17a9e0ad7eed4b2cb22b0def165a6fc2e758d20f864cba5bcaecc1c51ae45fc82f7cf6e2e SHA512 acfe331941841949ea601f23a8ac8269a7d19474ba6ed5d7f61289075ca8b8c08534abd8e502b8d5da74ab0110cf3bb22fcf7ffe7f32ce9da92e05d4ff73fb31
 MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
new file mode 100644
index 000000000000..5ee089f46bf3
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
@@ -0,0 +1,32 @@
+--- src/include/Makefile.am.orig	2018-01-22 21:24:17.802100061 +0100
++++ src/include/Makefile.am	2018-01-22 21:24:30.080100801 +0100
+@@ -7,4 +7,5 @@
+ 		ndpi_protocol_ids.h \
+ 		ndpi_protocols.h \
+ 		ndpi_win32.h \
+-		ndpi_includes.h
++		ndpi_includes.h \
++		libcache.h
+--- src/include/ndpi_typedefs.h.orig	2018-01-22 21:27:35.994112009 +0100
++++ src/include/ndpi_typedefs.h	2018-01-22 21:27:47.463112701 +0100
+@@ -25,7 +25,7 @@
+ #define __NDPI_TYPEDEFS_H__
+ 
+ #include "ndpi_define.h"
+-#include "../lib/third_party/include/libcache.h"
++#include "libcache.h"
+ 
+ #define BT_ANNOUNCE
+ #define SNAP_EXT
+--- src/lib/Makefile.am.orig	2018-01-22 21:34:57.055138600 +0100
++++ src/lib/Makefile.am	2018-01-22 21:35:10.431139406 +0100
+@@ -12,7 +12,8 @@
+ 			     ../include/ndpi_includes.h \
+ 			     ../include/ndpi_protocol_ids.h \
+ 			     ../include/ndpi_protocols.h \
+-			     ../include/ndpi_typedefs.h
++			     ../include/ndpi_typedefs.h \
++			     ../include/libcache.h
+ 
+ libndpi_la_SOURCES = ndpi_content_match.c.inc \
+ 		     ndpi_main.c \
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
new file mode 100644
index 000000000000..6c0160ff6cd8
--- /dev/null
+++ b/net-libs/nDPI/nDPI-2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib versionator
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-libs/json-c:=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+	mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include"
+	epatch "${FILESDIR}/${P}-libcache-include.patch"
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+	prune_libtool_files
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 36a41734ee4d..b27005513814 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3128 BLAKE2B 1c4d12a8702fb8b76d7151ecc5d514afcf8706a2eca762c60e4436a53c62b1b84dd9976036451b4d833086bb09919ee5e8d07a032d22f8e718775ce09c92ff32 SHA512 86d28f120e7b93c8f97b30d56af4d958f6fab995a42f34f20b8ad5a3726417d2fce639477ec40ca63bab80a29ad88057295f26ef1e2e2e10c3f0d4cec1f9992a
+EBUILD neon-0.30.2.ebuild 3116 BLAKE2B a99ffb168c85a796c9177add65efec35626b034d1337ec208aaca0d9712ae55e25e4e7bf2db01249fe683807f1b6705386d589a9aed3909f85ffcb3e3f1f6a55 SHA512 058dea79681c3c984f4b28e4c399aea67fd8b9c031dcf90169b8a825f84be7a0cdb1a79b75c0aa31edbfd8610785d7734eb0f115dd69346dd5c755ccae9a024c
 MISC metadata.xml 1316 BLAKE2B 8d191f415e3ec7d76acac052656386617625842ffb7ca4c0ecf6e0e5c971f142d8f644bcad394671fac98fc6f046674fe5a5f94a460a5fa4328079e1ce2515a0 SHA512 6d15131eef6b6e61c0d7289d00c8dad289c5f48ffdca65b57b1ce73afe65a705f89e710874ca9f5a199dc6b1eb818f3650b8d60a65717d3ae49f9102113ca3f4
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index aad391df5fee..30abcc10f8f3 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.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"
@@ -11,7 +11,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index d8b5880e776a..2b9c1bc08436 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -10,7 +10,7 @@ AUX slpd-init 2206 BLAKE2B 4a78fdc11f5df523d0adddb57aac17550cde275585fa692779d9c
 AUX slpd.service 203 BLAKE2B 9cb80f3eecf7fe569ec37ae7730668fd232b7803fb1e66a4d38d94f28c9ff5248225b86772e2271b77c99931c6e61cfa587745f41bdf36e18658829fea9e86b5 SHA512 189bc5ffe034ab4effdf4187f28110f028452fc9f6e27ff6c44681410b205eba4fb0412b5dd112d27596cef5e2143be6c722a2d5592d803d29dd25e4722ab6ce
 DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e85a7e0f3b24c2a29195d39465807f967845958baaa567a7dd2d2bc8cff55eb1d910f43a6e54276673719596c9e SHA512 34742d88e772d7dba5c6fab1ccb7bf27d6174c5ca429aec406472994bcd806bfaf16dd86fce2ae4c51659587e99cced2436cf36772f6e086f7b87275fb1b19b6
 DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
-EBUILD openslp-1.2.1-r3.ebuild 1027 BLAKE2B 2999c0b9d535640876a844da785ea5005fbe9edd0e21860de709f745f884fdeef8feeae4a25a8db923e82e773d28c594b7eecf0982a5012b49190444fba9c409 SHA512 373241a78ba23618fdad9d565bbb5b750e55dc3d5d58aef86bf65c4d6bf3215ad3af936306f30b1800173d3611545e43797e7d6320e10b2f686c8bde5a96b625
-EBUILD openslp-2.0.0-r4.ebuild 1085 BLAKE2B cb6701bee220568378773143ac698e73a1b21c9d4963b3314d4bba7ccb19ef7e1962fd8d83a9c62de574ac17cf2952d928cd9c9c9281c072a0fb739c32e0efa0 SHA512 1004ec076caeaf700c5142e8af2d7cacd7d829836eb4b4127c591cb99d76661416a60595856f0696f866f8441260c834f22c0f48793c71299a5c8ce4b317bfb9
-EBUILD openslp-2.0.0-r5.ebuild 1144 BLAKE2B fe5bddf2cc64d23f1638388aace5d5ed700a33fafa24e9839180131865e9e40bb1151c514c1fd82bccf5be27bad358529586a42e530fdce77fed86880968483f SHA512 7b49dbf4f14504dcbe89411279456dc2f3ccfdf266969729726b500e724ca5f07d7d7b4d11071f9d1d8b382d411373fd3660ee966bf489ed2fe81a61faed076c
+EBUILD openslp-1.2.1-r3.ebuild 1015 BLAKE2B 8aebca7bdeca6a4ffd14d72bb08a8ad2810a079a99a282c937ee472671a29723a9403d93b8a7051738abc7bc1d46be3457ce2990441354a9ea055cefec53903a SHA512 455f4eb0ab9888fd250aceafcb0664865bd1992326896f6afcf6dc4b2e1c958a5a9574c32d915c86ee4f0e17435c91586b142230afca713af40856d16570337a
+EBUILD openslp-2.0.0-r4.ebuild 1073 BLAKE2B b4c3e06926bd6da36e520819e5ff2e052bc8102be9e967119305ac3b9bffceaf1128e5504fa2b3a9793c24ed675bdae7223ce64855c97b43f42cf844b03d53f6 SHA512 7dc1e67c956bc3699a2205980388097816906ba4ff4a7f91861894016bb223fed85510c6600793e4670a62c09e7e5b466af4f202cccf5f52a2ec87648846b299
+EBUILD openslp-2.0.0-r5.ebuild 1132 BLAKE2B 303f2eb68810f74d92fcd8141c05137c93452efcc8a12a09808748a361a48bdda4764c76c338449667cbc54ce7b573c4318f88e2c73b69b55797d06e0f0714be SHA512 cd160030d9f88f52513b94144252b63b868a787517d2ac54fcf5ad0d5e6f557315096ed28a8ee856fd93f397caf1981d78ff1822c03fb2d3b22395e1b440e2d1
 MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
index 6ff9091f8631..99e799372528 100644
--- a/net-libs/openslp/openslp-1.2.1-r3.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r3.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
 
 inherit eutils autotools systemd
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index c35ff61807d7..d8524e0c0196 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index f41d437d410e..1b765349b633 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index b19a998365b9..c611124e218f 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -1,3 +1,4 @@
 DIST signon-ui-0.15.tar.bz2 60278 BLAKE2B 9674dbfb184249a8a88fbdbe07e6e1c3d070b3e7ca42666a99ae5cdff31ceefe6a45cde533d77234194dc294722999c48ac16dcf6fe0e67a6ce7d53c711edfbc SHA512 02167d48cec3efbd1b0f39f65732742416b46e638a888a74df02bbfeb6deaefdd81549c8cee1a80ecdc8a9f9d0363a6935e8f105bec40bb798af5cc19a74bf03
+EBUILD signon-ui-0.15-r1.ebuild 1015 BLAKE2B 7e3ca87104cc40d0be5869601f4e7582143ff15d587cd32bcf840dd489524fe6b38604521395e7307283eb54ad5a40a77a595ef53f5609e9aeda69a153b4cba6 SHA512 341e8d25a797d7bb92a04137c73dfcb64775184b9aeca531a1d440b862c8cbe2fb33154671c2649c663adfcafb2d9f255a29bc4163d8008be7345ec29a04d738
 EBUILD signon-ui-0.15.ebuild 935 BLAKE2B 6e47e38b1c076aae9f6689b64754e288b8423b3ab5debb51299dda5e5b38f17fe25f0f953c0bc86f62f7c969d097854e8c3ede9df75f5d4ffc180e4ea7524c45 SHA512 f4771fcfc9bb0cca68ea0f6e0d3681b3d4e508b55c22ec8bd7bfdd40b5063ae705839463b237e92eed89482a280024955c95c15e3501561d47c5d8b03ba78ce9
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/signon-ui-0.15-r1.ebuild b/net-libs/signon-ui/signon-ui-0.15-r1.ebuild
new file mode 100644
index 000000000000..d2b2a02363e0
--- /dev/null
+++ b/net-libs/signon-ui/signon-ui-0.15-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Online accounts signon UI"
+HOMEPAGE="https://launchpad.net/signon-ui"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RESTRICT="test"
+
+# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/libproxy
+	x11-libs/libnotify
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<net-libs/libproxy-0.4.12[kde]
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e '/^SUBDIRS.*/,+1d' tests/tests.pro || die "couldn't disable tests"
+	fi
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b1094bbfe789..13e5c0ac210f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -10,8 +10,10 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3
 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
+DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
-EBUILD webkit-gtk-2.18.5.ebuild 8282 BLAKE2B 6a26be83bc96b53fb1534a7722f645e26cb64b143ea444df632b3c6a33fa989e8ab1d770b5eba4eacd595e14391ae089379f96938d5f57faa3332ea05c3c3b1b SHA512 8337581e0e02c0008c7dde6b4e6e38f3de30e04cbc78a2650327786c623658dbf1810be8705471bceb74b4f543162d9388a78ac31a617730d95d15af9b7a3e19
+EBUILD webkit-gtk-2.18.5.ebuild 8283 BLAKE2B 746803e8799d8125e39fb395b8ffdeb4bd0e34c969bec79b264974aead813a7e73a1b6c4d121bd34ee42a060f970fe0966c1272fac4f723cb71e669d8425af9d SHA512 93a751dc658101a97ccff5ad637e317200a21b0faabb42a35502a5b40b850ce23ce843f6bdb5de08fa5cdf991ebd91b780260b9a5130a8def2c4191b295a4b74
+EBUILD webkit-gtk-2.18.6.ebuild 8285 BLAKE2B e9937008fc089687a6903593651f4a9dddbf5a5090d88ffda3f88a6ae2b21f94bd6a2a5605520091b0c5e0fe70db9ecbd15f658fba4e58121222a3a127b53cd4 SHA512 33e38bebe2027cb9cef7d2f1492ae318fc6aa212204f86b904a3ea921712cc20c6c1778f6fd5264b5210a26058826b33c063b7f2180e7f30e61aa3340acd5beb
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
index c49d26d006ae..1d2bca38691b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
new file mode 100644
index 000000000000..300736415c52
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index dbf16743fc0c..dc9e4811406f 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index f8fab73bb314..2af490ed7573 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -7,17 +7,14 @@ AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88
 AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
 AUX cyrus.rc6 460 BLAKE2B ea05165af565d6362ec23b08c80b03573ba8ef6aa72a17631dc2f795cafa96a7f992c00115cf3c438e6ff61138f245adedb614195ae51faf01281475d994335d SHA512 926aa90c5285ed05bbc0cef5c4351acef26e70772bb7a0e490c05a9a4ce9e808e250e19bac1640a61852fa394e42368d33f88ea9b0b8d1751224daef04350920
-AUX cyrus.rc7 459 BLAKE2B ad164576c7bfb70b4086ac077e6bf0407888365e1c196d4f849097f8bd5a4fc60152006d764f6d535a5c4dc526cbe84553e6abbb767d431a0d50250aa63f03dd SHA512 acd561be944aa5ebfe4f89f19552b61416ee2355f37cf2c3d6e44294d7079e382a3e4ba2ce606842c283ce8c02cdc8c6dbbd4b08758d8e99f74fe8a258b89ca3
 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
-DIST cyrus-imapd-3.0.3.tar.gz 10819454 BLAKE2B 5f86378e37c39c5f6fb6f6280d0b0a500e671cbe29968f1579c6be59e15335e1b36b0d119e03bc683ed17b594ddebc7d0cd5588f762062ee9a01f8633e7f12f7 SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
+DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb
 EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1
-EBUILD cyrus-imapd-2.5.11.ebuild 4709 BLAKE2B b747381e94ddf12d2a9728a8587e90e1a95bcb6acc1c9a50c3c12dff9263556159626a83f753190978cb2b5d8178c317ced0cbb0b0d98cc9a9f54fc460faf3fe SHA512 a07326ba69a7f81d900838e4796f85c90c00aaf16385818b8d3f47f70e77ff9a2de135a76effda42db5656b96f70c3369632c1138cb5fd377a2b8507da6e9d71
-EBUILD cyrus-imapd-3.0.3-r1.ebuild 5754 BLAKE2B f0f0ce5188675cdcf38facdc6c12ddb92322087475fc035b9b3c5084a39de64b6a50bff295ba01eb504634a4d7bada65421fcd0d5a8854ad8c09acf83570b866 SHA512 d345ee957cbeca761b6bc6f60fa4c010e2887f73a08cec49c16fb7082450258d3d900856e6773ba9ffa7fdba5ddf061616adc626c61b44e6f98b1dea8c218a1b
-EBUILD cyrus-imapd-3.0.3.ebuild 5702 BLAKE2B 49532668ab5fc591f0d35862afc61e73f9ab00faaef944595d64a82fcbe404a1e00cc166c592e13f902d6cb3bab86fedc651397b94f9625ff2642526187608eb SHA512 35aaa7a6d27ac8186fde64371b9866cd1683e923d31a04cf2a11207955e0b92a181fba5a2707ccf8e4dd3906a7041046c9254fd09b18e6f110a58416e98cdecb
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
+EBUILD cyrus-imapd-3.0.5.ebuild 5946 BLAKE2B 47bd3523d9a8f915df052c40cd9145bc60ee5acefa39bdb0921b983790d48c1692b365beded17e765f68dc04fc56b1a48597cfa95aa47cfee99b2a9925f042da SHA512 93e5f2d9c9410f157aabbe3abcd8e415628a412ea55a2f74493c03700e1d4180e108aaaee9a3d1a7020c81fd5cf0054f67d67a55d15976ff95f9469b73744f7a
 MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
deleted file mode 100644
index 5ed4f1309661..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild
deleted file mode 100644
index 6743077fa02e..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	afs? ( net-fs/openafs )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	jmap? ( http xapian )
-	sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
-	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
-	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable jmap) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var//imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc7" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
-	ewarn "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
deleted file mode 100644
index f4638e0cc79e..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	afs? ( net-fs/openafs )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	jmap? ( http xapian )
-	sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
-	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable jmap) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${P}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${P}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var//imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc7" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
-	ewarn "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
new file mode 100644
index 000000000000..13ed85c3a1d6
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	afs? ( net-fs/openafs )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	jmap? ( http xapian )
+	sphinx? ( mysql )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# bug 604470
+	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
+	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
+	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable jmap) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc7 b/net-mail/cyrus-imapd/files/cyrus.rc7
deleted file mode 100644
index 348b01c04921..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.rc7
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	use dns logger
-	after drac saslauthd
-}
-
-start() {
-	ebegin "Starting cyrus imapd"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/libexec/cyrusmaster -- ${CYRUS_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cyrus imapd"
-	start-stop-daemon --stop --quiet --pidfile /run/cyrus-master.pid
-	eend $?
-}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a042c90f112d..9b3ca7b1e8fa 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,5 @@
 AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
+AUX dovecot-2.2.33.2-CVE-2017-15132.patch 582 BLAKE2B fdc4cf138c3c943ed34b520a3935fc3d941063fdd64c4dd50a1d03f9374e79062a14b35b9894bd8744e640377c493fc0641c451a0da695a52f893386cbb3a443 SHA512 be433223e55859199c5dd651286a634fec03b7efcb0221297139154383dc71c30a75fa8484ae338babc8ec2f9a1a4cf0aeebc53cf1d7286272a663068537ccfd
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
 DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e8543a560b474dd4cd028d0a7bd1cc02e45c879bc2e7d636c2543e8aed3bd8e0b49b260703590be44fd1032ba3e1f4eb87a8e6f8ecf396 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4
 DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39
@@ -14,7 +15,9 @@ DIST dovecot-2.3.0.tar.gz 6635541 BLAKE2B 3c76ccc0fac19511c9852aabd5d86c2fb81589
 EBUILD dovecot-2.2.19.ebuild 9085 BLAKE2B 6f0bcda9ec145e8ad90e024fbe38f4036ca4ff632a7281bdaf1f292d148b63df587ea380a7df8bcf0bde2e5aa9e4ca6200f2159b61923fe93710f7c30dc230d3 SHA512 cb619f9f5588ab1be1b5de749663e4798044d695a359c96182037c8b3cdb94c8a7b41eac93054f2979b30d09405a3396e83d0d08cad3ad964654ae98f7632098
 EBUILD dovecot-2.2.29.1.ebuild 9214 BLAKE2B 4107278bc4fe19d5ea04f1e7218ba4ce7f4fbcc7521d04d018433934b23f46480bb62a2c00f6ec324e8d32ca2fdc7064f19c927d4285460f8f357e28f5f4f307 SHA512 e278bb8f734cc648ae10b34615ef08b3bbd4e070dda898c85ec5b48dde22b6475b266470cbba41f82b33969ad2f55fc523d6a2df9a3f74dceaa14e015b8b5ccf
 EBUILD dovecot-2.2.32.ebuild 8654 BLAKE2B 46aa411f0cab5d3ef96127912d59e23d72a8b4149afed4f9e7fbbb39397f75ff1a4369d10e259287ff0c5bf6b8bbcfe8de19f4940645ba315ab2a0c9c692668e SHA512 570c9c5e20344a3c941e7b13a3dd1be6150967a108f15150d56dbcd6852e08a67a4b975259fabb8bdb9ecfd1a5dd3cbf94b19c13c5482cc39dc2fe23bfb77a80
+EBUILD dovecot-2.2.33.2-r1.ebuild 8717 BLAKE2B 293456634a74b240d0dd8e06f2929b53a101fd1d91ac1faff53b89449bdab7b5c3d3223a2761188123010738e8e7607f138a6db6f6f29a6139d5efcde682e93b SHA512 4dd6f96f611668fcac174ee055529fd910f42d79fedd3bce465a9ce354a650a4062b7fe202b1a2a3edd1fd1cc5fe74ef64ecce3e437a0d8671202a8e652126f6
 EBUILD dovecot-2.2.33.2.ebuild 8659 BLAKE2B cbfd45f4ac3642de86f543fafb39e91c67ee27eec6d67f8e862670f8a125e7d4c9dab55771100db357dd8576c6fba1d6ae825c240f7cf803a95e141955a183ce SHA512 6c86a0ade4f80b658e162b7518f5bc543c2b51008ecc33894432a22b7de1b2b78a11fb38483630f1277bd89c60d6a119f5a4400d11d5d4f9c9505b2484d2ad47
 EBUILD dovecot-2.3.0-r1.ebuild 8684 BLAKE2B c8f291c972ea59fe10c7cfe1dc4bbe49998aa9e1764c18ee95825a9dc91e05eec64e4e73956a61860989341b94a4c3688ff6ead414bd36bc63c7ae01ec7efe73 SHA512 ea6b08be76fb43c4a66355daf9ae1e73e51bf5f6b39d9638cfad112e434721a58fcea99936fff6a332c9a39518c797daa8e023bbdca96d1633a508460977ae4d
+EBUILD dovecot-2.3.0-r2.ebuild 8747 BLAKE2B 2e89b81e959b7e7350a407f41a6a826d34b5b087c3d2f6e4b112248084cef9fef1337140b299ee42dfcac016e302b98dfefe733b27a54064252309ef9b05744f SHA512 76ce6c3d0cc7b22189d51c6f87a631f44381bdbc23c3dd29c9f94b40fcaf9e481b8e8a91d55816e9d1c6807a878f4362dc8fb3034c4d066ff0677cc265a95577
 EBUILD dovecot-2.3.0.ebuild 8682 BLAKE2B 8e68158b78c35696390ceb4d9d235e2b42b3c021d42104edc02a1b0b7317194ba8ff378ad13e1dc2b440ca9bb7bba6cb77f7bc27e1468468a9ca5b733ef73be2 SHA512 c0623ef0de56297328fddb614364e2500bda86237997042b0e3f75692e994d23f743769333c050cc13b7d0cb71ba67cdbaf15df6be1aefd2cdcae1bd94467a4b
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild b/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
new file mode 100644
index 000000000000..c45f29c7a8b2
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.21"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+# Dovecot does not support building without ssl.  Force it for now
+REQUIRED_USE="ssl"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
+	eapply "${FILESDIR}/${PN}-2.2.33.2-CVE-2017-15132.patch"
+	eapply_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--runstatedir="${EPREFIX}/run" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.3.0-r2.ebuild b/net-mail/dovecot/dovecot-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..bac241d30cad
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.0-r2.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+MY_S="${PN}-ce-${PV}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.5.0.1"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.33.2-CVE-2017-15132.patch )
+
+S=${WORKDIR}/${MY_S}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch b/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch
new file mode 100644
index 000000000000..3f87e71b559a
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch
@@ -0,0 +1,14 @@
+CVE-2017-15132: dovecot: auth client leaks memory if SASL authentication is aborted.
+
+https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060
+
+--- a/src/lib-auth/auth-client-request.c
++++ b/src/lib-auth/auth-client-request.c
+@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request)
+ 
+ 	auth_client_send_cancel(request->conn->client, request->id);
+ 	call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL);
++	pool_unref(&request->pool);
+ }
+ 
+ unsigned int auth_client_request_get_id(struct auth_client_request *request)
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index b1cb2faec9da..e833b563a8c3 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -2,6 +2,6 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
-EBUILD mailbase-1.1.ebuild 1661 BLAKE2B 8ad4b2aad1f2f6832c4001f882222bfc8dfd4951d4ad03bd69043d7ea9a5d6bd1aaca919b349ebd5833c28fbec147ab4c6c9518e8321dfdcf3bf4c726b5b3d49 SHA512 85c9fbb1cf3ee6fb0725d810bb81eb5304e63b38dd5c9ec80006c26610ba02d632cc365d8ec04771c641642a26c58744f009a8ee3f5313fa92814901a5b25047
-EBUILD mailbase-1.ebuild 1612 BLAKE2B 9ea211a170b8fa75fe5d6017dd28acdb464923e3240961a900a32d997dc38cbde7dd6bfc41b28c1ea91b2b14c272348ace87f830889214b051036e4f5d4887f5 SHA512 ecc5194b4e35b628e9527883795f34c458550b4400ce97d37524bb0b92487f7607dd08c011f042fbfcece3cbe03d57f2476140b2436414c759e016bf096c2f4e
+EBUILD mailbase-1.1.ebuild 1649 BLAKE2B ff86ef5635b5949e5206a1440f83a88470e196e582f24c3edf42df8785945478ebeb86a3a100b7bc21c67cb4b7192c4ab229c697e9b96435c4c1db23f216641a SHA512 aeb1691751341563425227aa59bb9a37d3757cd49d46b0acc6226ef5da6c10748724f30f53c27894e2f3d3e25ddaeb9dc80ad51e1e09fe954a5750b60244107f
+EBUILD mailbase-1.ebuild 1600 BLAKE2B 7e88dbe5a9ba19db0d7d20c74d4c65aeba7eea4649e7305217c37173c8a8b7d8f8e9fe6f64c9ba6846fcd20118b3f6e7af96bb190523598c7acf634b3e678c05 SHA512 2e7f91fefd121b0bc11ca452b58dfca0775ced5052ddebabdfc4faec8e37ed7e65046f0c22180a2dc18acc64299f1859e6a67b9e7a67456052e96e08c3ae29fd
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mailbase/mailbase-1.1.ebuild b/net-mail/mailbase/mailbase-1.1.ebuild
index 27f616b73131..b52feae98d2a 100644
--- a/net-mail/mailbase/mailbase-1.1.ebuild
+++ b/net-mail/mailbase/mailbase-1.1.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
 
 inherit pam eutils user
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="pam"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
index b7b4232af149..ac83f04559d2 100644
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ b/net-mail/mailbase/mailbase-1.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
 
 inherit pam eutils user
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="pam"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
index a74042d67848..282bae023275 100644
--- a/net-mail/mailfront/Manifest
+++ b/net-mail/mailfront/Manifest
@@ -1,11 +1,7 @@
 AUX run-pop3front 269 BLAKE2B 6b5489f24331cc059359c07919efad67759854508e8f544ad50bb567940a7fd62730b61f92652e7e91af147c6911058ec91c16960e2d3b68cf25b0f043fbc292 SHA512 87515965e39f8436965704054cdb35a1665ea21080b01a27a4442af7c939307e093ddc85edeae2398b29b21bd867f9ef557c9abccc6b4318304f620ed13e3a11
 AUX run-smtpfront 461 BLAKE2B 6b247811ecb101995a3ba6e7b7a15174020a8a16296e7d5ff93f3e7bb6f4d18998b79ed4aca4135ed3f4dea71dcc681d23e30bb35f493735f47da91e666633b3 SHA512 c8c1301d1972d4a415e549f0b9702e3670b44d258ceca606e868592d36f9cdc15ed587c25d24f17577a4d2934d59a3639a6ec66e11f9f00ed54716bdbd6dc4da
-DIST mailfront-0.88.tar.gz 61406 BLAKE2B efe303944da6d80e020ef307189bdf4c4e4b34b0abcc659896c307443c058a802d6cad0a00ef655d54b740eee2bfa4b83162689f084fd9336c3c33f91b446234 SHA512 551b9f515f3a06dd203ed353cc2623a9b1612834b1e6126a075ae2e5a1f6e1f4b2742e7458e26df6d09cf72d1fc512b585bafe03b7f93e069fe33af738b21d0e
 DIST mailfront-0.98.tar.gz 77981 BLAKE2B 1729dc60954fa3337bd7be841050886d091fce4a685e928e61c71e70ff30c473f1dfa7e8d59298ef5790cfe165e91c6827c885c423a74cd9cbe5b0bf4dead233 SHA512 ea0e4352219cedad650787dc38ff11d76484cdaef0a4fbd3e51e68f0c0a7676cd591608658ee4f342dfa7e801c67c8a9bd862243fc9b1e776c8b2fe863faf178
-DIST mailfront-1.12.tar.gz 104598 BLAKE2B 1499d3c79641f54a06b101e4d50fc5e3cece0694d0b6f566e75f4f09d84a035e90758eae57532f301c9bd938a1fb0fc7e750abfe3da3d87cc5fe983ab84c8661 SHA512 26a5dc791b810ecb9fa262d7263499774201d1a2aeaad997e959daa2cb9ed35b49a12800df29ea17136e32877a4b81bd93998da3748f7e25403f35507a9ca898
 DIST mailfront-1.16.tar.gz 108212 BLAKE2B 3b3bd3481b572eb48701a2df71a455838430f615332d7de2d4b3c6beea2a0d3b677cf6907bf975c31e7b2fb6cd60aab5ca45a566c515d2b645553a90391d773a SHA512 7f718e9c3b0f0cb4c5fcae967858f2d3597081c9e8e11c5c5e86f147c3e49e338d20acecccfb83d2db4b7e7a5b33f4cc21b0a0c2f71bb6ab8c71c76189281b2b
-EBUILD mailfront-0.88.ebuild 1850 BLAKE2B ecc69cd457c02a72dbaddd0ad20d3dd8326ee3f332800cb0ea97d067d67733640ddb2c984397c3f3ee43a761892482b0dd3099406fb5e6fce8f2a8cadd079b64 SHA512 bf0d2bbee2bb92b71f15579cc2e4d47da0ceebebf6dfeb25c3e08b1686781dd903054885d3a49f209072c666514797d5af6cede49ef695ec3752033a15f30686
 EBUILD mailfront-0.98.ebuild 1552 BLAKE2B 8a49a3ccd3cf0ec4cdebd01335deb0b6a64618d67278895b427e8dd06dc9ba166c19e08b4036cbceb80b153b796217beba80fb504a20d952b77c01f95f5f5b66 SHA512 cef2578f463f5828e65726a3c5aa3a3363f410f9cfc15493f4e4bcc6267e68bb03a280708992e4d9f504eac95b75ed107792c3a96d7e5bfc43851f16c473a8eb
-EBUILD mailfront-1.12.ebuild 1731 BLAKE2B 26b82aed89530b8c7678bd1062933c9c097d12f02f0e27f967139f106f7b8fa9e0bfc7539a4eac19e8aa8b8c565f0a8095f5b5fbf71706b8258bf6fbab97ce7e SHA512 7bba4392e6f535fd71ef00c2fa1a6e4852c6a5285f0c4002a15cec032a85da301045e986e07ed75f117c2785d0710943b325c5d289a710ee22c18ecd9e16ea93
 EBUILD mailfront-1.16.ebuild 1721 BLAKE2B 748ed1ea88a1db8ac72945f88b3bcbfafbdcb7d723495453bddd60f335679df4dd8aaa4f87b15b07ca93f79900cb87c49bd96faf19bce3885c7ca1d8471ac5b9 SHA512 a2b45ef2e4bdbd042af29745c0f8aa44d18d968e023678a8f31afb8bf96f3352c341370be474e6b1bb565374b578e2b82a187d30724d30980f2c4de985fa6cfb
 MISC metadata.xml 564 BLAKE2B c0b74f117dcbd1697fc64d36b6d9df70a01fa755f710b44eddcd9c4b8db7d0ddb6a3f5e727db81f09d41cb59fa2fac5aa17b7cc54af76c65df1383b20c14a185 SHA512 5815bd67c538d4105eb0c38089caabc01ed5b02f79f9382253b92a0720c6ff5aeae8dac311db316c91c8558b14b0febb14c8fa4b97347f1e235d987acf2e862c
diff --git a/net-mail/mailfront/mailfront-0.88.ebuild b/net-mail/mailfront/mailfront-0.88.ebuild
deleted file mode 100644
index f95422c8171b..000000000000
--- a/net-mail/mailfront/mailfront-0.88.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails toolchain-funcs
-
-DESCRIPTION="Mail server network protocol front-ends"
-HOMEPAGE="http://untroubled.org/mailfront/"
-SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.006"
-RDEPEND="
-	${DEPEND}
-	net-libs/cvm
-	virtual/qmail
-"
-
-src_unpack() {
-	unpack ${A}
-	ht_fix_file "${S}"/Makefile
-}
-
-src_compile() {
-	echo "/usr/lib/bglibs/include" > conf-bgincs
-	echo "/usr/lib/bglibs/lib" > conf-bglibs
-	echo "/var/qmail/bin" > conf-bin
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) " > conf-ld
-	emake || die
-}
-
-src_install() {
-	exeinto /var/qmail/bin
-	doexe pop3front-auth pop3front-maildir smtpfront-echo \
-		smtpfront-qmail smtpfront-reject imapfront-auth \
-		qmqpfront-qmail qmtpfront-qmail || die
-
-	#install new run files for qmail-smtpd and qmail-pop3
-	exeinto /var/qmail/supervise/qmail-smtpd
-	newexe "${FILESDIR}"/run-smtpfront run.mailfront
-	exeinto /var/qmail/supervise/qmail-pop3d
-	newexe "${FILESDIR}"/run-pop3front run.mailfront
-
-	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
-
-	dohtml cvm-sasl.html imapfront.html mailfront.html mailrules.html \
-		mailrules2.html pop3front.html qmail-backend.html \
-		qmail-validate.html smtpfront.html
-}
-
-pkg_config() {
-	cd /var/qmail/supervise/qmail-smtpd/
-	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
-	cd /var/qmail/supervise/qmail-pop3d/
-	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
-}
-
-pkg_postinst() {
-	echo
-	elog "Run emerge --config =${CATEGORY}/${PF}"
-	elog "to update you run files (backup are created) in"
-	elog "		/var/qmail/supervise/qmail-pop3d and"
-	elog "		/var/qmail/supervise/qmail-smtpd"
-	echo
-}
diff --git a/net-mail/mailfront/mailfront-1.12.ebuild b/net-mail/mailfront/mailfront-1.12.ebuild
deleted file mode 100644
index 3ff971dea19a..000000000000
--- a/net-mail/mailfront/mailfront-1.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Mail server network protocol front-ends"
-HOMEPAGE="http://untroubled.org/mailfront/"
-SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.106
-	>=net-libs/cvm-0.81"
-
-RDEPEND="${DEPEND}
-	virtual/qmail
-	net-libs/cvm"
-
-src_configure() {
-	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
-	echo "/var/qmail" > conf-qmail
-	echo "/var/qmail/bin" > conf-bin
-	echo "/usr/$(get_libdir)/mailfront" > conf-modules
-	echo "/usr/include/mailfront" > conf-include
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} -fPIC -shared" > conf-ccso
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	#dodir /var/qmail/bin
-	emake install install_prefix="${D}" || die "install failed"
-	exeinto /var/qmail/supervise/qmail-smtpd
-	newexe "${FILESDIR}"/run-smtpfront run.mailfront
-	exeinto /var/qmail/supervise/qmail-pop3d
-	newexe "${FILESDIR}"/run-pop3front run.mailfront
-
-	dodoc ANNOUNCEMENT ChangeLog NEWS README VERSION
-	dohtml *.html
-}
-
-pkg_config() {
-	cd "${ROOT}"/var/qmail/supervise/qmail-smtpd/
-	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
-	cd "${ROOT}"/var/qmail/supervise/qmail-pop3d/
-	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
-}
-
-pkg_postinst() {
-	echo
-	elog "Run"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "to update your run files (backups are created) in"
-	elog "		/var/qmail/supervise/qmail-pop3d and"
-	elog "		/var/qmail/supervise/qmail-smtpd"
-	echo
-}
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
index da5dc2d72d6d..5efe0e03876e 100644
--- a/net-mail/mailshears/Manifest
+++ b/net-mail/mailshears/Manifest
@@ -1,3 +1,3 @@
 DIST mailshears-0.0.3.gem 68608 BLAKE2B 9130661793dff215bf2e4d98574a5a001f48a60dd2fc66475edaf1e381eda4cbcac7687158b2103958bce4954ebe23b8a1398029be779f7c716e33ca95c500b5 SHA512 4adeaf78c610111e6b32f5d5fd090476cec228a89462d6f70f0360d4492e08c49f672051b2520a98b07958b865b28593c31f595e4283c334eb97eab1d7c3e5aa
-EBUILD mailshears-0.0.3.ebuild 662 BLAKE2B 8dffefd5f4c13c035789e5e5760baa65dfbae6f382ec8c70ba12b7d70952cf82bc7927e3d66ddf14d08417eaaf7fb175ccef3fd809aba18ec958a2f55be3ab61 SHA512 c80ce1cd34adf73151d69ac2ab5491b8112e496ad6ff8907c009b7c408b26b8fa5b0e8cf73096aed426c92dba40fb5f279fa92dd96c641abad37f9c3edc7d191
+EBUILD mailshears-0.0.3-r1.ebuild 664 BLAKE2B 9bfe2663b753bcfa6d47b940d0dce192f686cb37dd71c11c891053435423dd9a526738d767db52490b0adfdae5007677cce5b78335665dfef8df27f0ea2f7ab5 SHA512 da8f81879a0acc81b702a0a6f9f2234340984c827cb756fa6eaa954103883eaddabc393672f12dfd97ff276b1bab13d8291bec807252561da6673debcb58f5ca
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-mail/mailshears/mailshears-0.0.3-r1.ebuild b/net-mail/mailshears/mailshears-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..bd4f4aeb5b6e
--- /dev/null
+++ b/net-mail/mailshears/mailshears-0.0.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+# The tests are dangerous and shouldn't be run by anyone!
+# They mess with your local postgres databases.
+RUBY_FAKEGEM_RECIPE_TEST=none
+RUBY_FAKEGEM_RECIPE_DOC=yard
+RUBY_FAKEGEM_EXTRADOC="doc/${PN}.example.conf.yml"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mangle your mail garden"
+HOMEPAGE="http://michael.orlitzky.com/code/mailshears.xhtml"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/pg-0.17 <dev-ruby/pg-1"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman "doc/man1/${PN}.1"
+}
diff --git a/net-mail/mailshears/mailshears-0.0.3.ebuild b/net-mail/mailshears/mailshears-0.0.3.ebuild
deleted file mode 100644
index a048675f8e59..000000000000
--- a/net-mail/mailshears/mailshears-0.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22"
-
-# The tests are dangerous and shouldn't be run by anyone!
-# They mess with your local postgres databases.
-RUBY_FAKEGEM_RECIPE_TEST=none
-RUBY_FAKEGEM_RECIPE_DOC=yard
-RUBY_FAKEGEM_EXTRADOC="doc/${PN}.example.conf.yml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mangle your mail garden"
-HOMEPAGE="http://michael.orlitzky.com/code/mailshears.php"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pg-0.17 <dev-ruby/pg-1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman "doc/man1/${PN}.1"
-}
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 60d0b048b47e..b59cc3e8a0f0 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,4 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 735 BLAKE2B ceb05317ccb56ba85498ab78b4a23614645880804d334daf8cea8d1efd48737b015b885102c9de5bfa4f824034d1b4678768f3f18a91e9a5863a52d45ee59c3c SHA512 ce99769a504fd54aa517e63c96d9df17bf35211bf65643ae008a799e963b034910f061b4c72b32f05fc074383e39de89b357c978193f1011d5d6e8f1ba5381f1
-EBUILD queue-repair-0.9.0.ebuild 638 BLAKE2B 286c40dc7a323c7f4068eb4c4dab760bd1891f438c176649120263127c8b7894a2a7710d725bc403adb0fc8d06c43f0115ced3ebbf0a8bea41989268efa0ca0b SHA512 d6eff34fd75b07426d5d52b0ede25aa8be7f2b4b1909607b890cccc0087ee575355e7065dbacfa15637d4360996a0c8e26011544e57efbd5dcd40ee4498eaa4b
+EBUILD queue-repair-0.9.0-r1.ebuild 726 BLAKE2B a3a9d2ca88e602154cd5035707c854ee24556e4cf3f5a71b17aeab50d88861b2df8df132dc7a3dc74c9bbaa88190ecd85c87e2328842da27ffadc0981d675099 SHA512 2b993f5d3f94b632654c24594fc174e5354c06b5a1122dbc606944c1e5c991b006ecaa0ff35dcbc1d84c9dd49b25c3b15e08643b5b9888298da817addb36f3ed
 MISC metadata.xml 543 BLAKE2B a2923d984da9728c183f5672e4199d2b0b9ae8c8a90553e6029a631184812a4167ea092f53613eb9266e31b895be8172f201f9347a9a0dcca72ff42bf17f6e62 SHA512 ce15418980c9dd62654e82f4b3ae07e55da17d3efee6bcac1bfa5dbe9a76b25736f51cf38a347783aa33b2ec82e41075de8e98d0ef0720919a0d36180396118e
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index e57585437cdc..c53b8f26c1f0 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.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
@@ -24,6 +24,6 @@ DOCS=( BLURB TODO CHANGELOG )
 
 src_install () {
 	python_newscript queue_repair.py queue-repair.py
-	dosym /usr/bin/queue-repair.py /usr/bin/queue-repair
+	dosym queue-repair.py /usr/bin/queue-repair
 	einstalldocs
 }
diff --git a/net-mail/queue-repair/queue-repair-0.9.0.ebuild b/net-mail/queue-repair/queue-repair-0.9.0.ebuild
deleted file mode 100644
index 3a25dbdca27b..000000000000
--- a/net-mail/queue-repair/queue-repair-0.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
-HOMEPAGE="http://pyropus.ca/software/queue-repair/"
-SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_compile() {
-	:
-}
-
-src_install () {
-	insinto /usr/bin
-	newbin queue_repair.py queue-repair.py || die
-	dosym /usr/bin/queue-repair.py /usr/bin/queue-repair || die
-	dodoc BLURB TODO CHANGELOG || die
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 415969730cd1..e8d6df14d869 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d7ab0ceaa5f4..fe4b942706eb 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -15,9 +15,12 @@ AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2
 DIST asterisk-11.25.1.tar.gz 35125897 BLAKE2B 42f79202c3e69dc0ff1ddad909c87bc0a0dd3c74bc674fbbcf339e00fedf829f7dd1ad5922fae82d26abc37cd62a44061a917861a2ee9b2fa4e26bec748b0aae SHA512 37144b7296f929bdb707853690a12d4c1403741221c943becc88c18fe20587ba2381425574e97647c10efa9f98200336ddae7e3433740e5a509a837ed28ca02c
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.17.2.tar.gz 32899368 BLAKE2B 539155dc4b9db3cd736fa8ca4e4b1f09330be2d7bc994ee89dc73645f411bf6d012d85f322c07146bac2b5b258802232960d6e102d840d6b48b796a7d8923513 SHA512 008354cb0cba679444bfbfd4be34d919ea0a0a0cbd60541b7528d254ab0fa92efee118d5b006e8dc7b709f9c44fd391026df9b8705d17515494a23ad36dedd4b
+DIST asterisk-13.19.0.tar.gz 33027887 BLAKE2B f799f51dc4b45d6db2261abfae33f41416616650702ff0cf6c253a80cf2f554f180df9e90bd107ac6a29eeeeef16e3bfadba087f6485fa93978899590b417443 SHA512 5404080a42e2d6d76b8fa8629c9570ae55c943676c51901a34552dc69c35f82001a1738e2da3adedf1de254bc8d1821ea7708f844685462ecdd1fd4e979e0e7f
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 BLAKE2B 788b923300324241d0272b2533cbad5b18189fa46f0ed620256aadb2a840880dccb66f839edc323e90c46bb3748127caeb59b84b017722491c52e6f5f6dcd8f0 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75
+DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
 EBUILD asterisk-11.25.1.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-11.25.3.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-13.17.2.ebuild 9724 BLAKE2B 51e9c924c2dadd043c5c259a9ccb6a6041e4d2ac3b477dee4c41a3db57f821494d24e30970cd18bbe20abd0112e5c5f8787e41fcc8483ffd66c0418eca446974 SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e
+EBUILD asterisk-13.19.0-r1.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
new file mode 100644
index 000000000000..e0b88a37696c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+	pjproject? ( >=net-libs/pjproject-2.6 )
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio) \
+		$(use_with pjproject)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
index 3e0fd38945b9..4978c1e2947c 100644
--- a/net-misc/bsdwhois/Manifest
+++ b/net-misc/bsdwhois/Manifest
@@ -1,3 +1,3 @@
 DIST bsdwhois-1.43.2.1.tar.gz 85895 BLAKE2B 584bec2f58deee1208b35df1dae0b638049eab990cade979f56022b701d24b2cd653feb381f79e89610246743c8b20df2c7b83cffec68e3a00a9169c79edd7e5 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc
-EBUILD bsdwhois-1.43.2.1.ebuild 512 BLAKE2B 134693354040f851dacf7ccae129cff9a7f98fafd00039e3d1b226e16bd127a95608422c28ff119614ca7a87383d2bcb4f43dc3b3ca4028ccb22b6575daf7601 SHA512 79ed1695441c987880a99495e5d3e2dd0181651541ce8c3c7d160a60e113f8822be83aa36226f63610812272df22efb53e60a24d5cbe08c44643ea96a366c964
+EBUILD bsdwhois-1.43.2.1.ebuild 500 BLAKE2B 5ce0d4300c8466c52fee48c39b09821ce0883594ef03f20ef967c1577dc7fe81525cbb684e2b0e25febad5102c4ed881cca9968efc62ed9f6f5a13bd37de56e9 SHA512 658c6ef63db40d18b8cfec9d63dcc25a8f564a0c93758eacd96755b77c5da5ca0fc16375bb32bc0d072b01a1831e4540ab40b2eabb9b3228aa78ab04cc3e602e
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
index 65052de2ef7b..554e2ce63e76 100644
--- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.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=4
@@ -9,7 +9,7 @@ SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="userland_BSD"
 
 src_install() {
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 04a50e10e579..cc01daf85f79 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,5 +1,5 @@
-DIST cmst-2017.03.18.tar.gz 2554106 BLAKE2B dba302df4997c0a3fb6fdf5f509e8e7199c1e239a27ccb59ece23563e40fca5f704e4883fcf0edd909f6490b118a331b892cc8cfafba41c181192fac5f6fb929 SHA512 af89ec2044ede191f204281279f07cf4ca7bde5d5b7409bccb150fa1ac4d1efe1dda41f6e57bff57e50ac11be25fbd1d5613acec17d198814e52b43a56dd1ea9
 DIST cmst-2017.09.19.tar.gz 2554672 BLAKE2B 7d47df83e3c576ddc23313154087a4dcb9b4a43b2c140338abc196d1ebf2e32a5c76652dd088e67911bba33052ecb447abf2f6431ff052e557d4371e365a8418 SHA512 3ac92c60572526f08206b0f175ed3adea839795f69dccfe67b3a8bc3ddea82e62e46c4a1acc4283d331a3283c8c1be79b34477b2c937720b05b6ec6a07da8088
-EBUILD cmst-2017.03.18.ebuild 799 BLAKE2B 08494c5afc08c56905d65c8e64ce3e1f658538d3b348b24df1a4fb1402cf421e6901e18902aab59c1bcf684b0151052dd849cabfa020c900f7318e2b0be09bf9 SHA512 0d518e505e42d2212bb06496e32de37cafe10d48678510535ad3668c8a21d6f4b3b83561c920975e1268aa46dbac17fbc5cd4ba8fa646ca9aa0258b7b31dd4d3
+DIST cmst-2018.01.06.tar.gz 2556728 BLAKE2B f718c85467bac2d7a42b478f1d51ba71b1453c5f00fa574884bf33d4efe669fd4558394b6132208f708f34ee7be2b7458dd5e8967edb557cb54c846914ca9e0f SHA512 abf6b4cb81c91e2432e0891bd9e5481d2752833a1c7eda1abbbe1bf456b35d422d3f02e6f2db328aec888d9a92cbd41862faab46b8814f3efca843f0a1d4e02a
 EBUILD cmst-2017.09.19.ebuild 799 BLAKE2B 08494c5afc08c56905d65c8e64ce3e1f658538d3b348b24df1a4fb1402cf421e6901e18902aab59c1bcf684b0151052dd849cabfa020c900f7318e2b0be09bf9 SHA512 0d518e505e42d2212bb06496e32de37cafe10d48678510535ad3668c8a21d6f4b3b83561c920975e1268aa46dbac17fbc5cd4ba8fa646ca9aa0258b7b31dd4d3
+EBUILD cmst-2018.01.06.ebuild 799 BLAKE2B 2a52a592e02eeace72ba02f736f744245c4f52bcd51936bef9e2a4a675ea3071b2b1e5a926f3cd3ed246e1880c9c3ac13ac68b873b719acf525d33a9e395b95e SHA512 b68bce9a10fdfece2c8eb7e63d2b094380a5f3148f0db4a2d16a5ec1f8da9ae6270b5eb5e943f25601a7e2363b50587e42a137302283379d6ac9d1248defaac8
 MISC metadata.xml 392 BLAKE2B 01f7ec078f6ca194bcb70be8417514a679b8c507ffcf78742249148e12d1425873c76e90e922d0831b8bd99c8226943d18352bf0df36984fdceb88edbc7bc2c0 SHA512 c6858ace643af313f0d47a863cbf117261f7ef419b02c874c34b3a8c64269570f6a9d4f004ee4645cc6eb673d2f5448f5fdbb291d51c322eaf806e28227ff2cd
diff --git a/net-misc/cmst/cmst-2017.03.18.ebuild b/net-misc/cmst/cmst-2017.03.18.ebuild
deleted file mode 100644
index ef3e5a6c5af1..000000000000
--- a/net-misc/cmst/cmst-2017.03.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2018.01.06.ebuild b/net-misc/cmst/cmst-2018.01.06.ebuild
new file mode 100644
index 000000000000..5f91edb4f157
--- /dev/null
+++ b/net-misc/cmst/cmst-2018.01.06.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5 DISTRO=gentoo
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 98f04a928bf6..0488cfd3ff57 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,6 +2,8 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
+DIST curl-7.58.0.tar.bz2 2891868 BLAKE2B d13efab3e3e677804c0821257958eb6f4260234e3d939092e7de862a12ab84500aa50073e37610774b3be9e5a2910c3ba703a716296d31f799916c3046dc214b SHA512 853b945fbfe87e8dcf2186d8cc6609681b9ed3727f9f075bb434d5df07dcccc633fdf30795f6d5956e3355a5cf94a3780e4a3603b08cbd0368e44103de27085b
 EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e
 EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
+EBUILD curl-7.58.0.ebuild 7234 BLAKE2B 923eef29bca1e47f1d2b622289000df4e8cf043583bab3e4b95e49f8c285103633c3fa37463fbd05894f2538dd2056e541087984e9457fa5daa49390eb6ca2be SHA512 dcf7f9498a98de7a98c252061481db71515fb9ca6248bbdc184c2a4c90350561ad135e22ac05c7470652a28f5d9dc25a800aeecf5ad973001ce641ced62cfed7
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.58.0.ebuild b/net-misc/curl/curl-7.58.0.ebuild
new file mode 100644
index 000000000000..f094148a3c49
--- /dev/null
+++ b/net-misc/curl/curl-7.58.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:= )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index f72a113c4d1c..bdcc8a4faed8 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -33,8 +33,8 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
 DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
 DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
-EBUILD dhcp-4.3.4.ebuild 7926 BLAKE2B 07566b35c28296bb1c591aa93a0c4bbd0b0893f6adf6420cb31d3e7b71d8dd5c9d566aaa7e797fe5a4a942c83a771dd6ae0a1f4e41a0f62de21d2b6a47b2deae SHA512 e31df7b37c57c8f9557f965b5ad9763252ead3b1911a56938c6a007fea84726e09eae935ea13a682e09cd0c06af11fa8b5f07f568829f4dc8aa7ed2279488967
-EBUILD dhcp-4.3.5.ebuild 7896 BLAKE2B 001402f4c75ef036495830125c6cde843cce77190d568f596e66f7c19ff585b7c71788f68c2508eb7df00fcb060a491f89eec9e60935775488ac72251cf86ed2 SHA512 702d577a1f81a55421f52b1a8143ac84ae63c909907f96ba7c901a24aa93ff50a947d6b7d8d18a7e7c7a6163790b8376caec86c6e9ce2c10822a31518a87d0d6
-EBUILD dhcp-4.3.6-r1.ebuild 7835 BLAKE2B 6460dada73cf7d26594db04b7cdc19bc64765cf080bf07ecd480e6c509970fa964234f05892292b719633122862478fcb901da74ec0d395a6055936d6b163163 SHA512 43dfbe8d6cad25a4a579a107d99495ee0fe053c0f8b6209a1332599d9f88cb44efa66a8dac9c050796af510525109fc2baff0dd8431f7eb30f84356fba2337e0
-EBUILD dhcp-4.3.6.ebuild 7781 BLAKE2B 5be0fc676e0666e20dba0b058994d8b02eea634b40573e4e141a22db99bbf2b0ff519bcd2126f39213b7a4eae53d3607ace1ca8a88c56899942c753f06780b7b SHA512 a1c76b0b661232b5f9da69aaf399a82581f0c782f85d3c54270b7b9f21aed44a248ce79e6cf516b4755a758dfc418f5b4bc1fc1dc8f68bdaebb1d01e54ea09b0
+EBUILD dhcp-4.3.4.ebuild 7914 BLAKE2B f6f94a7af0aa70428d5fa6e51ab8ac79f25fc25f094694d0ab278398c52c6021d8efe5fa1e524751ba8eb3db214e97660146175ab6e2d91bbaa234a619266087 SHA512 434a6523ec0e3f56889c71be0ab919c4282f3843badc4c8a08aba6634175eabfa4b9921602dfce7147a44f5dc215060fe335b7bec1435364cafe159a6e23bc95
+EBUILD dhcp-4.3.5.ebuild 7884 BLAKE2B 6ef306e4226389e05c904c74866918952ef16cf1caa2f4d23030aadcdbd259b8bbccb33df10daffce498fae9a189f1f8a6821a8746333d315bd2273c0cca6ed3 SHA512 d52d3ec0e9b046c29994af0af0cbd5bdc63cf040c7a4f8920d5f9f59d82223882df2cc6fa319d00a40d6b28b1938656587d9066942470fe0fdb812e732137a78
+EBUILD dhcp-4.3.6-r1.ebuild 7823 BLAKE2B a28cef0d32954b13e1f6a963e419616c656f1c8cc97451db95d922a13a86eec908cef6858f9b6a080ad94c437211ef639fb016d4d52e040f5fdd9e5bd3868bab SHA512 f9e6247ba9ec67c5f8a93f8eae87dbfde8e9754bf621eb48d7641fb42d0ca6bffa66ae7d36bd984c168bab7293e3d73b7d119b96e1d0889181cf2c64b912d522
+EBUILD dhcp-4.3.6.ebuild 7769 BLAKE2B fec6e2187a943c89717d9b1f9f2e4fcdd310c220d2be00c49debd1e84a23789604a2cb13b9fd3df30ea488c2774628eaed33190e5aaa3fba21e266262dc722c9 SHA512 3a30e5b8cd1268648000174ff264f70c88c566459ccbbb4cb79057b4836725ba7cf4bfd7be39e8bb4a2328dedd1cc3eea18211ef09836610c237e0f3ad3570e0
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
index 85c68bfb0f31..862b888b1444 100644
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.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=5
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
index ece1188d4e1b..c496d7f5f165 100644
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.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=5
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
index 32b0629c9379..9e73d36618c6 100644
--- a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6-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
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcp/dhcp-4.3.6.ebuild b/net-misc/dhcp/dhcp-4.3.6.ebuild
index 2404129b81ee..469f240e286d 100644
--- a/net-misc/dhcp/dhcp-4.3.6.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6.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 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 4de21c2d1989..a4c1e811cb47 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -11,15 +11,15 @@ DIST dhcpcd-7.0.0-rc2.tar.xz 206108 BLAKE2B e30acadab1e8084b0800b67f4609fa5c7fe4
 DIST dhcpcd-7.0.0-rc3.tar.xz 207164 BLAKE2B 2e8cb676979606dba22c5f304650679e5325cc691d8a3c2dd62a1776373df4a7c21d5e85ee8106299b2f73def4bb2862bbe8d396b37dcab9c1dcff93634a0b78 SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9
 DIST dhcpcd-7.0.0-rc4.tar.xz 207596 BLAKE2B 2ce28e6f171b0bcc0b5c9e2ba0e5c92c70e7e97a516ce170d24c77a9d9981662acc914cefa5cad1bda14d7129088c313069ebe956d3e79098f70c3a31e53499f SHA512 e4bbb7d52021b84510d2a4e634b6fb979c126a6828de55053df0d3c6aae67a5c9be3da008bd7c8606be3d6aa28b00bafed3188473adcf2f3bc1bbfe9b1f4adc3
 DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
-EBUILD dhcpcd-6.10.1.ebuild 3324 BLAKE2B 7624e8f495516be6385d28b82b6bfeaff8b761c45fcce6e26169e6c5c1630d6772459e09cdf0a53c779cb33e24d886355dfd6e572b9145ee8633202038513628 SHA512 474bad588f8a25a8af13426175509d774af3b91c6ef919af59faedd0d5efbe7e0b9bbff01fa5f9ec6514e84dda61b5f94a37487344544dab281cbc3ee90125aa
-EBUILD dhcpcd-6.11.1-r1.ebuild 3341 BLAKE2B c6129726343344281ec17c23c8f979d339ff8d774ff1fa37eb13cf496e8bec36950fa43b558be1a38ee493818ee7992a65002c4712e5523db51d4e4c00b63536 SHA512 ccadcb290e5c2a5440b497880d4a31e1d6f97484f67b1ba5b67e68f9734c5a8504c7d96a172330debba9cdf7156c2f6f953cf81cbf375b8e687c5225a6c69000
-EBUILD dhcpcd-6.11.3.ebuild 3289 BLAKE2B b586f03933ba2582caefbe2e6dd3c5a66611830ae9bd35b89e065503e56a5bceaf5002b7c277c555e99028acd7311858a9e392ac2846b2096b3e201ceb5054c0 SHA512 8f59ca94b55d15f29a175fd9cdf5b3bba57d9e06980c11f030dfae4ee0f0630e791b5efeb4480117865aa680b0631843a1479cd077fd0c63508ae14977dd30c0
-EBUILD dhcpcd-6.11.5.ebuild 3301 BLAKE2B be68ab1e9be217239ebe705382497f124a386b3973234c375809603b809c7ee2349f36274ce4d2b61d2af6a5b9abc5b10e4d850c94aed94cc1fc78e3100df7e0 SHA512 de0c7852d42908d9a2f5a77db39d145b6711c1378d5db7e458469f9db7fae68eb23653eb56dccfcab042055ae30170d9bf93e062085bfcbaad58fca206a993db
-EBUILD dhcpcd-7.0.0.ebuild 4459 BLAKE2B aec875a2fc8b5b3f07937316b1501c62eb9827a94967430698d05c9996378db300ed8c780e67f8996ea26af829938d8d144818232670989dc711b52788548e28 SHA512 ec114f3f6c41c763d7f7db6235589b4ab5eb4fd72f354f8a847c564bbe3a879cc29525151d9d1e973cb63f4184128b1c4a903400af309c4058650c2b0887a7be
-EBUILD dhcpcd-7.0.0_beta3.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
-EBUILD dhcpcd-7.0.0_rc1.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
-EBUILD dhcpcd-7.0.0_rc2.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
-EBUILD dhcpcd-7.0.0_rc3.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
-EBUILD dhcpcd-7.0.0_rc4.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
-EBUILD dhcpcd-9999.ebuild 4459 BLAKE2B a0d24d88f0cfa933bbcf0d6073d0095e9f3ba36f7a82af8e63c1bc9137b50aea75b752817c8f145e25fb01be129056c2de835dd5fe13a94cd3833cd7216b2af7 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c
+EBUILD dhcpcd-6.10.1.ebuild 3312 BLAKE2B 86fb6347e7b754c49be4ed85c5d6011d0f05092969605a33b410bfcd250dcaf68e2330c65875cf32c799a569f87421c277a122aa1912d8077450c7df9f7045f1 SHA512 7a2a20f345647303a67312cdc47267a5b492c26199c20d2189eb9f8fd6570411b98ee3053f99c44edb4967566eda50f4b2fcd5cf1b849eab07b3f19d295e87b0
+EBUILD dhcpcd-6.11.1-r1.ebuild 3329 BLAKE2B c44985294f3ee35be5cd491a2a0b1810afb60cb61c085ecba1606caa46650b65fa74aaa5ac0950412388961b43870aa01ae66600923b6299a0c022ea036a8ca0 SHA512 6c3de606fb91454cae9db5d94cfb43abc1196e22391e44be4930253094f473bcec2c6dc029e9345bb1638d016998ce310b5ceb3c4437d50b41560f5b0840e3d9
+EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
+EBUILD dhcpcd-6.11.5.ebuild 3289 BLAKE2B 8ac2421fc578e268aa60e08250deac5e41654beb16598232ac0012a0b78b6e3613fa7786ae41ecc3e57d44a5c43869f066a714495ecc9e8194d7131ba24dce16 SHA512 09036335e36042eb84fb21bac19dde3a84b2a1a9f6697b7d3646a57c039d2743063b75513ae7096c4cb828afccb6b169f9e7e7ab0db15a2d76a1077dcd2bd2e2
+EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.0_beta3.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.0_rc1.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.0_rc2.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.0_rc3.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.0_rc4.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
index 06ab906419ef..ff1f4d03495a 100644
--- a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.10.1.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
@@ -10,7 +10,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 ~sparc-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-6.11.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
index be9c260de63f..7b184ca4475f 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.1-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
@@ -10,7 +10,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 ~sparc-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-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
index 88168bc80242..e3c4a2bbd1a7 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.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
@@ -10,7 +10,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 ~sparc-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-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index 1cc4a590d36a..fd0696f21b11 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.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 @@ 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 ~sparc-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.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
index 8bc9fd1b0461..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0.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 ~sparc-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.0_beta3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.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 @@ 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 ~sparc-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.0_rc1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.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 @@ 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 ~sparc-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.0_rc2.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.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 @@ 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 ~sparc-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.0_rc3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.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 @@ 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 ~sparc-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.0_rc4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc4.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 @@ 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 ~sparc-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-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index deffde72be07..2723156dac92 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-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 @@ 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 ~sparc-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/dropbox/Manifest b/net-misc/dropbox/Manifest
index 015d65fe32ec..fe0a6dd6f2d1 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
-DIST dropbox-lnx.x86-40.3.44.tar.gz 70138971 BLAKE2B e83a278e986987cec2b472fe7ac90e4bb4b9c934998707eb3616eeecd60cf5a7dc444efd74a3cd4217adf546b2281d8c9c28f32d84dd831e79d512c4a6105627 SHA512 20f8e574c0b88e83fca85de061319b06fdde6fee007f560180a2327922f5c2950394ecb6fdbd8b5a912ce8edd381c3520216cae7f83ba5254c37370238970938
 DIST dropbox-lnx.x86-41.3.76.tar.gz 70413240 BLAKE2B 1404c7975b9f58d288c8519c09734d3e0e52a714824158867d19a7965f0275e3e13d77d725ea030cce50d785f10ca6304e35d55ee89216a1a810f91aa732f4d7 SHA512 98fec83f92d5465ae61d56b0a02209d6145da1017c29d71ef4eb7e8684f28e6bcfadc77a055cddf7f5512eaf02d8235f1dc273b1f22deccbbcb70d7047ee8df8
-DIST dropbox-lnx.x86_64-40.3.44.tar.gz 74167220 BLAKE2B 46d89e6e8fe56e67a2d6dc6e1dca380e047659c3769cef14155f1cef48a3e58c82e65c2095f3c91cf7f1b1a1f4b10665e00265611562c1fadd912f436dee14a8 SHA512 a7d04c3581459bfc72dd799db424b6b5020bc3e8a65ceb280bc424c662783af78527488e5e575558c0ee7ff0eaba2b89863c329f12806c8b0e088d47afefdea5
+DIST dropbox-lnx.x86-43.3.47.tar.gz 108318530 BLAKE2B 0627385c672b4ee024c9062b9da837fad97e728d43afe6476bbbd5108eda4c729ac6230d2be8851381e3c3be98d3a86cb492719e645d9f07a10e579482eb6230 SHA512 23df4e4e2c3cd99d16890091a7c2d3f61341806241462b6ef095b86d5db4b663090e12848038c731014079dd77adaef47fb721b1eac8bc84e945daaae3ee438a
 DIST dropbox-lnx.x86_64-41.3.76.tar.gz 74449460 BLAKE2B 7983f0e48839fc6c3386b06c4380649e83977a2619bcc888b68a67b0e61996e72133935143a144798d5555595cd6d00063af3aef8c4b293e61eda18dff4ea96a SHA512 ea8cce634d7ed9e77d1d5f30dc7f89396d32783e3c3644d6fca52619d7cff958b407ecf21a1a6478091d148f1d0a42d68b6283e7dbe2652a48adb8f36554fd03
-EBUILD dropbox-40.3.44.ebuild 3067 BLAKE2B b656508362e19e503fa03b65ea2f71b47bd03ce9dd5b85a092afe494b061d0026ad7791d3efe98c5f59121a2d9912ddb2b891efd32584e867e023b8528d4560a SHA512 351df4410d640e4dbe3b8373291d43957edab99858eea949ff8ea354e228d882d01eefe177dfeaebf371183964b1def71e18e68631482a8489aa6993cc9441bd
-EBUILD dropbox-41.3.76.ebuild 3069 BLAKE2B f3898ed30cfe2cf909bd8a2b7968832c6d2c0b03778b17f938d050da3c0d1bec6e11cd3d3d1ad187b7bbcc51da396f5253f45b82e7037289b142586729eaab32 SHA512 e7f218c0f8ef8d7c9cd4c5651f7c08cdec1deda754530fc2c0620f0e452521f21b0d839cea23b902b5ae35a3ae727307277c7d86c17dfd0796d91f55d8d1d605
+DIST dropbox-lnx.x86_64-43.3.47.tar.gz 114389696 BLAKE2B 63ec9fe71516715340e3bf579ff40690a56fb3d2200dbf291f6f1f58f56885e115aebf87ea3b306d3682b634d418b6b30e45abe3a16d566cc53dcfcfc004bcba SHA512 e11b01cdf67e16593822d722a8e3d822e9a02a99036a938521bb9e31a2451118168e434e1924006d9629d7b2a847bfacd2d7b0b213d6e1c90fb92fa3378629bf
+EBUILD dropbox-41.3.76.ebuild 3067 BLAKE2B cc6b02df756cd8103995f4112862aac49323af5d8b1386e150cf569b22d099060bec8cb853af00282a1aad1be5738dc7b72f394cf80f868bf0734143d034e9e3 SHA512 3e483a2dabc571c9c761d86048ba2c11406cb9421d1616d021e916d234f1b77943cd7be6caceaaad9c781890ed2760e1b1e35afce67575d21e2d59298af6f325
+EBUILD dropbox-43.3.47.ebuild 3033 BLAKE2B c5815f972322253fbd9f63179af64c9f6a06a241ed652b45ffd44f28d86f93362c565b53f9670856f66255227d5a6d9b5cb9f86abd52eb82849e685f5cb7a1f7 SHA512 94f46da3e3e50fe095b0a11df0ba935e6f03bfffa981efd4b5262d9cbe30b03b423a556da8332ca765a0f9aafb165acd25178675be16990dd4be574bd43ea80b
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-40.3.44.ebuild b/net-misc/dropbox/dropbox-40.3.44.ebuild
deleted file mode 100644
index a79ed26b4631..000000000000
--- a/net-misc/dropbox/dropbox-40.3.44.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	|| (
-		sys-libs/ncurses:5/5
-		sys-libs/ncurses:0/5
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	rm -vf libdrm.so.2 libffi.so.6 libGL.so.1 libX11* || die
-	rm -vf libQt5* libicu* qt.conf || die
-	rm -vrf wmctrl plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi.so* || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	rm -rf *.egg library.zip || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-41.3.76.ebuild b/net-misc/dropbox/dropbox-41.3.76.ebuild
index 2ea39b1ac76e..5b8bb0394c9f 100644
--- a/net-misc/dropbox/dropbox-41.3.76.ebuild
+++ b/net-misc/dropbox/dropbox-41.3.76.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 @@ SRC_URI="
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/dropbox/dropbox-43.3.47.ebuild b/net-misc/dropbox/dropbox-43.3.47.ebuild
new file mode 100644
index 000000000000..a4f6a2f6b6c3
--- /dev/null
+++ b/net-misc/dropbox/dropbox-43.3.47.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+inherit eutils gnome2-utils pax-utils systemd python-single-r1
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="http://dropbox.com/"
+SRC_URI="
+	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="${PYTHON_DEPS}
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	|| (
+		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
index 38af97c6c06a..eb18557da8f1 100644
--- a/net-misc/hath/Manifest
+++ b/net-misc/hath/Manifest
@@ -1,5 +1,5 @@
 DIST hath-0.3.0.tar.gz 27747 BLAKE2B 2563ec0d8ae308f5262c401575722468a10eb9fbd309adbd9294b44203c8dc1b2f872b43a839b72590681f2c85cd2b04589509ab18a6c0df9f4aa99cd7ae993a SHA512 424c1f95301160fe17d5358082a52ede90ceac14bf2a57d9e481bfb8c727c8314e47c0e871f4049c051d6f7112aee2c71ca256904fd9203cec9fce0bafcfe740
-DIST hath-0.4.1.tar.gz 30470 BLAKE2B 7c77bd9692ffb627ed42682f2ed8aebcd5ef154a26481b4d2fc0f346c5df7b436cfa265608b87d80a7696c9e4393e6691e88684ff2faf86bfb6e4ff99baf3cfb SHA512 b834ffa5ce762dd77be2bc8934c6f1287164158b33c6b2b607ea4dd4f12654da6a83128c6b7e269cf8d3ed52ee5904266b09e7ac796e3bf5d5e6abf33e6798aa
+DIST hath-0.4.2.tar.gz 30482 BLAKE2B d65b45c8be85f231fbdbb398c4d4225a0c79ae6a46334fa3dc8de840c95129a1d0a235202b7696abf2f672f7d7bba9c6787063a4bd9d3b8dcf2292d0f31c4baf SHA512 54770dcd211a288f2a8ed02ec709d2bf535b912a776ca9dd8acfe01beccf6ce0a68c7e18a1117c656be989084ebde1dc6506c17e5e3c930be2a45178654b0627
 EBUILD hath-0.3.0.ebuild 808 BLAKE2B 4751fa496ce3daa7d777d8ac7054c19008c143536b6ad01ba55fa21f1bea18deb80f2aa15f40cc2c26291a26cabce5f0c29d4b73b13fd5daf7b67daddb737619 SHA512 63947dfa8ecfa3639fbde80fc0d273aba5007fbfe480b10b512a79900a1524c554ddd4bf495745d5a173dd24616ad3889ddeda163e3a665cb509719c2908b18e
-EBUILD hath-0.4.1.ebuild 788 BLAKE2B bc1a759cea9942f4ee2ab486c20b2aee0129a16165cbe8dce51b216d641d361cf3ecceb379ccdd97a561e2adbc403ca86ae88f5b7941adfe8a7c31cd7c426cf2 SHA512 51c76d3a012500e0040084377ba7497530597a3e1e4d173a852b0a1bfdae19d5d98720cd9c22c7bfad05444ed2073380ecf81f02b8ed9781680e1872f5e49782
+EBUILD hath-0.4.2.ebuild 802 BLAKE2B 245c7271d2b0f5b1fd03c58b0698063171df797fd8d873c5aaf52294eb68684d5416a909d247e2fd38001a4a0ae973fca9b5522424fee7da732063a9264023f6 SHA512 182f69d62efbef0a4d4b76cab4b0978f0b41b9dea7c0d0e911ab641c7287a5a066056ff3c151f336f34517bf4bd8e025140c4048586210a03dcd9bf22050b513
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/hath/hath-0.4.1.ebuild b/net-misc/hath/hath-0.4.1.ebuild
deleted file mode 100644
index 36ab7c32af8d..000000000000
--- a/net-misc/hath/hath-0.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hath manipulates network blocks in CIDR notation"
-HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.10:=
-	>=dev-haskell/split-0.2:=
-	>=dev-haskell/tasty-0.8:=
-	>=dev-haskell/tasty-hunit-0.8:=
-	>=dev-haskell/tasty-quickcheck-0.8.1:=
-	>=dev-lang/ghc-8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-util/shelltestrunner )
-"
-
-src_install() {
-	cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-misc/hath/hath-0.4.2.ebuild b/net-misc/hath/hath-0.4.2.ebuild
new file mode 100644
index 000000000000..feb82be539d4
--- /dev/null
+++ b/net-misc/hath/hath-0.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hath manipulates network blocks in CIDR notation"
+HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.10:=
+	>=dev-haskell/split-0.2:=
+	>=dev-haskell/tasty-0.8:=
+	>=dev-haskell/tasty-hunit-0.8:=
+	>=dev-haskell/tasty-quickcheck-0.8.1:=
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-util/shelltestrunner )
+"
+
+src_install() {
+	cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index b2a5f4509e75..cb9698503266 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -2,8 +2,8 @@ DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb
 DIST keychain-2.8.2.tar.gz 44211 BLAKE2B 0916ffebbfa682480e7599d7a07a74e916ab780af47f2c4094fff42147ad461a23bdae81cf18ca5ebba8f21b3917f74cfa3503026fe1f58beff2946173c45cba SHA512 741cffb5affaeaf2cea701d76e3bae8a0cbc2b781bf5d578001e763cee531011aacfb1754974afcb63e6d46588716e62e5f96fff63eff76dd5ad8ee7e16ac196
 DIST keychain-2.8.3.tar.gz 44205 BLAKE2B dcdddaa31d28a401ba4aaca842a8a0c50f18feab3ecd4e2d917eb4f7c2f7c7602c369d82dc82ddf788984b94e95ce4006ee3777995d8ab48cbe9797e39f5bb52 SHA512 493f376fff386069202eadcbef61140e8e66d195e7f73574948e69d8e778bd8f2c2926a174cd25b4380c17f0fb769d423a3b36af4a98aa39f55db22c45216447
 DIST keychain-2.8.4.tar.gz 66143 BLAKE2B eee39aa4f6d0e14277cc005247fe69ba9e83fc49427e3947c5ecaaf4d9d25c92f0ff22eb5fc7cca38c86dd6320c7b7c068841a960816ed97e20ab31c77dc2fa9 SHA512 182d6c6bc1f278839b1127eb0b0b7d094a06251c86a5ebb10410e657d3cb2e7207c75aa9d1f655a5fd4b4f2290f4bdcf00b3714cb0f825e6ef9eecfc486c6abe
-EBUILD keychain-2.8.1.ebuild 705 BLAKE2B 8c47471b7a272e864534e74feeed88c88d25a685de76646d6989cca33d55687eb9ca7178941d8276dc63e8a4c9cc02e6e8988e0775fce5eaf1af7decca6ae96c SHA512 608bba609fd88133fec2f767644bc259d4516ae9ba4001199490a5962a4e1ec1b207a9bf885b51877a9dab212e8e26e8b9e3ca46714c0c43ac79455d7092722d
-EBUILD keychain-2.8.2.ebuild 718 BLAKE2B f5f8dbfea0d454da4f2b92329f887f8b0155678fc00c961a96c2b6020227481cd3d0a0611e60d36a3212aec3df1d3aca4f5cc59226bb4255fe69c67d681a04b4 SHA512 b3e58f2d3fd2ca236f3386924f2dfa333188ed3eb0cee8dde8500b5dd14b60e78e0a4a205dc7f7da78b4eb369b82223a9033fa3636ec947ab892e22ce5dd6c89
-EBUILD keychain-2.8.3.ebuild 715 BLAKE2B d66afeb5a12b7f95c02feb0c2078cf011cd6394bc3075688ff6f0eed77d068e1b3ee0830d64f1ea5a798bcfcf2cd62eb829073b793e61ffad31491ff320dc4c2 SHA512 9463aaf2684ce0491c2905e5d11c227e1e7b856b1ce68a627bdb06c404919da9afd251066b7d908a4b58902c6c9f1ebc8cffd68de4a842a0ff8cb3738dc0d734
-EBUILD keychain-2.8.4.ebuild 715 BLAKE2B d66afeb5a12b7f95c02feb0c2078cf011cd6394bc3075688ff6f0eed77d068e1b3ee0830d64f1ea5a798bcfcf2cd62eb829073b793e61ffad31491ff320dc4c2 SHA512 9463aaf2684ce0491c2905e5d11c227e1e7b856b1ce68a627bdb06c404919da9afd251066b7d908a4b58902c6c9f1ebc8cffd68de4a842a0ff8cb3738dc0d734
+EBUILD keychain-2.8.1.ebuild 693 BLAKE2B 6bce0f8e4cfad5ac866fb3e231f91abf47e573f7314ae1eeaf388608f930f6815984b276950d5d7eb4b3eb255b82d2effe8700b927b0950a140877798b2811f9 SHA512 40acd5eac90e0fd03e3ba37b3d1754800a0646d0a5a2f076f2ad2c38b07a30c7ede8e29f510a55f083f308032d18328a6a925163e24610d465b1ad05f2dc9e2b
+EBUILD keychain-2.8.2.ebuild 706 BLAKE2B 0440f24f9cdc23431ff7547a09549b15240d3234520abfe723e6b3f888946998c8ff22a8d8baa4eeb4f1e6d3de390b60cfca0419d0c4012bdee4749732fb7554 SHA512 412c3fb3acdc422c7b5bece95f4448cad628d5eca7c4209a4158fd14c28cf19b0d6299f2e5e1fb8fe9bb3a85d453f4432531b2ee9533db37eacb75d879811427
+EBUILD keychain-2.8.3.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
+EBUILD keychain-2.8.4.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
index 67e765fe3a52..bfae8339b1ad 100644
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ b/net-misc/keychain/keychain-2.8.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=5
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.2.ebuild b/net-misc/keychain/keychain-2.8.2.ebuild
index 708ffe25db4d..aa0354c50a08 100644
--- a/net-misc/keychain/keychain-2.8.2.ebuild
+++ b/net-misc/keychain/keychain-2.8.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=5
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.3.ebuild b/net-misc/keychain/keychain-2.8.3.ebuild
index 4a14fc7ba283..6f06f6475bd1 100644
--- a/net-misc/keychain/keychain-2.8.3.ebuild
+++ b/net-misc/keychain/keychain-2.8.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.4.ebuild b/net-misc/keychain/keychain-2.8.4.ebuild
index 4a14fc7ba283..6f06f6475bd1 100644
--- a/net-misc/keychain/keychain-2.8.4.ebuild
+++ b/net-misc/keychain/keychain-2.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=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index db74c2ff441e..585d80187f5e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -11,10 +11,10 @@ DIST memcached-1.5.1.tar.gz 407282 BLAKE2B cdaf384c10c28560acf97304fe97b39ed7b90
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 DIST memcached-1.5.3.tar.gz 409131 BLAKE2B e54b364c19ab1ecc2b4d56b5a778d8542cf588155bd4c5f352bb5c9993e53017e75226cfa805f11e2727fc2ba5cccb39f91dff28a8c27dafb223694500f4565e SHA512 b28282c579891e7c5508eb5ab4680b933aa76e8e4a8fe575c996fd4e750f2b4b35ee734d01ae0f280cf4cf6e0530f7f6a95c2e07be3660b07c5ade6ad3c835e2
 DIST memcached-1.5.4.tar.gz 448831 BLAKE2B 721288bdc6184daf70817010074d6513b3fa189c86bde04afb61e7d8ac28f09e71eba0f819a0e0a96df26a938b8f94c3d047e85d93e43abb884cafdbaf54b323 SHA512 3154a2cad54d57f14bf9c07cfc6e4ed0bd6908f81642de9766d65c69b78bb36effb6221684b1e5f9e355fd8c64a0338aade3cb3bf36603d311c86bc94fe5d13d
-EBUILD memcached-1.4.33.ebuild 2624 BLAKE2B b5e15c766386beb37088661384ac7580e3b446bc338cabb047ee36141668a4459e1ceb19786f96d72de8fcb8da7a02fbfc093181163a949c146bc901a8fe4961 SHA512 95106208e83a37e1d1f94c04cb2942194f4ed9e7f8470b831529849c3ca62b48477fc0937e87ec7cd44204d87df7672ff72e20199068d21f63b8320335e074a2
-EBUILD memcached-1.4.39.ebuild 2887 BLAKE2B 373162846501fb6d7228f0d72046b01c64dddbc6af0c6442bce84d9d13feb67fcab5bf96a67725ab7e5e971925ea0d0610d1065bb8285325496cd3481d8e3205 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706
-EBUILD memcached-1.5.1.ebuild 2903 BLAKE2B 084d39e32b81980d5fc24b55852e26a95bdf1e319131c2c033411815633651adb79b4a963bbc505f9dd217fac08a6413ab662c39ab4b461388c8dfeb84d19d61 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6
-EBUILD memcached-1.5.2.ebuild 2897 BLAKE2B 837909b6345dfe7520f9e95cbe5f36c6823a03fe6291f00983071692b93884d5a9eada4309707e5d9b43a01da882b3646d58af1dd722d5e9eeadcaabad7b5e4c SHA512 14c1f1a0043a10eae7c625f7f2df3d98e430335e1a84a1244159cf703061a425602dab3a31d35ca9f2e421579ba7c31bf61f52ea3117dd0c98f059b2ef3782c3
-EBUILD memcached-1.5.3-r1.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
-EBUILD memcached-1.5.4.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
+EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568
+EBUILD memcached-1.4.39.ebuild 2875 BLAKE2B 875889c96c1bd919dffce7ef26c6d3105fcf078210f7d316d5db2ab556629ebc28c9badd144f3f3477d0cc69a38fe5934f0e7606ec3acd0cdfd64ab5d13a5250 SHA512 29a7c43288deb524806e171d393f684932d1a0b642b230227376cca21d2453dccec12a2e43986af295624b7e7153224a147387390015ded99edeea9314c11cfb
+EBUILD memcached-1.5.1.ebuild 2891 BLAKE2B c2f9e6a542dd005b14a5ca43188b0c5895f5f2a383e7ba348206eb90cb47a7dd4386aa3bbbd54f84c3935565ea34bda1d338bc0622b60f516cb2a98d0077dc96 SHA512 48824a3a0c620f06b74a4903b0fd1d2df97700906855f4f86c4c80167c86516b4e2f48ff1d03155cab15796f482f5da9ccdd898c16cba5084e6dcab4a0e52726
+EBUILD memcached-1.5.2.ebuild 2885 BLAKE2B d44e409f94cb864fe06241787aea3c1448e9528040eaad8e2edc8f669187896e994eef141ae7377096d532fa31c6526ec8b653be81f93ffeb22df107486172d6 SHA512 38e31ce125c6114bd73d06da7f02b90cd26ad7fd956108cdb1b00af037e386c658488eb697fdcd50de0c42299e787dab7dbc8b5e47427ac9a661c2c25cf7608b
+EBUILD memcached-1.5.3-r1.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
+EBUILD memcached-1.5.4.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.4.33.ebuild b/net-misc/memcached/memcached-1.4.33.ebuild
index 48ebbfb8d2ec..e800726349c4 100644
--- a/net-misc/memcached/memcached-1.4.33.ebuild
+++ b/net-misc/memcached/memcached-1.4.33.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
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4
diff --git a/net-misc/memcached/memcached-1.4.39.ebuild b/net-misc/memcached/memcached-1.4.39.ebuild
index ad41318d90c0..a0fa3c41f29d 100644
--- a/net-misc/memcached/memcached-1.4.39.ebuild
+++ b/net-misc/memcached/memcached-1.4.39.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
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.1.ebuild b/net-misc/memcached/memcached-1.5.1.ebuild
index 9e386070af56..8372334551da 100644
--- a/net-misc/memcached/memcached-1.5.1.ebuild
+++ b/net-misc/memcached/memcached-1.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
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
index 083753b1b871..a6fd425ddc31 100644
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ b/net-misc/memcached/memcached-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.3-r1.ebuild b/net-misc/memcached/memcached-1.5.3-r1.ebuild
index ec97582ffbf3..7b92758285f1 100644
--- a/net-misc/memcached/memcached-1.5.3-r1.ebuild
+++ b/net-misc/memcached/memcached-1.5.3-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 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.4.ebuild b/net-misc/memcached/memcached-1.5.4.ebuild
index ec97582ffbf3..7b92758285f1 100644
--- a/net-misc/memcached/memcached-1.5.4.ebuild
+++ b/net-misc/memcached/memcached-1.5.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
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 4a6aea8f0f4a..330ca22176fc 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -8,15 +8,15 @@ DIST netifrc-0.4.0.tar.bz2 75517 BLAKE2B 2ae5169b040268d299ed6a043c169b132378ccb
 DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d19d16ee4a3ebf736fce0e91c2a7a44bf2400b0854bbfc2cc0f3f0bc84ef917760326c2a73a59a60314c5a8f7d8 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
-EBUILD netifrc-0.2.2.ebuild 1764 BLAKE2B 68620f2b76a29d77f22e364e3be62711dc1c1f777b9a707405331b2c6df76cf7a42ce99fbf6181e6e14412aa974df6fde8acc1c957311dacff227cde8a694d8d SHA512 57715aec43860cc8ea044486d10f0171317228343459417bcaa5e6716e8d32e2338089f24f97c0431d15c19cba2a94f824c90f6670e6de2bf680f4a2fe8865ed
-EBUILD netifrc-0.2.3.ebuild 1777 BLAKE2B ffb0130f7e30d120e9c89806842b32549c6d87d03699d6058d9ec96659083ed9dcf2cdd039aa74ad358c4a70997210203312971295e9d637c6fe725cd0e54144 SHA512 2c09aa95b80921833bd05f6faa4197b627908bf5860d99bfb2db85236fc230059ca73c2af44bbead4651e66b289adc0fc17255743e2c0f2411eeea40dd7c6963
-EBUILD netifrc-0.2.4.ebuild 1787 BLAKE2B 97cc35f38a82555850e34297ead65a2325756f666ca05aace54336978632e863036aae7be8dc43724ac450bbebc1bd645e97374dd16fbb312acd1556210c8280 SHA512 748b52fd645a01c90c0bb9911602a616e05c3e23e209d567198439cc910c53dcc59a57d269cf470eee69ed73e40c5e84f1ed0c0c5d4db4f527284f64301e6344
-EBUILD netifrc-0.3.0.ebuild 2074 BLAKE2B 64f4167e2274af61dc1934a681932353607c3cd12fea285ccf02ed2572f4011d4b243990264505cf08db805cb24c106396b87b5c0be44c611c14c99a9a06d1ae SHA512 c46ade5a0c246c147d17ae91f80e57c6d85e27bc26b66d0e6f7d2d887cd35c3fdb8e6f8415897e53e384ccae10104e8343998c39673b41bfeba0f3ba4416f428
-EBUILD netifrc-0.3.1.ebuild 2114 BLAKE2B c86ad92dc6f989b4cf5cb5c22667b0677067079ab194a051a6cd6dc3e8f8fbc0762959faeb5a62dce87a68a35ea0edc996f36ad0b06e98c3cfb25e8ea86631c9 SHA512 7a57c692b7ac6966ec85f7701efd8b85430b2c1933d43599606ec2ae82c2229922330b2ce7fe8982f0da49e49be0b5fdbbb627efbedf65b336bb5399a1c961e2
-EBUILD netifrc-0.4.0-r1.ebuild 2200 BLAKE2B 4e2b64944c1c3861855137d181996b5aefc99a91c8a5348d8176b00520dc63d1ae02753f1b85d3cdc4c6502b51228089c8296d6e16a89308ca1b67ca60e4a53d SHA512 7063454cefeb6f58535f8d3555d99a35c0e41ebde45e47673cf8b1b6e49cdfb099e149c5b1fa556d320f7d83c2242657628b50c84eecc4989c2b1dec2ccf0105
-EBUILD netifrc-0.4.0.ebuild 2114 BLAKE2B c86ad92dc6f989b4cf5cb5c22667b0677067079ab194a051a6cd6dc3e8f8fbc0762959faeb5a62dce87a68a35ea0edc996f36ad0b06e98c3cfb25e8ea86631c9 SHA512 7a57c692b7ac6966ec85f7701efd8b85430b2c1933d43599606ec2ae82c2229922330b2ce7fe8982f0da49e49be0b5fdbbb627efbedf65b336bb5399a1c961e2
-EBUILD netifrc-0.5.0.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
-EBUILD netifrc-0.5.1.ebuild 2134 BLAKE2B 41731e4daf1d0dbea081ff5717b85ce3dbf538d1a72ae3d6898228836c34b1473ea1d38f280de80be88643c967cca8c370559209f716e9b04592bcfa92c1b6c2 SHA512 b57eeb599989d8840a5f1eb9c029ccdd6c1c6fa4be2857e74ade25c100e513a3b3ddff4cebd2052c1ae92047cdb0edb80be411fb4c5570111c4d03decdc8a6b3
-EBUILD netifrc-0.6.0.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
-EBUILD netifrc-9999.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
+EBUILD netifrc-0.2.2.ebuild 1752 BLAKE2B 552f4757411db13c143970b17cf8b116adcf23833d3251bc676ebaba425c5ee31a8735408d585a21b9944d26a40b1c1c51d67a1ff1df9e4bbf6ef3d44667708e SHA512 9a17d9736d823d17ffa5875924c93d99b3f194dbbce611daf41117fad1d21e199f8e3ce75d66fb8152431bb0403e66a70766ffb8742c13cc185a8b80f8b275d2
+EBUILD netifrc-0.2.3.ebuild 1765 BLAKE2B 5b932b06a08cb7a6502d3aff31fddf185bef10959a08b4777eb07af3ab6c6e2b232ad48ad40f91d26952261b211b079fe412765c6a918b783d7a5cf6c65ed01b SHA512 9bc89bd39de12a76cfc72697704485c71da876848d004f03e6524af4253e27008c421be2874814eb4537fa452fc728ff5cfb54826c775dcf4c1e33e9985db6a9
+EBUILD netifrc-0.2.4.ebuild 1775 BLAKE2B fd939f3a77fb3bbbf1b37d8e72bc0be2d0ad3033a5aee84fb972da8e54746a5d0c6ce088104c5e3c56045be5dd3a17195ba71ac755e1bf8dded4bbdc9551ddfc SHA512 df6ef2110e50c100862dfdeb85f9f2b0b0eea40b51312ebad4a2571b8f5cf0d7fdac412b654ed0eb474152e510bb15652373d06112e46ccc2a5f4e2fe70b095e
+EBUILD netifrc-0.3.0.ebuild 2062 BLAKE2B 5148da411cd091bd9a467c47f95c63f1f94e21ae8f64192e907a5e420fcd820f80f7639c77a22e9b7f226d8ca308befd1442ed2d9f2f89789c4675feea040020 SHA512 bcc447f58d7fac07fee913b068c0dcff689521f52428c40cd369d63b73bdbefaa20c2984564ec6cfb8e346a40b9d18beb6c2a322786c67e63140777f850a9c7a
+EBUILD netifrc-0.3.1.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc9402209134da16e6627308c53210df7d888f75911eed08a6e650b85b24b519d22d08d48d39b9bdc682c5b18c0 SHA512 e3f28f1740679972ab31d9c7c43a425b8e080184b75a9ed07e1a3d5715becf6c6b0917f7911461369e2ae0065475cab741b202e5c65db3bebc2b5650cecd8366
+EBUILD netifrc-0.4.0-r1.ebuild 2188 BLAKE2B 3144b7633e7d5f6520d55bd75084c317d6be68dec524128f5ea2348ea26d9e5e085e1bac19e1ee8789295279783998b128d8f41dd8f0df2f799a22725710df95 SHA512 95ba2089b9549bdadd8cc9248161e3398441867366901a1978fccbfa764c94be6cedff207ff3d1f9e7ac3f73645528ca6455b2216c9b4ac4169d4f2712f9cf76
+EBUILD netifrc-0.4.0.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc9402209134da16e6627308c53210df7d888f75911eed08a6e650b85b24b519d22d08d48d39b9bdc682c5b18c0 SHA512 e3f28f1740679972ab31d9c7c43a425b8e080184b75a9ed07e1a3d5715becf6c6b0917f7911461369e2ae0065475cab741b202e5c65db3bebc2b5650cecd8366
+EBUILD netifrc-0.5.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
+EBUILD netifrc-0.5.1.ebuild 2122 BLAKE2B c0737328699f331bf5d823bb2d56dae82e05452340905fe892c31ed8f6a62541119c531bb66dde1e28aa890286991cb4be07490c853b945e144bb0d0bcff31ec SHA512 321d49f19c3e4adee6300ffdbffae0000f6e93b1e414a19fde729128cbaf417255be5fd1a6da2203285467b3877c80313d6f89414402aa494159c5d002ef0e1c
+EBUILD netifrc-0.6.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
+EBUILD netifrc-9999.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
index fef98163eea5..8f6daf8e98d0 100644
--- a/net-misc/netifrc/netifrc-0.2.2.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
index 1ecd11b424ed..8f599ce1a9e8 100644
--- a/net-misc/netifrc/netifrc-0.2.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
index e8e781d17e4e..b24c2bc70b11 100644
--- a/net-misc/netifrc/netifrc-0.2.4.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
index 4ab88729401a..bce330d3a59c 100644
--- a/net-misc/netifrc/netifrc-0.3.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.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
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
index fa4fbb8bc3db..5562712b7216 100644
--- a/net-misc/netifrc/netifrc-0.3.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.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=5
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
index 9cf45711926d..70378aa036ea 100644
--- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.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
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
index fa4fbb8bc3db..5562712b7216 100644
--- a/net-misc/netifrc/netifrc-0.4.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.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
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
index ef1c1971295e..ccf27f251b5d 100644
--- a/net-misc/netifrc/netifrc-0.5.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.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
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
index 4d4f9f5d299f..1716e35bf688 100644
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.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=5
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
index ef1c1971295e..ccf27f251b5d 100644
--- a/net-misc/netifrc/netifrc-0.6.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.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=5
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index ef1c1971295e..ccf27f251b5d 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-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
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index d827d4e534ea..ce3b371333cc 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -19,5 +19,5 @@ AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f652
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p10-manpages.tar.xz 25004 BLAKE2B 8bb830dddc9b664cb974cb9ef887a6c1913e9695b0519e21cd0db0af71c08dd6cf90ce35904ad38605ee0bf90115f1e8e3fcdd6c624806c3448fbc47ba7eb697 SHA512 5b31a1429484ad30a35c8fa38157190a66b0983b5bf1a802c0817613901b5e0644941a3f4d5b660fcfe4ca04968766a5981331a6f9353316e7de953e55c33a09
 DIST ntp-4.2.8p10.tar.gz 6998648 BLAKE2B 93875ddb71fda1a24bcde0358640eb0cdab7aa0020219e7d3f7632cad15c962012c871e04cae5b81156aa30b60f55e9d02ef4c402a921587b980d24fb1134ca4 SHA512 67e01ab533c3dfabb0bdd3ced848bdd239980bde28fdb2791d167b7e9690ab3b3759e1bd99e9fddcce03ddef4cd63a47eb85941bb127ceb79b7ecff22cce9c05
-EBUILD ntp-4.2.8_p10-r1.ebuild 4509 BLAKE2B 41008ab72c17f856810a5bb5e46d2a1a80d434831514b39c19b2d4b3694e62e535839ea255a943b9ea08887ec1075b0c0cb8731337ab89ee92a0a301c6eae19b SHA512 8fc3394ea6cfca15557422ffd6c87dbe074cb955af8537ff8f912dd061015fae3597680de9b7d14dfe99ff871643567e519aa75f10f85e74be427c555b861230
+EBUILD ntp-4.2.8_p10-r1.ebuild 4497 BLAKE2B b5f75868d8b701db7a11b5ff228cc820e614a3e8def312645ab1585fa93163ade7efae74fbbe86137b0e9e9d7d2217c0c3894a0d6624c48f585fbfe9e8d14574 SHA512 db0818229c52746360083923962ecbb649d5eefa0ba21e52daf27186b5e6e435a9cc510df01416376e159a6edae67880bce4c43f17329d773e4a395908f0f83d
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
index 5b4ea67e919d..af336404a175 100644
--- a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p10-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"
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 002bfda69a39..4e79ec72466b 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -7,5 +7,5 @@ DIST nx-libs-3.5.0.32-full.tar.gz 6801696 BLAKE2B 05101b49e2e18d38527aaade47b067
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
 EBUILD nx-3.5.0.30.ebuild 2743 BLAKE2B 2df3f4f431d3ec7f4faa7cb80b2e9c846a023f2710de5c1da506fdd0cade0f1c56334ab5c4842671d7c0e12ff8eaa0d0359c75305e45bf5f3648000adae89679 SHA512 0ab1df3ca4443ceca485e63b1eaabb0773a861503d8c6bcf669f3a0d36e6c3bd9113a77c1cc06bd56ec78be05b58d5bfe7b972ac08e519d2c61c9ebc9e02679d
 EBUILD nx-3.5.0.32.ebuild 2655 BLAKE2B dd8c8dbd09d7dd928246de8945ed374f8363128fffa11ec93f8a0f4062ca25530f2b51b9e7e646d98115b576754598d7bbeefa3b045205cbf94e5bf4df678c72 SHA512 bf5638e1f600a64549cbd5651ad052593043b91d957ba064a03ffa63088780c10991d2fe0526241571aca6be8c307c5e8a6d5e338bd9b811e9dc97bf8ede4a0d
-EBUILD nx-3.5.0.33.ebuild 2340 BLAKE2B f82cdb20b461610077bbd4f830aab473865160dea1b9abd2a339adfba99e58aa8d213fb25afed8e7ba66586e0d7ecb2b7314083ac696aa5253903f15963832a5 SHA512 2765c04ce153c90be75039f9e1c407abe0a257e2bb2286dfffab4b04871ec9ba88f7094e408528f39a37376a4a69f224a51fb33e9e717928c7a66778ba076255
+EBUILD nx-3.5.0.33.ebuild 2339 BLAKE2B 65bb20d909161223c3437b6ff97c351d029bf1e32963aa16c79a38215527002cbbafeb1fa9f853b8a2c1c94bc684aacb0d1b9959aa863272eedc615a49eeaf5f SHA512 51962003c2ce8d42185327a705265207a40c84c9b7ca47cc8c5f5bc8cd5a0e6d5f4370f0272029f2b92a3bed5294dbaf9dc82f7392515c898396d81bda8c4c7a
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild
index 7a8bdd99cf2a..167512cc9773 100644
--- a/net-misc/nx/nx-3.5.0.33.ebuild
+++ b/net-misc/nx/nx-3.5.0.33.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="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="media-libs/freetype:2
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3868fb040023..9a982a9dc8a4 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,6 +7,7 @@ AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ac
 AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
 AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032
+AUX openssh-7.6_p1-hpn-x509-11.1-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
 AUX openssh-7.6_p1-x509-11.0-libressl.patch 570 BLAKE2B 0b22cca997909743ec3247a80a9efffda7e85235274df98fd8aebf549a1a7cddb3906dd4cc678bf4176f634c5e4b123a00af9d0690672e9bee06e848800eb1ff SHA512 795d3e99d81cbd76533196b6a73a9c9a6db800f9de1f6c7860b56058d0a319c6633ab09b8a149ed6d840b3c9a43162ce299e2a16e334a66802260fbdc35b2b17
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -21,11 +22,14 @@ DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc
 DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81
 DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e774ac7423e2f4439f2adf585aae18fcf55d63f7f5421e716d76e2dd0205b186b6fea1f53132453ea82f0821cea3124c SHA512 8445a9a8ae8e8baa67c8f386117877ba3f39f33c9cdaff341c8d5fb4ce9dfe22f26d5aedc2b0d4aab67864994ec5a6a487d18b728bd5d5c6efe14175eb9c8151
 DIST openssh-7.6p1+x509-11.0.diff.gz 440219 BLAKE2B 9329a7cf8575c21c31ec73f8ca1084708de34a5b530699d8be2a2a75e1ce0d37210a897c894ab75ee8e2ad0f0802d483d041b1bf3cf3ea46a4a423f1350f42d2 SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a
+DIST openssh-7.6p1+x509-11.1.diff.gz 451725 BLAKE2B 1397c05539ce7532f5e6bf33fc16d5661c32365e127ab1134c0a12c70f0645b05eb05d3ebd9bf64ed59cb94a63cbe8466ac87c9831605230d1ccd578a736904b SHA512 8d445911d8b28fb922a2a0ddb4b7783f81bc258af708148541d30cb79012789cc319bc2031b4584c4c5504480b70077e675be01070fd3065dc4f5ddee89ad8f1
+DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
 DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f54e3ee54e0d05a24d3331613c241e684a43354b6100ee2be76e5b2dcc8f0444fbae5d146830d634e53a85124d5e553759a552 SHA512 0e2c62cdec360090b359edfd5bbe894fb25d22e387677e8a5d6cf6a0807b0572fda30b90c30390d5b68e359e9958cb1c65abae4afd9af5892c3f64f6f8001956
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r3.ebuild 11127 BLAKE2B aed57a04ffa504758827af9269c747617598677fc3ec2a2c587b559f7874b9f1d0a0269a32ff7fe4fb454271f62cc7931a68bf537db9bee4e4cdf7925d040046 SHA512 2fb7096c8b6a44d9abd89c8312d506a5ce711a7be049d1fc227d155fc80e138b1118110c9f5491d92a1ebda310207d75eaf80069d122ea4d4dde4002fa96b66c
-EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
-EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
+EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb
+EBUILD openssh-7.6_p1-r2.ebuild 11172 BLAKE2B ce0c8101f1e13686c748aaeeb4603244618a1efce52f2a7fc7eaef8d4bf7acf0f19c41e5393d03cb8179a813b0aaae91eca1f86b30c22bafcfec542fa9e0f7f7 SHA512 4d725eee7492aac558b3c5a73a52521278f80777be96cbb8fb7e195bd4463dca19806a35ff276c00ac081f071fba6f2edbe39a1981c14c52c99a453fb78c3d3d
+EBUILD openssh-7.6_p1-r3.ebuild 11099 BLAKE2B 869ea2d4a3e847210b901cd252ec079f7ca596fc29bc459a665b40c39c0980103dfecdbd3888344deeac2c5a5ba4e8f84452a9b96bbc87d1c01cdda0ac79b85b SHA512 f98e0e4d191532605a313486304b1e738712d20ee94a66f1a66dfe30ff8fec483e51f6302ad8677d08d02ab8a8f5a96d203b8f60c3c7d7a4229eb0fdf893e779
+EBUILD openssh-7.6_p1.ebuild 11171 BLAKE2B 0c91399c7dbd07f7101c609eba7ae19d91f5c270f817f7d1311935faf5520b22a0ddfd2e4cf1953055fcc601092370d37d223714cb597be798ffe4019af3bbca SHA512 5b3c82f8999a4e59ca481eb7c6b77571ec33341c8f2a7b949dc3894c13d8adb93c6df4270216d2ecee4576f3c5f96aa29873b0caca841aae54adcc998e54f27a
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
new file mode 100644
index 000000000000..2ed6a7b54a66
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
@@ -0,0 +1,50 @@
+--- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
++++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
+@@ -907,9 +907,9 @@
+ @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
+  {
+  	/* Send our own protocol version identification. */
+- 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++ 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
+++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
+  	if (atomicio(vwrite, connection_out, client_version_string,
+  	    strlen(client_version_string)) != strlen(client_version_string))
+  		fatal("write: %.100s", strerror(errno));
+@@ -918,11 +918,11 @@
+ --- a/sshd.c
+ +++ b/sshd.c
+ @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+- 	char remote_version[256];	/* Must be at least as big as buf. */
++ 	}
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
++	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
++-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
+++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+  	    options.version_addendum);
+  
+@@ -982,13 +982,14 @@
+ index e093f623..83f0932d 100644
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,5 @@
++@@ -3,3 +3,6 @@
+  #define SSH_VERSION	"OpenSSH_7.6"
+  
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+++#define SSH_PORTABLE	"p1"
+ +#define SSH_HPN		"-hpn14v12"
+++#define SSH_X509		"-PKIXSSH-11.0"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
+ -- 
+ 2.14.2
+ 
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
deleted file mode 100644
index a3c62aa567f5..000000000000
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
-X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	ssh1? ( ssl )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
-			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		epatch "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
-	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
-	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
-	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
-	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
-	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
-			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	epatch_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssh1)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
-		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
new file mode 100644
index 000000000000..5574b9b318ca
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD 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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.6_p1-r1.ebuild b/net-misc/openssh/openssh-7.6_p1-r1.ebuild
deleted file mode 100644
index 6cc76cb25419..000000000000
--- a/net-misc/openssh/openssh-7.6_p1-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-#HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eapply_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.6_p1-r2.ebuild b/net-misc/openssh/openssh-7.6_p1-r2.ebuild
new file mode 100644
index 000000000000..ce99373986b0
--- /dev/null
+++ b/net-misc/openssh/openssh-7.6_p1-r2.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+#HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
+X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD 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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	eapply "${FILESDIR}/${P}-warnings.patch"
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}" >/dev/null
+			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		elog "Applying HPN patchset ..."
+		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eapply_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	# remove this if aes-ctr-mt gets fixed
+	if use hpn; then
+		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
+		elog "set since it does not (yet) work with >=openssh-7.6p1."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.6_p1-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r3.ebuild
new file mode 100644
index 000000000000..0fb4aa2b639f
--- /dev/null
+++ b/net-misc/openssh/openssh-7.6_p1-r3.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz"
+SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
+X509_VER="11.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~chutzpah/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~chutzpah/${X509_PATCH} )}
+	"
+
+LICENSE="BSD 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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	eapply "${FILESDIR}/${P}-warnings.patch"
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}" >/dev/null
+			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+			save_version X509
+		fi
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		elog "Applying HPN patchset ..."
+		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eapply_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	# remove this if aes-ctr-mt gets fixed
+	if use hpn; then
+		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
+		elog "set since it does not (yet) work with >=openssh-7.6p1."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild
index 490a91163fae..ff5b2fc3ad58 100644
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1.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
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 653bd3d8efac..d32415cc6766 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,4 +1,6 @@
 AUX quagga-0.99.22.4-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
+AUX quagga-1.2.2-ipv6-bgp.patch 1749 BLAKE2B ba798e22dd81472f8d57289f23ab4aa648376e24aac708e6918ce421642ab26b9c0038411dbe1c5ab545eae7b2d5e1683c47e34ad010b02925e8c279976bb018 SHA512 780547ed801e493d8f237750b7c715c66320e88600e660364bee23782e22580c73883571b27284f3f7c7ed1734c54377226da02217465e1b08ea2bc457fc5236
+AUX quagga-1.2.2-sparc-tests.patch 1158 BLAKE2B 7f0071c55b2766330b9c32a9800db5f1723718d6a405b5d88e989c7d6222cb5b6beca173cd46e4d2566ddebe18b77eba26b83b63250b4efe0366cc2ef632bf54 SHA512 61f1a4ef9e2e116f32a524814d9aca818d11f03682f6284f175d478e5e29c8a69fcd9d9824a385dba07acfd44122698739755243165ecd466d83d3365e12ce4a
 AUX quagga-services.init.3 1072 BLAKE2B b4c3c8d6399c6c60cedfffad65f3cde56a46c9b97a62b04709660c9ff9023dd4254e7d5c78c9672bcd83c678c57c921605afbaaf9961df94d5e00abd7bb00211 SHA512 03ce5cf77612ece73d3df85c6afa747dab479949299458b5c6f59dcf778b60314fd0a9c7987be289cc0b8363dcc6e337ab5309e0a86f716208ddfc5f12b8a4b3
 AUX quagga.pam 975 BLAKE2B 71fba18cca8f1a12399556f8247a04e9a1750ef178092c6066c3f93383baff25ddfa9aae495ab20a5d068586bcc6032dde31c590aebdc639e8ad7681e0b56417 SHA512 92dc6c68146d46046c6f5ff410629a2a7170e81e9657b7a2aebe1d94c8fa267acdcac9d8d8596fb54dbbacc0566502e82d900ea33f8824c07fba497b7e0f1efe
 AUX systemd/bgpd.service 347 BLAKE2B 96902e15c0d8cc6f800f31abe085b8447f7607fe1322f181fb251da18bc3ebdf371fe38f285e2d973f63881e18efa647812b0fc89b4a798903f1d3fabbf5e3c5 SHA512 dfefd7b758fd41ccaeb024c0ba4f08400086e05f44c1985cb387d0dfb0c0e19844879b49f84c350282e0d5d56dd1c65c8ac33f65e06543a20aacdfbba593606b
@@ -15,5 +17,6 @@ DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b0
 DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
 EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
+EBUILD quagga-1.2.2-r1.ebuild 3754 BLAKE2B d02a64634572f06acb61b27a0dd3c15f7ebc9e2a901614b60a1fd5fee14ba2ffd53bc1aeaceb363572c63ee56abbc99a6e311f7358a4311a7b62b1d639baaede SHA512 e2c9a1a1f8a11149d9704b68ff1dfeb051f158cdec5e5e38f16899d2a31a81d5ea5ff8dcf8b32da7b5c00da50d1b18ac71dfc22f15d0f83ae8ce85dd79d0854a
 EBUILD quagga-1.2.2.ebuild 3677 BLAKE2B c00173db06bc9d1e9a17b8cdbbcb8aec3d6dc0a1ba25a9a8a9c37faa23b52d2b59f2cefc3f8e8d23c5309f144a2d725610087b76de0a3ab4d984366e607cd8f2 SHA512 1d4638973eacf1e985f59182d4d98c6c2e339f13caa387d7aed8302a99b2f208e78fe5d902219839b9cad71b4306130c4bc6dbe6d608fd4022a64abe0f8640f7
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/files/quagga-1.2.2-ipv6-bgp.patch b/net-misc/quagga/files/quagga-1.2.2-ipv6-bgp.patch
new file mode 100644
index 000000000000..0ee5f322f76c
--- /dev/null
+++ b/net-misc/quagga/files/quagga-1.2.2-ipv6-bgp.patch
@@ -0,0 +1,42 @@
+commit 1db1b9baea511995b67a9b282d5c97e87479fe5d
+Author: Mathieu Jadin <mathjadin@gmail.com>
+Date:   Thu Dec 14 17:53:53 2017 +0100
+
+    bgpd: Fix mistake in NHT of connected IPv6 next-hops preventing route advertisement
+    
+    Since quagga-1.2.0, the Next Hop validation for directly connected peers
+    using IPv6 does not work.
+    
+    In this setup, BGP updates contain two next hops: a global IPv6 address and
+    a link-local IPv6 address (a correct behavior according to RFC 2545).  This
+    means that the length of the next hop attribute is 32 and not 16.
+    
+    The problem comes from the function "make_prefix()" in "bgpd/bgp_nht.c".  It
+    refuses to build a prefix structure for a route when the length of the
+    [Anext hop attribute is different from 16, even if a valid global IPv6
+    address is available.
+    
+    The route is mistakenly considered invalid and thus, it is not installed in
+    the routing table.
+    
+    Details: "make_prefix()" was not modified in quagga-1.2.0 but its
+    interpretation was changed in commit
+    3dda6b3eccb9a2a88d607372c83c04c796e7daac.  Before this commit, the failure
+    of "make_prefix()" was interpreted as a successful validation of the next
+    hop.
+
+diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
+index 1158ab15..d734c201 100644
+--- a/bgpd/bgp_nht.c
++++ b/bgpd/bgp_nht.c
+@@ -409,8 +409,8 @@ make_prefix (int afi, struct bgp_info *ri, struct prefix *p)
+       break;
+ #ifdef HAVE_IPV6
+     case AFI_IP6:
+-      if (ri->attr->extra->mp_nexthop_len != 16
+-	  || IN6_IS_ADDR_LINKLOCAL (&ri->attr->extra->mp_nexthop_global))
++      if (ri->attr->extra->mp_nexthop_len == 16
++	  && IN6_IS_ADDR_LINKLOCAL (&ri->attr->extra->mp_nexthop_global))
+ 	return -1;
+ 
+       p->family = AF_INET6;
diff --git a/net-misc/quagga/files/quagga-1.2.2-sparc-tests.patch b/net-misc/quagga/files/quagga-1.2.2-sparc-tests.patch
new file mode 100644
index 000000000000..054d15f03554
--- /dev/null
+++ b/net-misc/quagga/files/quagga-1.2.2-sparc-tests.patch
@@ -0,0 +1,31 @@
+commit adda534f95ec87206c9dfd1b3bae05221dc29730
+Author: Rolf Eike Beer <eike@sf-mail.de>
+Date:   Mon Dec 4 18:36:21 2017 +0100
+
+    bgpd: fix SIGBUS
+    
+    There is one test failure in the testsuite on sparc:
+    
+    Running ./bgpd.tests/testbgpcap.exp ...
+    failed: testbgpcap ORF: ORF, simple, single entry, single tuple -- testbgpcap  aborted!
+    
+    The error is a SIGBUS in bgp_capability_mp_data() because of an unaligned
+    memory access.  Use memcpy() instead of direct assignments.  Compilers on
+    platforms that support unaligned accesses should be clever enough to
+    optimize the function call away and do the direct store, so this should not
+    hurt there.
+
+diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
+index 28004230..d9ec4bef 100644
+--- a/bgpd/bgp_open.c
++++ b/bgpd/bgp_open.c
+@@ -120,7 +120,8 @@ bgp_capability_vty_out (struct vty *vty, struct peer *peer)
+ static void 
+ bgp_capability_mp_data (struct stream *s, struct capability_mp_data *mpc)
+ {
+-  mpc->afi = stream_getw (s);
++  afi_t afi = stream_getw (s);
++  memcpy(&mpc->afi, &afi, sizeof(mpc->afi));
+   mpc->reserved = stream_getc (s);
+   mpc->safi = stream_getc (s);
+ }
diff --git a/net-misc/quagga/quagga-1.2.2-r1.ebuild b/net-misc/quagga/quagga-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..5e0fc3e952d3
--- /dev/null
+++ b/net-misc/quagga/quagga-1.2.2-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	nhrpd? ( net-dns/c-ares:0= )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	sys-devel/libtool:2
+	test? ( dev-util/dejagnu )"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+	"${FILESDIR}/${P}-ipv6-bgp.patch"
+	"${FILESDIR}/${P}-sparc-tests.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-isis-topology \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/quagga \
+		--localstatedir=/run/quagga \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable fpm) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable nhrpd) \
+		$(use_enable protobuf) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# Install systemd-related stuff, bug #553136
+	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	# Path for PIDs before first reboot should be created here, bug #558194
+	tmpfiles_process quagga.conf
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index d3efff6ae16c..8720a6a35925 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,5 +6,5 @@ DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a
 DIST rabbitmq-server-3.7.2.tar.xz 2466952 BLAKE2B 99065384e4a8c3362200c1cea9225e243952d1c7eae2e5feb5a5cbe6d17c1a803cb904edc9a1e3f9e23a99b6e5b2f119b4ce226765e97db1310776b19977c00d SHA512 8972efd81c03d5499393ee87000f86373a1e933ce327318122d603ce4e76156f1c8588f3740adccc74c00afa5256ea6a040f1c420bacf3eaec170224259e1c3c
 EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
-EBUILD rabbitmq-server-3.7.2-r1.ebuild 2977 BLAKE2B dd075c562e355c55b4a9dde74c9365183391f6d8b25b84ac4a6603f9aa7899c84a5e907cd2a4176539f65710c86b93dfc964fbe2214f4586f6fa9c12ac11b96f SHA512 f51cc6066ffe86ddfe34b4514e63ac4e87bb286f7e04348df540bd46744b70064abf82047d1dfb6eb0e34c1f00d78ae7d3b3251e5dd2ccea14386b31c0e0b453
+EBUILD rabbitmq-server-3.7.2-r3.ebuild 2976 BLAKE2B 518fc25d30821ccaeebbd4eb13cce4f15609444d28425db6fbe305597b01e79a7b5d73a9584c58be1498ecd2de1ff3ce77780f6c912b0274836c55f817b38e5d SHA512 bb93f4adc495257c5fad28d8ff6a5369d6cd5bb6f68abdb31ce315eefc3a41e7649a06a3d136ae681b03587748bbbc88d0fcbe55dfb32f625533df6187d386e4
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
deleted file mode 100644
index 9ab7ab6bcfe3..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/erlang-19.3[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-lang/elixir
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
-		exeinto /usr/libexec/rabbitmq
-		doexe deps/rabbit/scripts/${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "http://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r3.ebuild
new file mode 100644
index 000000000000..bdd9bd4877d0
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/erlang-19.3[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	<dev-lang/elixir-1.6.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv/schema plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ae3aa8c1c9a6..e747ffa2e0f4 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -11,6 +11,6 @@ AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99ac
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
 DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597
-EBUILD rsync-3.1.2-r2.ebuild 3079 BLAKE2B da170ff573c25a1c84c615bdc28b69070e66df5a53d7d3045451cf9535f98439a25dbf5a0032b08c9c810f67f2631b44b996015427c334c0d23d2afca9fe9967 SHA512 facf9e9db4212fa57602334def44fe56f869da794e2a0c4e3ed896755d86b9704c4a3b3f76141e8c1eb4750744c77c7e4642266dae9ddff7eb4b2ca427b31b7f
-EBUILD rsync-3.1.3_pre1.ebuild 2845 BLAKE2B b7503011f44b15f1ff78e3159928df5ac79e2da9ad281a729e3a4ec1bfa37bbf61101ab9ba957640c4012cf8b376d02e1cfe01a9921fc5c3e69bfa455d5707d6 SHA512 8467ea94878109a3d06472227b0c648e77001fb7ac271c5ee43a70f367fb54c68e270cb931b6d3ff2eb99303547937afdee070cd1df8d7d481ced91e6b5a019f
+EBUILD rsync-3.1.2-r2.ebuild 3067 BLAKE2B 6d7a98dd131f732aabf23725b90a0c4d9ca63bdfb94894c0764d249444331bd2c2aed6e07190ce8d844b6ebb60e32b38a4cd728f63539af80d05458f065ae77a SHA512 c1b0b9035e003d9c5648f5f265231fec047bda7f709d1e82172b6537eec10e8c2f0c0d73471d4d81f7a51339988ed4a3ebf4c7afc42106b5db17545f05162ce7
+EBUILD rsync-3.1.3_pre1.ebuild 2833 BLAKE2B adf5ed029c2f6765f458c8b432f8aebd6679faa626522a7c3e5c50066d9ee7ae8f37540a4863ed62021564854dae9c1e21e8c07d4bcc2e4abc9eb35e4d05f2e9 SHA512 fd19212f5583ecc13e600dced8a4960e176f086ea7f79f767d031236a6b17ec814c06a5a6f32c7309f617d78f07d052d5bab39095599fd32625c984a907efe32
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
index 224e0afbccf6..eb37dc148bc1 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.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"
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
diff --git a/net-misc/rsync/rsync-3.1.3_pre1.ebuild b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
index 2c1a70bd5e11..3136cdc4f8b2 100644
--- a/net-misc/rsync/rsync-3.1.3_pre1.ebuild
+++ b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 091d9086ed9a..8c214ef443c6 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -2,7 +2,10 @@ AUX sslh-1.18-systemd-generator.patch 603 BLAKE2B 87116f0332cc6d4076c8d6b4b14c89
 AUX sslh-1.18-version-deps.patch 256 BLAKE2B edca1e2490081b845efc08867d5368e52bd72c7414db4fecd8b081e952f558f975cb9d0b1e5b9ca72875cc0abf216a2d0351c40e1e887bc1d983ce3652a9b71b SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a
 AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f
 AUX sslh.init.d-2 465 BLAKE2B eb34383ade0d3fe778d11d098129f5466df15816ca8eb8eb7c5b2cb8eebee91195b0e3e9f9be4fa5f941f8aacbfbb4d718876a8e8af0c9a13c6dcdf2dc6d104b SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba
+AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
 DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
+DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
 EBUILD sslh-1.18-r2.ebuild 1753 BLAKE2B be4845b0cfa8e7360cee513a1c570e1f86c061d578344929fceaffc1f1006b358dd21ba2c4ced28b68934d3c868c36e8e3d471cecc91fc6306ebf20610aec4fa SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7
-EBUILD sslh-9999.ebuild 1822 BLAKE2B fff4484d47001abe61a2b8b2644f1a22d110c819b90910d4a96ba4bad9a78d858fdf32c3b5b84671171c975350fa4cc0bd436016a6540f4a105bff8811722b27 SHA512 027e715859cc789dbc180ea7a4dbd21580e54b05ffbb1c7b3372c3c05647c1e98f21cec1e88393908d342bfbd085cd7c5c5bded59e99ab376be89cdd3e98af04
+EBUILD sslh-1.19.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
+EBUILD sslh-9999.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/files/sslh.init.d-3 b/net-misc/sslh/files/sslh.init.d-3
new file mode 100755
index 000000000000..7f9d61795b73
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-3
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Port multiplexer for ssh/ssl/etc..."
+command="sslh"
+pidfile="/run/${SVCNAME}.pid"
+command_args="${DAEMON_OPTS} --pidfile ${pidfile}"
diff --git a/net-misc/sslh/sslh-1.19.ebuild b/net-misc/sslh/sslh-1.19.ebuild
new file mode 100644
index 000000000000..3c1ac5f9f7f7
--- /dev/null
+++ b/net-misc/sslh/sslh-1.19.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+	MY_P="${PN}-v${PV}"
+	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre:= )"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 8f3831fefa9b..3c1ac5f9f7f7 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
 	MY_P="${PN}-v${PV}"
 	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
 src_compile() {
 	# On older versions of GCC, the default gnu89 variant
 	# will reject within-for-loop initializers, bug #595426
@@ -51,12 +59,11 @@ src_install() {
 	dosbin sslh-{fork,select}
 	dosym sslh-fork /usr/sbin/sslh
 
-	gunzip ${PN}.8.gz
 	doman ${PN}.8
 
 	dodoc ChangeLog README.md
 
-	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
 	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
 
 	if use systemd; then
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 1f3fb8b1f5d5..52202fe74509 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,12 +3,10 @@ AUX wget-1.19.1-CVE-2017-13089.patch 1093 BLAKE2B a268a832b13ba6e08c8cf7889e4998
 AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7aff9939e13144ce1848753a41dedbf267d50276925b888cf98f4e60f869f4bd6d4fe16dd5a6380bcb212ec828e845e895a4 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36
 AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9
 AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19
-AUX wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch 2148 BLAKE2B 0eae4ae98a081764b271f7b4c83f1100d957a77ab48d0eea7b6ce4ffa79ffc1ee88523c801603a8c2eee5c7b33382bcec0c6d6fd48ed1a731af6f2a7ebae8671 SHA512 35d6d3dd10da123b4aeca1888b690439c8e3f20754e44be987e04c3966cacb1663833d8e7ddfe0067ba300ee6393833c2f6a7611bc3518eabb84649216cf4c33
-AUX wget-1.92.2-openssl-1.1.0-r1.patch 2426 BLAKE2B 92f533614e9e01b974b06ea7ffc3c7240dd576161ef84d3ac0dcccc279088fb1e55045668a2d275159618c26de07274e4d4e1857ecdcaf36c745e471b174a0eb SHA512 e8fc99f46b5ea3df12cc3af29e075e52cec7f79b65981d1f0aebdcca02741cff2379290d6781e8380d915c7fb8cb29541d0d0f961bf55785ea4cbc7984cece35
 DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5
-DIST wget-1.19.2.tar.gz 4349267 BLAKE2B 3622d39ea477d4137bd7f2a443d141d8832e2e1adf4dceb5c396aea782fee31bd69ad2b49771062f25c57e6a21701f844077000dfa175e89eae26cf4c3fdca09 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd
 DIST wget-1.19.3.tar.gz 4311432 BLAKE2B 7c636465b1fe575531ec6616d27a07d3c4b398dda002eb4199d4c72906f233067a420f1c3a0878b3fe3cb9fae47a12cd50a83098f20f59ca6dd35bc37b1468a6 SHA512 8e1cbad2a31880befaf2c079bb17a357a135f6f2402048d27ac367430dbd932ef1b8197fb1002a64474e5480a8d9e41146b5cfd591d204b2f8b0bb240ecddb2c
-EBUILD wget-1.19.1-r2.ebuild 3374 BLAKE2B 3fb70d8ce5acbe8bf3c70f880bce4527e42cdfeb5a0c6cc71b0665526c1e6ed8768ada32eadc1f42e97264390a54d724a66c60c7eee806628bebc73fac98e811 SHA512 463eda01a400073e3b34ac69f3c2ab56901d2143214ad342a054a0fa509c61921574977fefa5631d4df05ad9dd3258d377c26dffc9b9dc4112fb89a67d7c9e66
-EBUILD wget-1.19.2-r2.ebuild 3312 BLAKE2B c1d176288d7b68c46bc611db01d7329c99ffae676cfe8ac54a490a102eb6bf1194ca73600c95b5a0d4a9d92d696e276daf324a943f5d6eb977b88a66cce0e30a SHA512 9522cd93591a914a00c7e0f8f505e0e233464448fad7ae92c159e26b70f9347b3b977d7ad08967fe5cd4c0da8c3ecc96aec31220f6953e2b00896370b0c438e1
-EBUILD wget-1.19.3.ebuild 3196 BLAKE2B dee16405c78aa85f12558a4037e7ac3514dd680dfb42599ac4e8115eac3a7f1d596a05578920e30a0fa8a276fbbb52750141c636ccf150bb272f6d1ce4c81e46 SHA512 f19fcc2c53e21296d2e481feb4179a48e852dae4598ce28c12c711bb7f339553ddcca42164cd633b4c8f51cd87cc6c789d2893205146fc1c155baace05ad35ba
+DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a
+EBUILD wget-1.19.1-r2.ebuild 3362 BLAKE2B 9e0843ac2153d0530b997170a7d3a6b09a1555ee77c45592a0333ebb0ac3d130f743abf3357a227dde7da3ff27ab97ba3d5e5e7e197c3925382098af20aeca9f SHA512 3db627638b306b5cfcda192938ce2272ecce0e9c73c3fe497e2f057421d1d04306e2c1c9bf913d0fc4ae4080d591ef5b4a184e31bcbaaf1471c0500c448e8d8d
+EBUILD wget-1.19.3.ebuild 3184 BLAKE2B ebeb8056f889895dee8493d813c7f9140ae3bfcad804396a6c8198becb7586f04900e7199dacfc4d4faafdfcbd818b7203abeb630d9d1b562a1351dd6601ba74 SHA512 348444c652f31edd9ca6e5c8fb8d287c31be04bd510647d240ba75dc419c9f3026621e83821eaef105fa0c1bbd1ac962b25b63bcbb185fefa57f823b57855d7d
+EBUILD wget-1.19.4.ebuild 3184 BLAKE2B ebeb8056f889895dee8493d813c7f9140ae3bfcad804396a6c8198becb7586f04900e7199dacfc4d4faafdfcbd818b7203abeb630d9d1b562a1351dd6601ba74 SHA512 348444c652f31edd9ca6e5c8fb8d287c31be04bd510647d240ba75dc419c9f3026621e83821eaef105fa0c1bbd1ac962b25b63bcbb185fefa57f823b57855d7d
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch b/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
deleted file mode 100644
index 8a66e08c3e3b..000000000000
--- a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 973c26ed7d51052a7b6e120ed1b84e47266667e1 Mon Sep 17 00:00:00 2001
-From: Darshit Shah <darnir@gnu.org>
-Date: Mon, 6 Nov 2017 10:09:03 +0100
-Subject: Fix Segfault due to derefencing null ptr
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/http.c(gethttp): When Encoding is gzip, ensure that the
-Content-Type Header was actually seen. Without this, the "type" variable
-is null causing a Segfault.
-
-Reported-By: Noël Köthe <noel@debian.org>
----
- src/http.c | 30 +++++++++++++++++++-----------
- 1 file changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 9954848..2a5454f 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -3714,22 +3714,30 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
-                && opt.compression != compression_none)
-         {
-           /* Make sure the Content-Type is not gzip before decompressing */
--          const char * p = strchr (type, '/');
--          if (p == NULL)
--            {
--              hs->remote_encoding = ENC_GZIP;
--              hs->local_encoding = ENC_NONE;
--            }
--          else
-+          if (type)
-             {
--              p++;
--              if (c_tolower(p[0]) == 'x' && p[1] == '-')
--                p += 2;
--              if (0 != c_strcasecmp (p, "gzip"))
-+              const char * p = strchr (type, '/');
-+              if (p == NULL)
-                 {
-                   hs->remote_encoding = ENC_GZIP;
-                   hs->local_encoding = ENC_NONE;
-                 }
-+              else
-+                {
-+                  p++;
-+                  if (c_tolower(p[0]) == 'x' && p[1] == '-')
-+                    p += 2;
-+                  if (0 != c_strcasecmp (p, "gzip"))
-+                    {
-+                      hs->remote_encoding = ENC_GZIP;
-+                      hs->local_encoding = ENC_NONE;
-+                    }
-+                }
-+            }
-+          else
-+            {
-+               hs->remote_encoding = ENC_GZIP;
-+               hs->local_encoding = ENC_NONE;
-             }
-         }
- #endif
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch
deleted file mode 100644
index 79f33b157599..000000000000
--- a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -174,11 +174,16 @@ ssl_init (void)
- {
-   SSL_METHOD const *meth;
-   long ssl_options = 0;
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+  int ssl_proto_version = 0;
-+#endif
- 
- #if OPENSSL_VERSION_NUMBER >= 0x00907000
-   if (ssl_true_initialized == 0)
-     {
-+#if OPENSSL_API_COMPAT < 0x10100000L
-       OPENSSL_config (NULL);
-+#endif
-       ssl_true_initialized = 1;
-     }
- #endif
-@@ -202,8 +207,12 @@ ssl_init (void)
-   CONF_modules_load_file(NULL, NULL,
-       CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE);
- #endif
-+#if OPENSSL_API_COMPAT >= 0x10100000L
-+  OPENSSL_init_ssl(0, NULL);
-+#else
-   SSL_library_init ();
-   SSL_load_error_strings ();
-+#endif
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
-   SSLeay_add_all_algorithms ();
-   SSLeay_add_ssl_algorithms ();
-@@ -229,16 +238,31 @@ ssl_init (void)
-       ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-       break;
-     case secure_protocol_tlsv1:
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+      meth = TLS_client_method();
-+      ssl_proto_version = TLS1_VERSION;
-+#else
-       meth = TLSv1_client_method ();
-+#endif
-       break;
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10001000
-     case secure_protocol_tlsv1_1:
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+      meth = TLS_client_method();
-+      ssl_proto_version = TLS1_1_VERSION;
-+#else
-       meth = TLSv1_1_client_method ();
-+#endif
-       break;
- 
-     case secure_protocol_tlsv1_2:
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+      meth = TLS_client_method();
-+      ssl_proto_version = TLS1_2_VERSION;
-+#else
-       meth = TLSv1_2_client_method ();
-+#endif
-       break;
- #else
-     case secure_protocol_tlsv1_1:
-@@ -262,8 +286,15 @@ ssl_init (void)
-   if (!ssl_ctx)
-     goto error;
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-   if (ssl_options)
-     SSL_CTX_set_options (ssl_ctx, ssl_options);
-+#endif
-+
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >=0x10100000L)
-+  if (ssl_proto_version)
-+    SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version);
-+#endif
- 
-   /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html
-    * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more)
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
index 1bd59b76fe02..47e6bfaa78c0 100644
--- a/net-misc/wget/wget-1.19.1-r2.ebuild
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/wget/wget-1.19.2-r2.ebuild b/net-misc/wget/wget-1.19.2-r2.ebuild
deleted file mode 100644
index b1bda330b2e4..000000000000
--- a/net-misc/wget/wget-1.19.2-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
-	"${FILESDIR}"/${PN}-1.92.2-openssl-1.1.0-r1.patch )
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] \
-	|| [[ ${CHOST} == *-solaris* ]] \
-	|| [[ ${CHOST} == *-uclibc* ]] \
-	|| [[ ${CHOST} == *-cygwin* ]] \
-	; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	ac_cv_libunistring=no \
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		--without-included-libunistring \
-		--without-libunistring-prefix \
-		$(use_enable debug) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable ssl digest) \
-		$(use_enable ssl opie) \
-		$(use_with idn libidn) \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/wget/wget-1.19.3.ebuild b/net-misc/wget/wget-1.19.3.ebuild
index 77b15f3632fc..0405d2bd198a 100644
--- a/net-misc/wget/wget-1.19.3.ebuild
+++ b/net-misc/wget/wget-1.19.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/wget/wget-1.19.4.ebuild b/net-misc/wget/wget-1.19.4.ebuild
new file mode 100644
index 000000000000..0405d2bd198a
--- /dev/null
+++ b/net-misc/wget/wget-1.19.4.ebuild
@@ -0,0 +1,117 @@
+# 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 flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with idn libidn)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED%/}"/etc/wgetrc \
+		"${ED%/}"/usr/share/man/man1/wget.1 \
+		"${ED%/}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index ffcccf3f376d..a9a855a48d30 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -4,6 +4,6 @@ DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
 EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff
-EBUILD whois-5.2.20.ebuild 1514 BLAKE2B 282a50e1d78da86da2411b946eed93c5d4119fc1fa8e1df4d562f75e276192c4efb9abc3f47778906dc9e163e7c812ae185c66b20208cbc40f7a277637877c45 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec
+EBUILD whois-5.2.20.ebuild 1508 BLAKE2B b6486a1f27377bc0cb1e1c71528ccee0434d4562dadb86be53db0e9f677fa59519b78157c7fde37f57b7a30c59767001c4a772bb8d78a094b1c2d826e8c3b076 SHA512 adadd8cf8ddbacb2e6c757d70b8c5bda6cdb8fa0b267d0ab45cd675c71397fec029dcb1259aca5cbcb306f58876b52e24a3f95378cbb91539fba06fb26cdac9b
 EBUILD whois-5.3.0.ebuild 1588 BLAKE2B 4518cbf6d72192faa8ac482d752571d9df527cdf61e856c9c4c572e307e334269c00e031d80beeab44b4ecab207eb9e6428b0e8b3fb5979c197c317cd02dc39f SHA512 fe7028e212fc0a1062e081b46c4c16ff57622b95062ef7533cee5ecaafdfda8200b047e2f24670058652f5c1c2ba7e07fd6c244dfa039cc7716d647da23c64f2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
index b9d8673f4dc0..5e49d4fc2fae 100644
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ b/net-misc/whois/whois-5.2.20.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="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index d39cdef7059e..c59cfe7001c2 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -4,5 +4,5 @@ DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c9
 EBUILD x2goclient-4.1.0.0-r1.ebuild 2009 BLAKE2B 2fc820ab47b02f7a4424d030469f91caacd73d3e04c600efb37a8bafa8c1d7a8613d07e27ece8d07123058b0bb45548c2c0801274be587e57047126c896c1137 SHA512 b5d7c5becb23eacbfc9a0d2a1b6ba0bc9e79392fcead3ee950b589768e4735cec62ce595e175bf067467dc72336721c3106267fd992fd023dbed10abec6e24b6
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
 EBUILD x2goclient-4.1.0.1.ebuild 2011 BLAKE2B ef9f395fade2ac41c745c792d5d034673bc3cc452f1044827fad4375fa4ebf6af9a71640ed162ee4b3ab3e79a94909e52b93364569e97e2929f5a1771101bce5 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9
-EBUILD x2goclient-4.1.1.0.ebuild 1379 BLAKE2B 995bd345ffd44ef17406c5269d8ca122ee2fac56fe6e41dfca8c0af469b9b1ae8d685d2f27a335f6634d670e6f39ace8f4468adb70c9b7966efdf405221f267e SHA512 a36080794b28a5ac4e373110b7bd1f6ecf0f3bd2d68998bf12c2b35128c0bfce4958a4a5385677fb8bf4a48bbafdf6401372d2476698f7a132b7d2519df4812c
+EBUILD x2goclient-4.1.1.0.ebuild 1378 BLAKE2B 0396c882d2a48e71df08fff8fe3a31250ff4ef94198d7967d0db77f8efe1b77a109944986074611800c4d3aa505d96b59178d69bb2358a4c14859e452716ab1d SHA512 f40c009d69556fe39f5d11e569370973f7e978290b1d5de59d5584920f89332b8f2a9906ceb7b53caefe4d087f2cfd2649ca330cbe05b70a32db5944d1a8feef
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
index 53df37c70e2c..e335afabf01c 100644
--- a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 2d614254659d..6298a1e97071 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -5,5 +5,5 @@ DIST x2goserver-4.0.1.21.tar.gz 101441 BLAKE2B 52b9488ad9471c351c66d49624898b4b1
 DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
 EBUILD x2goserver-4.0.1.20.ebuild 2543 BLAKE2B bd9e005bdfa1e0249ad7b1f81ee70380b0b04066e6e00cce2a1d404640fb23f5d6d37d7e1f7e4cd12741f64e75a877433f2c6740e0f2a23f160aa033d116d9b4 SHA512 2141523537811df40bd2c995f11e69b42c84b4cf38f9d6df708743215ee5a2a0dc4f3328f2be9f76f3ab48fe375282f1895754ee0cf1ba59005ba0add7f55c85
 EBUILD x2goserver-4.0.1.21.ebuild 2697 BLAKE2B 92f82889dd714e5de2eabf23c1ec7487e465ce410048d6104e1bf9e1c11d45e0a65440c44ab6be2d98b43fcc7daaa08d1af68e91acc39257342d6b94a7ec710e SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd
-EBUILD x2goserver-4.0.1.22.ebuild 2697 BLAKE2B 92f82889dd714e5de2eabf23c1ec7487e465ce410048d6104e1bf9e1c11d45e0a65440c44ab6be2d98b43fcc7daaa08d1af68e91acc39257342d6b94a7ec710e SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd
+EBUILD x2goserver-4.0.1.22.ebuild 2696 BLAKE2B bf6853014daa2357eb40a3ece184ea9fc1cf5995f8db943db165c421bdd2b3db87842cf73f3762bc5154571208e65f81c5e14b03fcd8e3dea493ab55022617b4 SHA512 ac034fe74532d16747b8457d37add5f0b6a41c2aa91eeb461c56da686351d4c0e9d0d47e168fe796675d7781c66dcf7c59f16f0479f10920c7266a10c995642f
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
index d64c4f2f058c..356aff263d23 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.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="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 0ad8dd8dacd7..7a3c5ead7d5c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,7 +3,7 @@ DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e
 DIST youtube-dl-2018.01.14.tar.gz 2885608 BLAKE2B 57e4eac94ab3ff615470115d2d25de20633828f95d041e17659ae890564f8de5bc67ad1f6209551e3fd7a654892d9ce9eb3e87f016036b10211498b6c526e43b SHA512 687a38a96e8b09452c9460cd4d3796d7334bbe9ff2563adc700865ed8f30f5dd7254aaf3b57a7bdaacda4147210f9390e5c0f739449992abc680a037013189e2
 DIST youtube-dl-2018.01.18.tar.gz 2885167 BLAKE2B 2615c70fbc119c0d07cc797e9c36ea9a751a6603da91ff6822440cec0ccf924ac9cf76b08cb2d2975fa6572473d41cd898f71ceb43529aa27def1a15b7e86367 SHA512 8770b82b61b9038eccdbfe1391d85b7ac8edd8ff1258259a8955ca12b98559b889b0d98e8d39df1f27e7c7dd92cd7ee303af15de19eedfa74206d2a66155c12b
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
-EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
+EBUILD youtube-dl-2017.11.15.ebuild 2378 BLAKE2B d4103998f29f54f2ca5ff154e4bf4dee3f78e618cd8c049cbcb1d8fca987363c5eeab8d02e8bc4e24ccf80937b43e895056aa888fc9755edeb7308730fe306d8 SHA512 294f5c1cf25cc3fd59c16c6d7ca7091051ebc491e8cbd475ec09d70b7d9a8e369de5de5b2c2aa21c97aee344dfe0b91a4cfc2aa55abaf495ca25bb0e0400b2b8
 EBUILD youtube-dl-2018.01.14.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-2018.01.18.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
index a9e6d290efc1..4ba2b1792038 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.15.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="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="+offensive test"
 
 RDEPEND="
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 4382b63175dd..6bd2e9cd1336 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 710b38b4db02..42eda6ee5844 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -24,7 +24,7 @@ AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d05
 DIST openldap-2.4.44.tgz 5658830 BLAKE2B 0d9101bbc159f78f23ffc5db78943dd602610650cda166a2920c4acba502c04d4a96968b9e7f146fe1dd87b677d5da6513500b57ec42b92f9991d577b3a4ed46 SHA512 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
 DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.44-r1.ebuild 27234 BLAKE2B 2344ef9c45146155e4aa81609b26a047a4a6f327ec06df506e4b29026648aac91cbad7e46a86f3683b6d947ab38f709553712f56cc0bcc5e0396e793eb556680 SHA512 a0b9ed30a1392a72e5ba0733ece46a2dfbe93937a1d59d28687f7963173287d87baf58830d24d54e1342734b1796955c8db5df1ff9c1988921ee83ef77a15614
-EBUILD openldap-2.4.44.ebuild 26565 BLAKE2B a2d9e9a6f3949a7fd10c58afbafe927500d1202a628b4ac9944fb05ecb6350881c388644755df6829709e0c2b37175a56811f88fe93ddea207440a4c7c415de8 SHA512 790e70619e39a79fd409b30a05b035b24a2951fe36e15df3d6d0ece1adc47d3268ce2499c9132c6b582f1bac04001461fdd3ea3ba0f8a76875c1355542fd3e9c
-EBUILD openldap-2.4.45.ebuild 28111 BLAKE2B 4844d2b3ad3d2a081b740f84560a6b210500d77ab781821c3e81e8cb1b5e7d4250a23cf9b02f27dc4fa2217b2c7790f19b0f992fbf43a576933b9228403de011 SHA512 95234ffcb21a9d0e9c3f67babcf8c7cfa1bcc18215392fe6cb1af0ed32a75d5abaceda8582e442d212b389f94fb45345933ce20bfbace1498e2ad91b9f6ea37d
+EBUILD openldap-2.4.44-r1.ebuild 27222 BLAKE2B 20fdb07cfdc605b1cf03f2c47c2a3a56dc3cbf8b5cd2b238a197e0b97ea71830e5a41c7d191e1700455cff03cf929b9e682f0babfedf588e83991f427234590c SHA512 e48876bcdcd9bbb5e4c5b85d21e5b92abfab00850784f31a9c475e037dab5c31e4530c744e08500d0c748310be84a79be48e70c6406fb2a5e530812c0f33bfb5
+EBUILD openldap-2.4.44.ebuild 26553 BLAKE2B 1e4c192358bf3903c1240193d513575fa49ba5c1ad5ef40bc2b03ad95a99c40110147348868f743c67ed3c6af37cdc2c24d88b631283d03e98a95e5d2922b586 SHA512 9377752be3ff0c3c773771507688c9d3992e98e6b2943500e60f192bf246481849a85c1b0accc648d4c0a37815d5230149b49b4023b329a4e54beed913162e04
+EBUILD openldap-2.4.45.ebuild 28099 BLAKE2B bd9fd4634f326fbac2115c3ff751882f81a2610191531a7c7ada790a7a4a8cb01ba5a6fd8a7cdf8930d1acd1d5ef0b30f37337322a508b97b0d71e071868c736 SHA512 2a512ff9d5e925f5241787cd4bf60d80708107f7f851c550c07ded81218beb4ddccfbc684933a0d57b40289f56756f30b854f7493591357a8eb6ba5f67197e99
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index d8a585339a5c..7c85e867ef54 100644
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-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"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index a9d3fd556cbe..68058c56614c 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.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"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 83ca893c0e1a..4024eb34308a 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.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"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 1bb7744aa284..612d85b9dc31 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -5,11 +5,7 @@ AUX rpcbind-0.2.4-CVE-2017-8779.patch 646 BLAKE2B 648010974bfc732f39ad0eaea6a6f5
 AUX rpcbind.confd 68 BLAKE2B 2309602d38fd5119fc5e6c123ca9da7a6f86526a0dddad12e1be24a7af9724b5d1b389cf44299722fb4af7932b26fc2a62996bb815cebd258e56a3248e63b393 SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044
 AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e19421459eee23ad3ea77118a053c72cda96d8d2ba8a2ab63faf8bf74d9b238ec4f37b059f62108 SHA512 43f26570fbff0970c5aa0a1ee5f4f561645d31c90e3bb997bd63e05678814f199263a5aaa5051bfe88622a156f8260825ffd905301d158cb410f25631d75cc55
 AUX rpcbind.service 193 BLAKE2B 6e95819841fbc7fb793ec6f6884ae070aa2c420298fc96a111722beae700da71cd5c96ec5c9296a9d80e8e9119b9bb1206df8f1999204f7e0d80badd85e55f47 SHA512 7ec717ebd69cdf3230d09c51c9b3f926a0860967baccbc2345bf8214a2251441b528bbceaa571c84bdcca17c272d43697567885b517501515d15d42f913f3f49
-DIST rpcbind-0.2.3.tar.bz2 121306 BLAKE2B 996bae5b58ee20d96dd1f1dcc7adc1ad227e34082184f9537a0d9a2944bf5b22734694acbdd52f65c29df4a8d16df343f74e93bd92d264b84d9c9120cd5a750d SHA512 b91cb4e0849213d344063ccf32d16c49819906b65e4d07c4aa7d3c8842bd83acb408d07aa285da902c389f3c9716f01678012b93a11863eb174a2577cd6ba1d6
 DIST rpcbind-0.2.4.tar.bz2 122781 BLAKE2B ac1c374a1081559bf09bc209256daa1bb530d71f0c7fe45cec4c9b87cf110c15251a05dce2cf2b78ffa4d902f817efed30350ad08a23e12a7f219f10fe626aa8 SHA512 f3966a7284e94bdf120a9b3f0dd66efa1fe8761df2313545a031f77b7c06e27d7955d2780469943deb537d34f95c4cf3f30de523ec9fab9f571322d7224b210c
-EBUILD rpcbind-0.2.3-r1.ebuild 1410 BLAKE2B 95d6250decb76c6abca0167c407fffe40c9c51ae0d6ee6fafc4677c652f2917710d152dd1bb554565b23af0c465cd2e391fb43dd555bd690eec230125fa0419f SHA512 e9df1c9785881072b6db598a952e74dff2714272260dc721a419083bf29c861197c832e63463deb1907664d8155a7114e095def23d8460f853ad0615d9981cfb
-EBUILD rpcbind-0.2.3-r2.ebuild 1478 BLAKE2B 85e727d0557569c260008af7d553980e959eb2f30bf7bbfc0a2579986462a790e245e7a4d035ba60d56f8d1c74683ba6d0b1b2026d12a15a778d69cca57b0dc0 SHA512 c408d69cf97dace84a85069f567646fbf50baa1971fd465b56c9168978ed9a6fad319b199fe6c8b046286189de5881e406a8331c2bd0ad33f83b93a6787d0995
 EBUILD rpcbind-0.2.4-r1.ebuild 1390 BLAKE2B 25c195b4ab61bad2f55f937cb32d898eecfaafc247abc22a419f9dd17d02c7389545b3de828be515ca6cf77644a023ebb39cf4eec0522ab77bd07e438719b3fe SHA512 970b0bad735da4a16479d21f4e304e7efe90556f3a6155dc2c0665c60fdf1aefadf82e32b171a95f57ee627ea81de19462e5b9de57088f75306ace1263838cc4
-EBUILD rpcbind-0.2.4.ebuild 1316 BLAKE2B f0a157835986a3b78825cd35206dcc32987bf38767c10683bd4530fc3156fd0482d570bb407ba755e51dc238e88a6cf6c335a45faf39212636dc6ac6ce6b546b SHA512 1a80496539d3727c0ce19423d6e8f29f4d2e747c3864fb55d572312668b6c037b80176bb74a91f19af2edfb8503170e39aa36f28189ac97f71aefd2fbca26550
 EBUILD rpcbind-9999.ebuild 1272 BLAKE2B 2e0c6e8ff2c7a70f44d9a32d0db88e2c403f23633268c7d0c265656f4bd8ccec90be051108820fa2f974b192944a0df48add921b8241d92bb8080b846288c8e0 SHA512 69a992076b77d001fc037bbb244f6cb3c93b8ceff1fca253c77d71dc17528aae473182fc7f2ffa63414f57f25d398ea0cd0a0ae81e8f7e2479ea42fd397b3b8c
 MISC metadata.xml 405 BLAKE2B e55c92d34f30b03f0305586b1ec0a5ceca21eae2f5ec21979b0ab21d18162607ad7c6a767d7e6b106820a2c02e11034f4c524816185fda8d0fbf3598a39ffb06 SHA512 accad1ef4202c9ebd7292ae6e1e68a1c59ddbfb741779a635058d54aa1efbf8b70b5e045d53dc9dba61256d5981e11c57b540a1c7b8fb38207863a6f2c50a5af
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
deleted file mode 100644
index cdbbee00c44a..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${FILESDIR}"/${P}-libtirpc.patch
-	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
deleted file mode 100644
index 1d4183d7905b..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${FILESDIR}"/${P}-libtirpc.patch
-	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
-	epatch "${FILESDIR}"/${P}-remove-P-macro.patch #589666
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-nds/rpcbind/rpcbind-0.2.4.ebuild b/net-nds/rpcbind/rpcbind-0.2.4.ebuild
deleted file mode 100644
index 79f8f8fe713d..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-1.0:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 141ae4a7976f..69740d79480b 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index e7816cc150d1..3794c118678c 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,5 +1,7 @@
 AUX liferea-1.12_rc3-signal.patch 2713 BLAKE2B 1e30542d6d40ccf8f9c9e7d327c791c3d5ff706e0442832af6258eb916d7df3929ebcbfd8f6398965698cf3254824e465a6267ed4a2a9a542515abae7b1532ab SHA512 539880199d49d5e2a635324be15406f0ccabf74dfcfd11ff75add18a3e4374b2e2c97b4cb691f9046070435b39456402727d8c0d41ab27b6b21ec3c1347901f3
 DIST liferea-1.12-rc3.tar.bz2 1474948 BLAKE2B 2eff01f0494024d40f2a530ba52a29778ea3a90b2ad786c76658451140509e99c81d08a54e50a4688588e79a0638de72aed09fd6c8e856941094760d6498b07e SHA512 cc3b84444ec95c158311d5d2df7bec0c18f83fd4a7a6a38fdc67a613283288a90076892d0e632447b0523674c8182e70723f2fb865f479cd6fe7a22d4d29d8bb
+DIST liferea-1.12.1.tar.bz2 1490079 BLAKE2B 56963749537bfe7c1f57e95725756b6da43637c2f6a872482033bafbbbb04539d59f942dbb6e35ceda9426a7311b9ba70d37d0a91fb575287dbfe4f5bbc5b136 SHA512 d3e53127f62e91b23aa042ae6dc655eb174f2823320cc01c4cb2b9074f6547ae9a34f6daeb0c1dfb37dfb9f85890ab67223a863f2679ad15a5c7c7f3840d711a
+EBUILD liferea-1.12.1.ebuild 1628 BLAKE2B 6f141ca0fe6f8dca02b36d06ed651eb5e9e572daa5670e45cb5860fdbfb0b8b621f49512daa1871590892d3db0f2d22716c4f5a548714c99a8728ed9d6c06e04 SHA512 49a76b1f8def9150c9af36d94c69a8bdf447aa083988aa96403181b93bbd1151205f13cb1f1ee500a3ad70b7d3318b9733658e10ac1735cd6007b901d2133ee7
 EBUILD liferea-1.12_rc3-r1.ebuild 1672 BLAKE2B af86924207475fd49923b9370c26c66f2ccf1dd56779ef3bf48403465843e7ca17292516b134f49f679a40e975afe35f306060bdda2c8c87510283abc670843d SHA512 7ebd450ce69b09da4a9f1b4b9a96feee486001ba0e8650a201b332741bdd3f3166b05a6b5502baf6065cd0536605be884c643013274d32f422a8eea3cef9d8dd
 EBUILD liferea-1.12_rc3.ebuild 1624 BLAKE2B 7d4e6599750af8c41b55e42f94ccadb88842d347d886b80872801b2b559f8ff2b35c93a96688cd682c4bc5639f1f3994c774f54f12a07244f3bfa6fd7b37a77f SHA512 7bdaf799e2d1de0eb601d056c9dc5099d357082ff627d7f8531047a4a92942a6b581f681a4d0b80dcff2408106e3a08507572ccf7237c95b51da9b622c56850c
 MISC metadata.xml 650 BLAKE2B eb85cb3dfd2c9b13cbbe7920a034674c82af4106728e27b7a0685c9353561d7fea0d0a3366652553ef218fd859cad3d008218bd8410c61f858a128f7fc1b0abe SHA512 8545d82a6b01ef0bf9d7bb723d59bcfc73abb2717495790cdcd59e8bd635e187d9acf49961faebbd170ad9c0475d0dc1279efcfa8a1a64a23e769a07ffe7b586
diff --git a/net-news/liferea/liferea-1.12.1.ebuild b/net-news/liferea/liferea-1.12.1.ebuild
new file mode 100644
index 000000000000..daae977aa595
--- /dev/null
+++ b/net-news/liferea/liferea-1.12.1.ebuild
@@ -0,0 +1,70 @@
+# 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 autotools gnome2 pax-utils python-single-r1
+
+MY_P=${P/_/-}
+MY_PV=${PV/_/-}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="https://lzone.de/liferea/"
+SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-db/sqlite-3.7.0:3
+	>=dev-libs/glib-2.28.0:2
+	dev-libs/gobject-introspection
+	dev-libs/json-glib
+	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	gnome-base/gsettings-desktop-schemas
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	>=x11-libs/pango-1.4.0"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# gnome2_src_prepare calls elibtoolize
+	if [ -f "${S}"/.elibtoolized ]; then
+		local AT_NOELIBTOOLIZE="yes"
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure --disable-schemas-compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	# bug #338213
+	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
+	# MPROTECT policy violation. Will sit here until webkit will
+	# get optional JIT.
+	pax-mark m "${D%/}"/usr/bin/liferea
+
+	einfo "If you want to enhance the functionality of this package,"
+	einfo "you should consider installing:"
+	einfo "    net-misc/networkmanager"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 3d811d24ea39..de471c4892eb 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 56666781caa8..10bcad168222 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,4 +1,6 @@
 AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8400aecbf027cfe04a9f4b140bd6a5f31c593995abb5cb7c819a3c4e81bc677e2495009718813d63059dfa6d SHA512 88ef81df293bd05dce54aefeda2d0a2c1fd26842ddf26a138760aa365b22637d9d782d41d93967d0a81c6404fd133159d096397c77a2e1ac71787686dc384602
+AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
+AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
@@ -10,5 +12,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
-EBUILD bitcoin-qt-0.15.1.ebuild 7090 BLAKE2B 5042ca2f8225671ff830f6d978567b209981cf74af3f79e3a1eaa4fce18efc739604a9e13fc875800f71602970d827de1bf30c9aef3c701122c8bd47f29470b6 SHA512 2f3ff434ebb82f91031b700d08a7ce432019c714ae56f07b16dd0b05aded01ee47b5f64408975fd22ff79955e1152b147471d876d50328e8ec8dae04b0fb6706
+EBUILD bitcoin-qt-0.15.1.ebuild 7202 BLAKE2B 9a65506221f561f06813ce42461eb2ac22346a3638b666de75637dc53ad8e0efb9c72673e1bbfc44b314066d433083bc2e3e69a722c81440ded40993eb8182e4 SHA512 5ebade519185819820de91e3611f3352b6b24b1348e9cdb02b6a76f50f78cc8b358faa2bc0e93abc8c9c02c42f4001bee9b22caa0bccaef18390288d24f688d5
 MISC metadata.xml 6592 BLAKE2B 1674ae2f00b2b07a14167db1225de76b811502edd43dd9a2254de519893e389e82804e86ebaa565ae6891f1deff0bf7af68aa6b7783854d20454cffb5b172af2 SHA512 96c2b6c1b6d04706746e2ac8f7272bb08bc7176c016c66e37d6b0b59b0192c8f51d999a00693418b70c90be8ae076a9a9b50e9d050a5d77c5e02d5192db69709
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 64339edd7ca2..75bc2d1f74f2 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -124,11 +124,13 @@ src_prepare() {
 	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
 
 	eapply "$(KNOTS_PATCH syslibs)"
+	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
 
 	if use knots; then
 		eapply "$(KNOTS_PATCH f)"
 		eapply "$(KNOTS_PATCH branding)"
 		eapply "$(KNOTS_PATCH ts)"
+		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
 	fi
 
 	eapply_user
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
new file mode 100644
index 000000000000..3d953d9c0a94
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Jan 23 03:37:10 2018 +0000
+
+    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+     ++data->eof;
+ }
+ 
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+     .ScriptBegin = script_tests_debugger_ScriptBegin,
+     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+     .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+ 
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
new file mode 100644
index 000000000000..60fc9d849054
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+ check-local:
++if BUILD_BITCOIN_TX
+ 	@echo "Running test/util/bitcoin-util-test.py..."
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 5955ce3ee3f1..4d56a77f8f2f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,5 +1,7 @@
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
 AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
+AUX bitcoind-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
+AUX bitcoind-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service 869 BLAKE2B 65628a2c6effef34e4cf8fd10bc50b02bbfa8c49e486266bab8e9b7be19a57969d75e6ce6ff82dc2e2f3ddae29fceee9e61a076cbf5ac6666d772514c88c2093 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
@@ -14,5 +16,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
-EBUILD bitcoind-0.15.1.ebuild 4928 BLAKE2B ca4aab401dae803f3e841e07262d876e729723b30df973e3673cf1381b73eabb43e2238beae940c6d34538b229d9cbe5802d7ce393178d94ac79970f5ed39a97 SHA512 059ee69a975fd402e2c4fcca43bcd9fc9488db63f376950a45627082e4bc648cae31b96c5e8dded00f40a4c77daf563f7b6d14dac0953fe7ae76d5362d612d37
+EBUILD bitcoind-0.15.1.ebuild 5040 BLAKE2B dd9c35a79d762e2efb6923c70f885727e549a10740f887c37dce320c34d4260092d0025390ed7095c84d47bc3c5730e847924607a1cdb97f7b9c1abd41773569 SHA512 9bc238b9f958668c90dd5d396fce7a391acf033490712718b67e06750f3a9be1c900da057e2f05018231ef8c8c65f48a857d9bfd46fa645e90a80374f88e1d62
 MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
index 3ada285926eb..3d8c5eb306c1 100644
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,11 +74,13 @@ src_prepare() {
 	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
 
 	eapply "$(KNOTS_PATCH syslibs)"
+	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
 
 	if use knots; then
 		eapply "$(KNOTS_PATCH f)"
 		eapply "$(KNOTS_PATCH branding)"
 		eapply "$(KNOTS_PATCH ts)"
+		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
 	fi
 
 	eapply_user
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
new file mode 100644
index 000000000000..3d953d9c0a94
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Jan 23 03:37:10 2018 +0000
+
+    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+     ++data->eof;
+ }
+ 
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+     .ScriptBegin = script_tests_debugger_ScriptBegin,
+     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+     .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+ 
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
new file mode 100644
index 000000000000..60fc9d849054
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+ check-local:
++if BUILD_BITCOIN_TX
+ 	@echo "Running test/util/bitcoin-util-test.py..."
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 1b6a38ea0910..c0ce413d5eab 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -2,5 +2,5 @@ AUX noninteractive-build.patch 513 BLAKE2B cc4042e4f82541eef27584d0e3122b217c5a8
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
 DIST pybitmessage-0.6.2.tar.gz 1053815 BLAKE2B 28ed1a836771318f59986532aaa8b87c0c6d195988f02fc977c3b21b423145cc5b732bc1d4ed9978c26c0edb1c040844c9c00ec4db6418ae1e938bae335ed118 SHA512 4aaa0f6b1cc04de01154bb5c90416901e51abb4465c62269ab07abb7da980ac07f2f548ae7a3780da9f3efe89d3b841b004996c5e33bc2638e58efcbecc8baef
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.2-r2.ebuild 1924 BLAKE2B e780f16d0f1e643938f76e3ade2d8762ccf368c173dfef7ae288b8a1cecd94bc09498bc0584735cbcae8151b78e4dcc8f71728c73a79b9e8dd045f0e3dff6b65 SHA512 03938e00b3ccff7fb61f602416584f024a862717ee99e4f7f13083da58771451f418b7169653669163d8a7c5348718c40564970a1fc8ab3c3d78322611117154
+EBUILD pybitmessage-0.6.2-r2.ebuild 1716 BLAKE2B b4445af49eb0f40bd7a3425031ffa94ee88ebf5e00a48db22a7ce13fd99a403af909d4ff24bb8db1510a9d6744d8c3553273e13a95c2e3b60c0e7f547b5f7188 SHA512 e77e1c10e68a1e622137f7a1d312b609a2c28c8b29995393534203484023b97e8aa948dd33c3eeaaa74989201f1a65a5724d1b748d7913d74ac2752b22c18ee9
 MISC metadata.xml 1125 BLAKE2B 91ce6c7afd6e759f0f7d5a049653cf970f7cf28d5061e9ccc9866dbf88c5a60cb3e518564ceb01551a830c419cdf47f905a4a744a73205725f50d966d022fe54 SHA512 04950f304ca8c087baa7dc370ff08da07bae555481798848d2ddddda33de318be83fc6a648428ff72419af857dd9bd1bdf0b43866b40e149f33dd834e9c7d9cb
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
index df49b8e4e32a..10ef7b3f1fbb 100644
--- a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl ncurses opencl qt4 sound"
+IUSE="libressl ncurses opencl sound"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
@@ -42,7 +42,6 @@ RDEPEND="${DEPEND}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pyopencl[${PYTHON_USEDEP}]
 	)
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
 	sound? ( || (
 		media-sound/gst123
 		media-sound/alsa-utils
@@ -58,12 +57,6 @@ src_install () {
 	dodoc README.md
 
 	# The man page is not installed because it's basically empty.
-
-	if use qt4 ; then
-		newicon -s 24 desktop/icon24.png "${PN}.png"
-		newicon -s scalable desktop/can-icon.svg "${PN}.svg"
-		domenu "desktop/${PN}.desktop"
-	fi
 }
 
 pkg_preinst() {
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
new file mode 100644
index 000000000000..de2e357d2f59
--- /dev/null
+++ b/net-p2p/resilio-sync/Manifest
@@ -0,0 +1,11 @@
+AUX resilio-sync-user.confd 299 BLAKE2B 0e534911629f22010329ae441140649cff373d102d7191f057b7e72d5217bdb335457271b780ca5f4d3b3ca989a8c33d9d796491ac15347a5bdfa08b9cf6c7b5 SHA512 a156516938e5b69199c8a0de8d62ff969b8a938e5a2fd2983c0ecfc080682b1a5abeb21cf8193fc9f96954fa2a9658519e37758d6812b21971026af9b7be54ce
+AUX resilio-sync-user.initd 768 BLAKE2B b4dd9bab04ac242e258b5fd8412a2292f515535caf2845f2b2795584666924725c2c34684d6a6dfe50677b2ecc86e18a7a2c801467f8d352767138aa986f4aab SHA512 a46d90b7f85fc0d5ec88bded35cef42e105cbf8df1f65032dc79bada56ac8c50d42206fea0c5fa6cb82c4ee56eaa27f2059d283501d84ba90503b3ac6a9f9ef5
+AUX resilio-sync-user.service 324 BLAKE2B 5cec927346956c5219470021fdc73bf2be5486499e917453fd5fad94717e4ad6fc5467948b11b551b5f4cdc94d6ffbfbbd4a65fe21e62a4831f610437b92574c SHA512 95621e4df7de0f26da8c057432302a98927db47b4bf9484efe00cb0649020099050feba22a107b01e4c3998ff7d05edb77bdd1ba1f8899839c92984725427504
+AUX resilio-sync.confd 296 BLAKE2B c7fef752df5dcd4e903ebef2bc6da2780c9f19f5f690c505b8abd493081a1bc18a9ae18bba1700df15467786b2c50ca5b12e60cf1eef70a4169d7fc7e17a7897 SHA512 5db62947a34c3c5cedec1b4902b8291bfc46c10490f355ed1612a0f37854f3927d3e4550d1a920cd567a4a69403a80b3dd4150c8bd38906123be6542cd35459f
+AUX resilio-sync.initd 470 BLAKE2B dc58640afc6ec0706aeb82da3161c2aacb144c1b422ff3d59ac01fe7360c0c44c9c52410567225cfb7139244fff3f1a4f449766a8ce03cb53fdf1d0b22a94d55 SHA512 89def45c14bc058826879384be99c49de0be9991bbc3283c43ebcc0a788a213519551219c431c55aa046fbf773a0c8ff57f998be2db89e86f2829a468b4a9e0b
+AUX resilio-sync.service 380 BLAKE2B bab5ea03b7f0db9845a29334f56839dec68fe1d8caf32015445b5b039389f87f729367748f839667b0eb933f95d4389e7c4e0481fb70fd1936b416eacc897a50 SHA512 af50f438111808426f6d80b7bfc77daf665e583540485831c7f51300e3f4768316d0cac2712d9564f1ffcccd7cfe21c48e3c72ba595776057038c230bb3cbdd8
+AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
+DIST resilio-sync_2.5.12-1_amd64.deb 10467196 BLAKE2B e900ac4e8b3862b29674db09d469013a5d12791c090bfd6ecae8f95af6f8ff2f990b8b9cab176b301b7625d6fcee1fcbe33b497f09bca045497a6765ccbb313c SHA512 4056df3d2cbafdb881f1d2929fca13efd258fb7af2cbdc390eae4820af1f5b2b46d410daf2a1ad1233d105edc46c4d5a8e9259e4557c0695b3392884429d95f9
+DIST resilio-sync_2.5.12-1_i386.deb 10333948 BLAKE2B 7a7a6e2bf8375bf5428c27053c22de98e598de07d8709f870152a8b9e2d7254a954b3ceebad69bebf286ef29b3d44b9955f33c4f396a7831041c34b9bd585dd2 SHA512 c15276bbe8818e30cab254a7b1f1222e3a25912d99a05287441548ea3ee3de8964d23a5aed56fd547ee3369f9943129cf7d3a5bd410ce28a9fbd45e13def56b4
+EBUILD resilio-sync-2.5.12.ebuild 2254 BLAKE2B 0ea135eea705a61e3dbe009f941c35ef7ac6809f05aa8fa1c07e42b96f959fc68fd3191cf39198b33d6f0d2db203b2dee21baa6c7c5a5741fee808e526581b78 SHA512 3f77265365a3be3f59ac1f82b7921f28e6c3a868eb191ba066b77624f31dd52b3d2b78dcdff8245df4efdca0ecb5f1bb734d80d7f40d4cdc8ea0891a31846940
+MISC metadata.xml 889 BLAKE2B e1ace94f1fe08c07df2825107b7f73a028894f551c5fb9a6a5986ee0fcecb29204ec19a87231153cdb16de672178eec045fabf01923bf16cb6c0307a024bdeca SHA512 cafa6e1e9a127ddc8ae14b5d52502caf5a297cb397e0770c3e7ef0bd810c4b12c197061ab1429a549054ab8c9674c9ef9d29639825f4f899892d57de41a21707
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.confd b/net-p2p/resilio-sync/files/resilio-sync-user.confd
new file mode 100644
index 000000000000..040da8bdf843
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+#OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+#USER="rslsync"
+#GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.initd b/net-p2p/resilio-sync/files/resilio-sync-user.initd
new file mode 100644
index 000000000000..efcaa2d7778c
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+USER="${RC_SVCNAME##*.}"
+command="/usr/bin/rslsync"
+name="Resilio Sync for $USER"
+description="Resilio Sync"
+command_user="${USER:-rslsync}:${GROUP:-rslsync}"
+pidfile="${PIDFILE:-/home/$USER/.config/resilio-sync/resilio-sync.pid}"
+config=${CONFIG:-/home/$USER/.config/resilio-sync/config.json}
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ "$USER" = "resilio-sync-user" ]; then
+		eerror "You are not supposed to run this script directly."
+		eerror "Create a symlink for this script:"
+		eerror "  ln -s $RC_SVCNAME /etc/init.d/$RC_SVCNAME.<user>"
+		return 1
+	fi
+}
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.service b/net-p2p/resilio-sync/files/resilio-sync-user.service
new file mode 100644
index 000000000000..6c82440ac679
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=http://help.getsync.com/
+After=network.target network-online.target
+
+[Service]
+Type=forking
+Restart=on-failure
+PIDFile=%h/.config/resilio-sync/resilio-sync.pid
+ExecStart=/usr/bin/rslsync --config %h/.config/resilio-sync/config.json
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/resilio-sync/files/resilio-sync.confd b/net-p2p/resilio-sync/files/resilio-sync.confd
new file mode 100644
index 000000000000..08c4255fe296
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+USER="rslsync"
+GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd
new file mode 100644
index 000000000000..b9f0380a773a
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/rslsync"
+name="Resilio Sync"
+description="Resilio Sync"
+command_user="${USER:-rslsync}::${GROUP:-rslsync}"
+pidfile="/run/resilio-sync/resilio-sync.pid"
+config=${CONFIG:-/etc/resilio-sync/config.json}
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+	provide resilio-sync
+}
diff --git a/net-p2p/resilio-sync/files/resilio-sync.service b/net-p2p/resilio-sync/files/resilio-sync.service
new file mode 100644
index 000000000000..32f24a95aa84
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=http://help.getsync.com/
+After=network.target network-online.target
+
+[Service]
+Type=forking
+User=rslsync
+Group=rslsync
+UMask=0002
+Restart=on-failure
+PermissionsStartOnly=true
+PIDFile=/var/run/resilio-sync/resilio-sync.pid
+ExecStart=/usr/bin/rslsync --config /etc/resilio-sync/config.json
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/resilio-sync/files/resilio-sync.tmpfile b/net-p2p/resilio-sync/files/resilio-sync.tmpfile
new file mode 100644
index 000000000000..d0f6e0adc420
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.tmpfile
@@ -0,0 +1 @@
+d	/run/resilio-sync	0755	rslsync	rslsync
diff --git a/net-p2p/resilio-sync/metadata.xml b/net-p2p/resilio-sync/metadata.xml
new file mode 100644
index 000000000000..35827ed4235b
--- /dev/null
+++ b/net-p2p/resilio-sync/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Resilio Sync is a proprietary peer-to-peer multiplatform file synchronization tool
+	It can sync files between devices on a local network, or between remote devices
+	over the Internet via a modified version of the BitTorrent protocol.
+	</longdescription>
+	<use>
+		<flag name="pax_kernel">Use paxctl to mark binaries</flag>
+	</use>
+	<upstream>
+		<doc>https://help.getsync.com/</doc>
+		<bugs-to>https://help.getsync.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
new file mode 100644
index 000000000000..908b87b2209d
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${PN}_${PV}-1_@arch@.deb"
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+NAME="rslsync"
+QA_PREBUILT="usr/bin/${NAME}"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://getsync.com/"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/${PN}/config.json\n
+Default metadata path is /var/lib/${PN}/.sync\n
+Default web-gui URL is http://localhost:8888/\n\n"
+
+pkg_setup() {
+	enewgroup ${NAME}
+	enewuser ${NAME} -1 -1 /var/lib/${PN} ${NAME}
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/${PN}.1.gz
+}
+
+src_install() {
+	dobin usr/bin/${NAME}
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/${NAME}
+
+	doman ${PN}.1
+
+	dodir /var/log/${PN}
+	keepdir /etc/${PN} /var/lib/${PN}/ /var/lib/${PN}/.sync
+	fperms 0700 /etc/${PN} /var/lib/${PN} /var/lib/${PN}/.sync /var/log/${PN}
+	fowners -R ${NAME}:${NAME} /etc/${PN} /var/lib/${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-user.initd ${PN}-user
+	newconfd "${FILESDIR}"/${PN}-user.confd ${PN}-user
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_douserunit "${FILESDIR}"/${PN}-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config
+	"${ED%/}"/usr/bin/${NAME} --dump-sample-config > \
+		"${ED%/}"/etc/${PN}/config.json || die "generate config failed"
+	fowners ${NAME}:${NAME} /etc/${PN}/config.json
+	# Uncomment config directives and change their values
+	sed -i \
+		-e "/storage_path/s|//| |g" \
+		-e "/pid_file/s|//| |g" \
+		-e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \
+		-e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \
+		"${ED%/}"/etc/${PN}/config.json || die "sed failed for config.json"
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 53eeadb30c8a..49d4d44be9e6 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,6 +1,5 @@
 AUX build.xml 2275 BLAKE2B a4aea605301da5ad6af89915c686caabd9ee0f0d3b56f3ee46e2eae74adc86d88de4462228e0387b43b1d5b897c3d6b2e8939822000e86631c22ec5230e31461 SHA512 bdec7c10548ed2fda57235d14f0ae67e00e548a84b88855b5b683c947015b52bcf7011fb5952b4225370db54541614c0402fe6c77e723d310358a502837b40a3
 AUX vuze-4.1.0.0-pre 1850 BLAKE2B 3013871146bd43e7bcd0e7bd92c44ca5d06ebca634ed836918f89c1620095a200c81de2ce76c30a4cef5b3f659995c14532b410c8c39679ee821196009aba821 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a
-AUX vuze-5.3.0.0-disable-osx.patch 1841 BLAKE2B aa87ad0364dd7e604a004749cd432954847b0d487bde7e56e0c6273017fc7dbefbe322884ff3dc0520cf415f9be87c18611503aa0041cc6030f9eed04b8edf0d SHA512 f5c60b188eb5e4c48dfd73c9de03c4eb0884dfb36f147d6ef4be6d2e26602d7de6f80de4be4a64d94c1d9ad9cdbbd928b1cd4e00f09c57e8eb72d7d0f623e1c7
 AUX vuze-5.3.0.0-disable-shared-plugins.patch 1069 BLAKE2B d2594d617396bee9506cf8060c61d7d97b4e5780b34ebed656cffa3d70cf69d27a50056d77d8527af716246a31918d81c626f931aa9b7a78bb3c823d2da79f7f SHA512 ee9e6513b2dd1d4e986f4c57fd5ace3593f98f7eaeb5e454fc7b5fb3c6876b86b85b511981c951ead96b1a106abb18a2e01047b2063d55c98300ed6356c0460b
 AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d51290a0d5dae1f1ada84e21617f42d8e6bd9a42020be84eb962489f371c611f3af2edb2fb9c0bbd7d986a10ea31103a64fe3ada82 SHA512 743d48eeeac4534fc66463c0989a88d97117d988227b6cce77abdaa97c9cb9813aa1228f81a607af09e07fdf95ce02a3981f7f083fba0d9875d0951b8bbf29a3
 AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c
@@ -12,10 +11,8 @@ AUX vuze-5.6.0.0-invalid-characters.patch 1121 BLAKE2B 4a4dc12ee00fc60198a1533e4
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
-DIST Vuze_5600_source.zip 10398501 BLAKE2B 3c6a1a8967bb3a603dfcb248cc5d5dd8aaf4a7efdfba9efa529fa98f0ad945574ffe574084d223fadb3710e6aa690d86dd8d67ea77febbe6a28b730f97ba313e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
-EBUILD vuze-4.8.1.2-r1.ebuild 4273 BLAKE2B 64e39bf87b9c1f63d085f23a171b2256acc5961459ebdc29709d874f2c8f70a0607fa2522698ab637bbbee750189cbdb715238faab68d878f43e1799a1ea5fe3 SHA512 c27b01e4d5ec5751d5af4d62170572a43744fa04d934bf820c7a53d84735adda38967bfcc525521ec6e2dd2ab9f0d4de346ce7099b8f64ebafd0ddf0cc44c8c1
-EBUILD vuze-5.6.0.0.ebuild 4407 BLAKE2B 4d5c0c06f211b4a90a4e2ae3ffe58c8df9335e9340ac58038a51ad8c2210d35ffc28ffcd73ec4d51b8220fb975d8b22e56ad60e18b34ccca7419cd6d036855fe SHA512 a94743bace7557aec51eec202edc89fc828924e790b5591494ca73f10ced30c2378f36bb4d512d49e6c0f34e17bad295ce8a5777b9219a9e819e50c49fce6b5d
-EBUILD vuze-5.7.2.0.ebuild 4407 BLAKE2B 3117c769ed08349f132ae7d1e4bf498a6beb9abf30797b9d7f3926a3c7cbb4a3a99dfa831ddbf0d4197ca43bc120715e528b232ed279fb69f659fb1345c278b5 SHA512 2015dda515c61e65b554dd1d7ad1b56773bc717e3e927e937d04b4ef6bf37c7e48a6ea267c9647e8044093d555a3649467c25003562bc670f3a96aa0d416dd53
+EBUILD vuze-4.8.1.2-r1.ebuild 4009 BLAKE2B cf4c682b9aa7523e63d5d652b963bacbc3592bee5e8787d8d8d7e0090e9683b8f23c4f8757a5a495d7a581cd61f9e7843eea4325ca20ec347989d50988e96246 SHA512 b161e31d14594bd795bb02a6b0a83b09e6ca6db10b8e8078f8422c202575d8fe3d03c2e111ada4fcb806062e71f7acde163c31c63e8f0c29fd8221223edd6a26
+EBUILD vuze-5.7.2.0.ebuild 4202 BLAKE2B 566b413c98b31d0e6af8e825e7512dedee93aa895fe65e82b96b9807843d38db49ccb7b6fc038768eec1278bb164107308f6ebc37910811e7e8003d5c5555274 SHA512 30018294bf0a93e9970c031ea21ff5923324cf61938a993a0bac7b3f149e67ea519f4a38d99b6e821566fbc5a0f2caafa1600352d4454a9efbccf91ca18a96e0
 MISC metadata.xml 415 BLAKE2B 919790264b1d38dbb5ffe76b2611851a7d601980ed82c3008d4c762431e9ec4ce58def0fc824f85fb694aead62190e11cba7b57149259f1e59b26c0736e605a6 SHA512 d81c0a6171fcd95b06d63b6d6680a22451326ecff7e4a82e8d581cc2da95663bc35b9f2a4e56c0d10aa915e5f1ee238f5b2bc33ee06944ef1250def695367c7d
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
deleted file mode 100644
index 070dae2d7562..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-@@ -229,57 +229,6 @@ public class SWTThread {
- 			}
- 		});
- 
--		if (Constants.isOSX) {
--			
--			// On Cocoa, we get a Close trigger on display.  Need to check if all
--			// platforms send this.
--			display.addListener(SWT.Close, new Listener() {
--				public void handleEvent(Event event) {
--					event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
--				}
--			});
--
--			String platform = SWT.getPlatform();
--			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
--			if (platform.equals("carbon")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
--					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
--
--					constructor.newInstance(new Object[] {});
--
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			} else if (platform.equals("cocoa")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
--
--					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
--					Object claObj = mGetInstance.invoke(null, new Object[0] );
--
--					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
--					if (mHookAppMenu != null) {
--						mHookAppMenu.invoke(claObj, new Object[0]);
--					}
--
--					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
--					if (mHookDocOpen != null) {
--						mHookDocOpen.invoke(claObj, new Object[0]);
--					}
--					
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			}
--		}   
--
- 		if (app != null) {
- 			app.runInSWTThread();
- 			runner = new Thread(new AERunnable() {
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
index 0c35e7b02cd3..760aa1db034d 100644
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.8.1.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=5
@@ -129,12 +129,6 @@ pkg_postinst() {
 	elog "Using this config file you can start the console UI."
 	elog
 
-	if ! has_version dev-java/swt:3.7[webkit]; then
-		elog
-		elog "Your dev-java/swt:3.7 was built without webkit support. Features such as Vuze HD Network will not work."
-		elog "Rebuild swt with USE=webkit (needs net-libs/webkit-gtk:2) to use these features."
-	fi
-
 	fdo-mime_desktop_database_update
 }
 
diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
deleted file mode 100644
index 561de94cf7ae..000000000000
--- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-RDEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/json-simple:0
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	>=virtual/jre-1.6:*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.6:*"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}"
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-java_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
-#	epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.2.0.ebuild
index 65d8f1b6371f..01f5c404a7cd 100644
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.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="5"
@@ -36,14 +36,6 @@ DEPEND="${RDEPEND}
 
 PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
 
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
 src_unpack() {
 	mkdir -p "${S}" && cd "${S}"
 	unpack ${A}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index d022bb4d7685..2ef6821003e8 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
new file mode 100644
index 000000000000..eea873b2e45e
--- /dev/null
+++ b/net-print/cnijfilter2/Manifest
@@ -0,0 +1,4 @@
+AUX cnijfilter2-5.20-gentoo.patch 1775 BLAKE2B db93bfa9d09c2478ea7e6fa79cd38ef21b4743330853b31d22e2f9ba6923045a8b40170efdcfd72ea91384046d3b96c7ab74bf9699ef48e01644a336b0603fc5 SHA512 d79e611dacb2362ead277a593fe1082fce960c67f24af830e5b093ac4bcb641f9db6de84afa9be9b5495967a6826ddd5313fd76da507372945c5162e98736826
+DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
+EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
+MISC metadata.xml 339 BLAKE2B aa954d512a8d86489f00bcaf9f59d4427e95e095b42ef7946456db0c9037fcda08a9940e22df160871fcf1d19d8c06852b707934a904fa680ed06726fcd5c735 SHA512 a8976b24c12b154f9cdcd8a6f31d10f35a039a51141eda7aaea0fa6e9f7f9d405745f4910c6f56d44fac6ecde6bd927dc8a1e10f995279816f1bc551667dedd5
diff --git a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
new file mode 100644
index 000000000000..a5ceae2028a2
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN}-source-${PV}-1"
+
+DESCRIPTION="IJ Printer Driver"
+HOMEPAGE="https://www.canon.it/"
+SRC_URI="http://gdlp01.c-wss.com/gds/0/0100006900/01/${MY_P}.tar.gz"
+
+LICENSE="Canon-IJ"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+	dev-libs/libxml2
+	net-print/cups"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+	LIBDIR=com/libs_bin$(usex amd64 64 32)
+	for d in ${DIRS}; do
+		mv "${d}"/configure.{in,ac} || die
+	done
+	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
+	echo "AM_INIT_AUTOMAKE" >> configure.ac
+	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
+	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
+	echo "AC_OUTPUT()" >> configure.ac
+	echo "SUBDIRS= ${DIRS}" >> Makefile.am
+	sed -i \
+		-e "/^CFLAGS/d" \
+		*/configure.ac || die
+	eautoreconf
+	cd ${LIBDIR}
+	rm libcn*2.so || die
+	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
+	ln -sf libcnnet2.so.1.2.3 libcnnet2.so || die
+	cd -
+}
+
+src_configure() {
+	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+}
+
+src_install() {
+	default
+	insinto /usr/share/ppd/cupsfilters
+	doins ppd/*ppd
+	dolib.so ${LIBDIR}/*
+}
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
new file mode 100644
index 000000000000..80c7361cb1a1
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
@@ -0,0 +1,50 @@
+--- cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
++++ cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= cmdtocanonij2
+ 
+--- cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am.old	2018-01-14 19:25:48.823470121 +0100
++++ cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-backend_bindir = /usr/lib/cups/backend
++backend_bindir = $(libexecdir)/cups/backend
+ backend_bin_PROGRAMS = cnijbe2
+ transform = 
+ 
+--- cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am.old	2018-01-14 21:31:33.053307218 +0100
++++ cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= rastertocanonij
+ 
+--- cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am.old	2018-01-15 22:38:14.236460663 +0100
++++ cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include/cncl
+ 
+-bin_PROGRAMS= tocanonij
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocanonij
+ 
+ tocanonij_SOURCES= \
+ 	main.c
+--- cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am.old	2018-01-15 22:42:43.759703863 +0100
++++ cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
+@@ -2,7 +2,8 @@
+ INCLUDES = \
+ 	@XML_2_CFLAGS@
+ 
+-bin_PROGRAMS= tocnpwg
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocnpwg
+ 
+ tocnpwg_SOURCES= \
+ 	main.c mkpset.c
diff --git a/net-print/cnijfilter2/metadata.xml b/net-print/cnijfilter2/metadata.xml
new file mode 100644
index 000000000000..869d1f155629
--- /dev/null
+++ b/net-print/cnijfilter2/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>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		Printer Support for Canon PIXMA Printers
+	</longdescription>
+</pkgmetadata>
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 1b9ec3e2649b..609f0b5df98c 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,7 +4,7 @@ DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e
 DIST cups-filters-1.18.0.tar.xz 1457748 BLAKE2B 6db45707d3c0bdd369407023423a02f8909936daeccdecf1be6007d782888352c15c5590f845e074ca8da271ce1d7262c8b98a0ec8df6e383622654c06730d29 SHA512 260f4d4c635b4ca0222a9a90a6675d7ecb1cf8b4f4428431c263f50f9152537331d2c7d77c4fa0f899a12beecd6500f6ca146f4e2d087cc6525919aa0b922647
 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.9.ebuild 3503 BLAKE2B 5ca468480e4552cae9f8f6253dd3d5980d1b018c9e1e4400b2694e0cf309cded49b863b8ce5989379002fe6e6625a19b87adc49a2d7d4389a34dc41f6d619f11 SHA512 249fd3b993a27f76a175ccbdabe6c3269fb954c43521d95c695facec3b441205fb1b6c0d93e255fa4f5fe8909c23c03a96c8e480746b3e795463465d1cf6513e
+EBUILD cups-filters-1.17.9.ebuild 3501 BLAKE2B c15b3c960a4a03d09ef337fb24b87633878d492ec11d13c5dd700da6a8b35a8b159406527f61cff230e06f1c79f8675eed154ae3d172ac010e13eb1e17090e3d SHA512 a6b0c900758decf93932e75a557258cf7c03daeecf0198177a04a733946b1a3ab4a188890f2db5a138c9369f285ae5833923f2ee54710d659db77054ee816861
 EBUILD cups-filters-1.18.0.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index a839fdb4414f..947b950d103d 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index dda979bc02b6..1d81debd2f4f 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,10 +1,6 @@
 AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935
-DIST foomatic-db-4.0-20140105.tar.gz 38845034 BLAKE2B d61f6f2eb6eeb913d8875c16538b2c0dce2b2962ba85c4856471cd84b0866d1450b1d3fec863faa22ae0766848562f81d4ab543192bcc6c2a5f8bdc3435ec18c SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4
-DIST foomatic-db-4.0-20160504.tar.gz 45782654 BLAKE2B b03374cc60564963578c88c3c25324ad0b1a5eb0812fe3eeed673d236c9ccb9938dc6d30bd00c023e99ccbed1ae02823a155477938c16e638410d7b9420bb5c2 SHA512 816a857b9529c8f71ba524c261812b83e30c660bd6f99a150e45950d212a54c62a8aad9ea9f7485f270972d42f5f333bcee8da55eb5c837b542187f25322f47f
-DIST foomatic-db-4.0-20161101.tar.gz 48879184 BLAKE2B 96c0e32e9a31d86fd55cbbea5b08e874faabd961ebee4ff15c4967ba4ac89272fa5d71e1080bacc7bc28c2bd7404b0a6db944f0aa3b51dc9426ce18c439b13ed SHA512 64bd45889b74ea376d432696541b7d7c03978ea126e9e08302761208b8e7d54399cdd7e218101ebccebc97d2f800cbe9f63c844bb3d943d4662ea2463c21653d
 DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
-EBUILD foomatic-db-ppds-4.0.20140105.ebuild 869 BLAKE2B 8d96d2349824b149d31f89f350134f5829f0f8c25e9b2597b326c204fbef501f1fb3d6fc8e912bb67811a38c18f692a684a119b25b44bf77929130068377adce SHA512 ca5b9be9064a8b88f899866c6af881b9d0b64ed683b7f1c1bfc8982f362724231bebd3bcf795017d67b2a31f7cfc72493a75afe9b5f750f9be0a14e342852159
-EBUILD foomatic-db-ppds-4.0.20160504.ebuild 866 BLAKE2B 8be6489b9a3d55b242068ee174670d07afde24e2830bb8781635c175d508c7bcb236563fd47cb35aaa08b5b33ba3efa7e050e3d1167161ba6027651eb9da2327 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e
-EBUILD foomatic-db-ppds-4.0.20161101.ebuild 866 BLAKE2B 8be6489b9a3d55b242068ee174670d07afde24e2830bb8781635c175d508c7bcb236563fd47cb35aaa08b5b33ba3efa7e050e3d1167161ba6027651eb9da2327 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 857 BLAKE2B 51e02fbea71948d2221ae7f5f6a4b0636499fc70eff53270531660c4479cae4cd4c63978c45ecc692f5f2b5bb95759ad43532af6c79d67ed082a035f59c2dfc1 SHA512 10ed93c630c9e241bd0083ea6815a2c980ce0535d865a5ef7ac9e8afae2d140ad2d1beaf47783a9d98bc429557ecc2fcdc77d947c6beb9930db87b546faaa2cc
+DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 845 BLAKE2B 1e05baaa71842a77e33e2c1514dfcefb3a5f73722d52f2d2897dee75a721a6223ac2b75d9b631f10cf2255ef61e8cdc0542e4e4a5bd4429878d37e1d9e88fa93 SHA512 6d0491122d2de885047a92588ba11b6edc6abe95f265f6b62da655ce73bc22eae07b2e5ebc6e37b7cd2be5dc8df475336f51029100ff0124cfebda9529d2266d
+EBUILD foomatic-db-ppds-4.0.20180126.ebuild 863 BLAKE2B 704b3a2f8801d7ce86775323d3d5b93d590664dbba5a55b0b3e802c2f77fafd7d74a47ff5f8a3d03e16aa99a8f59ed4de59333373a0d92b32fa5406ec5b71dae SHA512 91759d2e20b22d17349519cb3ccba8fb140cf289e97da511b756e4c0aa4639a02fe8318a161724a57b1fdb43c7bb9244440623ff047078bd72f47bac5a21851f
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
deleted file mode 100644
index e3b9373bfdcf..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-#SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild
deleted file mode 100644
index 99af50ea5954..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
deleted file mode 100644
index 99af50ea5954..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 7cea5da00dae..077cc3318f07 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.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
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
new file mode 100644
index 000000000000..4acc8fdfb809
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+DESCRIPTION="linuxprinting.org PPD files for postscript printers"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	eapply "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
+	default
+}
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 789ecc416005..c5f763fba04b 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,9 +1,5 @@
-DIST foomatic-db-4.0-20140105.tar.gz 38845034 BLAKE2B d61f6f2eb6eeb913d8875c16538b2c0dce2b2962ba85c4856471cd84b0866d1450b1d3fec863faa22ae0766848562f81d4ab543192bcc6c2a5f8bdc3435ec18c SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4
-DIST foomatic-db-4.0-20160504.tar.xz 4074612 BLAKE2B aa7bbbc3798edbed0ed0ad84fb83566ebdda1c883eaa19b1d1b7c8db536c11e0899671953355bb56d10899003ca7abdb779ee7e5198432094efb94b32dc9944b SHA512 ade62d14773fc5c4c82ac5ebf791ab0e70b36d758493468307acde21730a146bdb198cfe7bc14041aa05ed5b29961ca2dde4ad29d3e555164020046a4f89e5eb
-DIST foomatic-db-4.0-20161101.tar.xz 4474300 BLAKE2B 2919f33d379777c61d5eebc8b5349bd44ec18ca4cd8698643d2172ed6513be707045eca1e3cdbe8855f30c94bfa2d6e75e649fbe0204ac411f0cbaf53279181c SHA512 8370632697846e1635d00c369125eebc83fd0363896ed3b29d684c8e6cacc4d8cc8c679e889f20e83458f07b254dcfab22b1faef2dcf3063fbe9d3f457ead623
 DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
-EBUILD foomatic-db-4.0.20140105.ebuild 1308 BLAKE2B 1c3e97532e60ccb48bd294a50bf51ee7b0181a14def76b899c715330dafe06ca52fa19f5719bbd5dbb347c68b88322f30e846cb66fbad86adb530f3fdb9103fd SHA512 fedbc2040876bf5e25b81a492b16c9361a287725262d2d5b9506405934a83662c0e2b87f90aa76a1e2eebb9dcbc16b798388ba51b02fba26c7d717440d27a328
-EBUILD foomatic-db-4.0.20160504.ebuild 1216 BLAKE2B c39a85d657c4abf7d86ae4dd4f06f74229e998efee1657ccf9808d330be5ae50745684e0f606b928775e4a4ee6a2c7ab9153b6d9201b7bbce0e8d53421d8e925 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1
-EBUILD foomatic-db-4.0.20161101.ebuild 1216 BLAKE2B c39a85d657c4abf7d86ae4dd4f06f74229e998efee1657ccf9808d330be5ae50745684e0f606b928775e4a4ee6a2c7ab9153b6d9201b7bbce0e8d53421d8e925 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1
+DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 EBUILD foomatic-db-4.0.20170331.ebuild 1207 BLAKE2B 2aed57c70dd5ccdac9ed27f5af6bfd754ed950da1a075ea57c85651e870440b3538bb049c358c227f01f63857ee4feb29260a9f94451a031b15ce1e101cee4ea SHA512 5fe1da45af096d8419faa461369067e5b45bfecc311e788b05ee506e92cd88324e58cff9a619706ea69c5fdfe6837cdab1cc346eca74e4766a70346404d9d7b3
+EBUILD foomatic-db-4.0.20180126.ebuild 1225 BLAKE2B 39fec6d0fed1bbaf3f75d5015bc727589e8a60cd3f2b3d146cee1bb820ab0511cee115cf299929cfcf908ca99421fa5bd5fd3f9bee8d2bd7fefd0114dd60b6ae SHA512 7d20d8cbef85150a5ca7847467ddee3dbcd355af02c75991709f82e498c7d27703c0f24057e2df70fdc26195e7e5982c99221fbd4b415d22d63ca8ca657d5481
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
deleted file mode 100644
index 8c7581fcb014..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-#SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-$(replace_version_separator 2 -).tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild
deleted file mode 100644
index eb237a0a62eb..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
deleted file mode 100644
index eb237a0a62eb..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
new file mode 100644
index 000000000000..1a475c50eb02
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	net-print/foomatic-db-engine
+	!net-print/foo2zjs[hp2600n]"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	# ppd files do not belong to this package
+	rm -r db/source/PPD || die
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-gzip-ppds \
+		--disable-ppds-to-cups
+}
+
+src_install() {
+	default
+	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
+	# Avoid collision with foo2zjs, bug 185486
+	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 5b430086b742..9ca35171a312 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f23dcff268b6..fa0b575b5513 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,5 @@
+AUX squid-2018-1.patch 1092 BLAKE2B bc632c34876bfa5fd9378aca8e70e0a498bfbb02f8be89531e06e07e4445809edd2aa59cda2ea4b8c46365bf399f4f5a2df5549d4017a311dfbc0e70ee351308 SHA512 d08d87d4cf97e794735e29ed2a273e27757a9ef95059cf6a2e2855a0c56e92d9e665b85115c9f3b699974447a7b9cccadb0a8ce606beedb41d27df8361241f8b
+AUX squid-2018-2.patch 1054 BLAKE2B c8988d03913a6c75509152e7422a8957814e50a80daf8d4e3acda73e56073f2dc038bcf8655a0c4dd57735e6ee72c0ee30516a3ed03a200ea5a87f408e8a8530 SHA512 392442527ead5cbb045f6eded522c9aff6ce395034ca028e7298394eccb6ed5b06c814f966ddc6cb264b9a37bf7ae2751e3ed87853566b1d7b757d99280fe60c
 AUX squid-3.5.7-gentoo.patch 3414 BLAKE2B cf2ab263d7578736c4bb3954288375297aadc4c8fcefb690e6183684f75b5ba8281997b76a633459f917c121e96dae7edd0f465564ccbfc225d84c53ff273663 SHA512 403a053e64f0061901fedab7dc65a671cb22f534a21d9f066c6ec7bd8db03519b63d402702bea85929669e37925e9a0e9fd9e918ac1ea37d399d443b2dda9766
 AUX squid-cppunit-1.14.patch 11414 BLAKE2B 58f583390f9d899e70e56e7109cb3b88bf23ba0bd8ec6d065eb5f28ef9762f4a6eb25807e24a102852538eb2709167284e529b14d43605bbe49f85eff4824169 SHA512 2fb02c8c92dc524c19cbbaad4dad03bddc8c18046e37f86562dcaa73a9cea0cb2af352ca0701438d2f77a55b448b34e68678961d721812135b9f7d4799cbe94a
 AUX squid.confd-r1 384 BLAKE2B bbbf02d98ad4552acee224b67c41530fc63f7ee6d099cfa309b982563004f375dd881a079ec3d2ec161ed3a48dc58fb5a1d9e16438d9806d2e83a3af0a900611 SHA512 018418d0ef66c9ab5d67a8e68ed6f95c7a04ad2a8a073747f39d9db8e83cf72c685d388a727363788042e45d440a69651ec928ccdeed835915ebc8c676b43519
@@ -8,5 +10,6 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-3.5.26.tar.xz 2328352 BLAKE2B 236f2d83176a7596fd2455c6bbe411a9b2c1dfc8b0b6f12f28c2723965418cca59d02dd04d39ca646580042f6fde00f0a7c9bbf4f3a50780d302f3b9473b650a SHA512 08fc7fb5d1dea8d91cc318e5be9044fd75c69d0d2053a0c79ab594155aeb4a0f48bb0ff1dd754497485dc8db117b71f1787b0265842cf61b474293d5d38a9222
 DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
 EBUILD squid-3.5.26.ebuild 7357 BLAKE2B c445299036ac606d3b74b163fccd404440eca341d736625898273517fe9111874292c1b4daf2f7d8c8446762c9b6da27d90df71b689b76265dac54fb90f19ba4 SHA512 c3a57bfe2194b64854b26507b595ca0e60d4d6c7dc51c12ef62ea91c734de3fb943008be943421c33c39430249d2831e55358e40b205798c49e1ba0a3c4def4a
+EBUILD squid-3.5.27-r1.ebuild 7758 BLAKE2B 11954ef4510d477b019f17f5c8451b245e2fa3e013e0d570a1c52e10a4a527beac40ecd92b1fef1bc42f87a6c56caf08eaf0842c1027ed2ab734081a0d0408db SHA512 5969b09c2826e6337838d8108459ba9629b4529bfb103b1496dac83bb734eafa64e011b79e300c7da53dc9e9ad8efcb9df9faa24258cea1e024f43a870d009d3
 EBUILD squid-3.5.27.ebuild 7677 BLAKE2B b699b902e394aeda95aa268b57cb5c6480eb23e79e8ed0233244f66027566160489f603ce4341fb70966e73b512c8c1562f78fe496bab1396813099ec3c79890 SHA512 82860ad6254afa72707f9c37a4f582cbfe2b78fb809175d913beb805a38c0a0ee0c5a1c691f977af76fd211866b079ed6bad15ae9712f00964c13e2b4b36694d
 MISC metadata.xml 1539 BLAKE2B 05cdb519d9113240c6b3ec38da9c19cfe3e63ed7423e4555eb198d79e75013d142da7d6d0c2e3f293ecd6c0b3e215806915724eb7c453cc5da1923f61ee9ef30 SHA512 7e28e289a27097bc5b2a4caca81506c9c76898c416842e0858dc82b5a03e5f473818ccd52b43c47ee549cf1bebe7e83a0d125eb24995c1a2d74db4e998825c6d
diff --git a/net-proxy/squid/files/squid-2018-1.patch b/net-proxy/squid/files/squid-2018-1.patch
new file mode 100644
index 000000000000..9392219a9edc
--- /dev/null
+++ b/net-proxy/squid/files/squid-2018-1.patch
@@ -0,0 +1,28 @@
+commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
+Author: Amos Jeffries <yadij@users.noreply.github.com>
+Date:   2018-01-19 13:54:14 +1300
+
+    ESI: make sure endofName never exceeds tagEnd (#130)
+
+diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
+index d86d2d3..db634d9 100644
+--- a/src/esi/CustomParser.cc
++++ b/src/esi/CustomParser.cc
+@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
+ 
+             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
+ 
+-            if (endofName > tagEnd)
++            if (!endofName || endofName > tagEnd)
+                 endofName = const_cast<char *>(tagEnd);
+ 
+             *endofName = '\0';
+@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
+ 
+             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
+ 
+-            if (endofName > tagEnd)
++            if (!endofName || endofName > tagEnd)
+                 endofName = const_cast<char *>(tagEnd);
+ 
+             *endofName = '\0';
diff --git a/net-proxy/squid/files/squid-2018-2.patch b/net-proxy/squid/files/squid-2018-2.patch
new file mode 100644
index 000000000000..9ecd8a5b7cb3
--- /dev/null
+++ b/net-proxy/squid/files/squid-2018-2.patch
@@ -0,0 +1,23 @@
+commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)
+Author: squidadm <squidadm@users.noreply.github.com>
+Date:   2018-01-21 08:07:08 +1300
+
+    Fix indirect IP logging for transactions without a client connection (#129) (#136)
+
+diff --git a/src/client_side_request.cc b/src/client_side_request.cc
+index be124f3..203f89d 100644
+--- a/src/client_side_request.cc
++++ b/src/client_side_request.cc
+@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)
+         * Ensure that the access log shows the indirect client
+         * instead of the direct client.
+         */
+-        ConnStateData *conn = http->getConn();
+-        conn->log_addr = request->indirect_client_addr;
+-        http->al->cache.caddr = conn->log_addr;
++        http->al->cache.caddr = request->indirect_client_addr;
++        if (ConnStateData *conn = http->getConn())
++            conn->log_addr = request->indirect_client_addr;
+     }
+     request->x_forwarded_for_iterator.clean();
+     request->flags.done_follow_x_forwarded_for = true;
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
new file mode 100644
index 000000000000..01198d20552a
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info pam toolchain-funcs user
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? (
+		libressl? ( dev-libs/libressl:0 )
+		!libressl? ( dev-libs/openssl:0 )
+		dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+	eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.patch"
+	eapply "${FILESDIR}/${PN}-2018-1.patch"
+	eapply "${FILESDIR}/${PN}-2018-2.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export_build_env BUILD_CXX
+	export BUILDCXX=${BUILD_CXX}
+	export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
+	tc-export CC AR
+
+	# Should be able to drop this workaround with newer versions.
+	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
+	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--with-build-environment=default \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-ltdl-includedir=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dodoc RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 97ba556edaa9..ac8dd4216367 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index f807dc7e0925..8b6d695b91bb 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -6,8 +6,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.3.tar.gz 1422692 BLAKE2B 0058689b94de8ad651b20ed7f8aa2924ea8c114ba3f7efa70ff3dd29908fa5ca25d9e97cc4168750b0fe26bd982ccbbed80dc1c680a2814cf036deb5083b33c8 SHA512 1d1f9afa6d0858fa32f73b2a51ed7652beac52ef974b104b51b521e6d8e872b8f5659c55ec1ef442fed3b6c6b058627b0af73e765a1261871b1cd96c8acd657e
 DIST openvpn-2.4.4.tar.gz 1390194 BLAKE2B 52aa5b9d301b4b5a14acf685f4d4c520d5ec1aa06755262a8504a4c3bb5ee1b8435f68eb4278f25b900f9ae182f31688ef36e4e839ec7a211ad6aba0f76a897a SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76
-EBUILD openvpn-2.4.3-r1.ebuild 4689 BLAKE2B 6094beb7de92bf226daaeeb485e65d49e644a320d56af12cb0b2c955498fab790768a7c2f7651b99c4d49f1f4e3a636c662ffdfb1198c6fc6d94aeadea7f58b2 SHA512 fb0d83acce76eb3602332df7a618c5073765055819341d1372ed034d4f31b93abbca0615767ae50c2064e3210c9e5d6fa51ca727328b403cab63fa2c9792b83e
-EBUILD openvpn-2.4.3.ebuild 4611 BLAKE2B afaf6797a6005ce9598160a177dd9c683000b3df978e8e8ddf6236dad12a7bf0f1237e1a9f711da65e465c1568963798adc58e69aedd353953a8fd391d6180e7 SHA512 3a7b7c93df95922eb9d6deb383a63521a5daea9490e90285dc5bd419af0afa484b55c836a41d528462b7301698d7c6c2cfe63b3eea7bfffcf990b7308dd43d17
-EBUILD openvpn-2.4.4.ebuild 4681 BLAKE2B 04d479269faa2fc3152315c2e74647f7c43000194927cb9ed12cf2659f6fa36d093a1e1bf2a176e926b5ae30918495f59f598c4290ddf0d5b4f12dd589ebf1f7 SHA512 c084b89de2eb760483079ae39c922641640df5b2e5f9951881f587ff9d8e3ceb903fd52d9a06a5b7bb79aa701d229b2f065459ec6ea5d3ae3ce5a90c890c1be7
+EBUILD openvpn-2.4.3-r1.ebuild 4677 BLAKE2B 5d18623acfc7c4076371ddbcf72e1ed83a17239bbc05593c1b6b02f013ded3bdb2429a39791de5927f00541b6fd55a18f652b004df73ead18687f37aa4bef948 SHA512 fbd405bfb0fae6785e4af11f3b0132d29975f1abd5cdcf94bc97a231cd27996b9392db2193940c84f0abcadc2f4ab65b5cf665209bcce08565ef625b2f3fa061
+EBUILD openvpn-2.4.3.ebuild 4599 BLAKE2B d0ebc1e3fa064cd21b3379099439626ea9a5a709591ca5cfd1e03e75150447903553d6b0b9abaf05a4bc9208ab04aa45b6907451b6a445a12cf464a95e1f2764 SHA512 7ce11cffb482c4be3f1f5db401449884e62a30b3d02be0dcf0964625f3c6f4dbc2668c00470f4e859d5044df3ab51b3824f9f629e6a0d4aa2e58e1e0697594bc
+EBUILD openvpn-2.4.4.ebuild 4669 BLAKE2B a76f11fb5271cee7dedeb624dd47d74cb53b52b4867738a9bb0d304001c84017c7c0f1cd119b4cb1eb8b870195267605bf4a5a8db66ac97d9b886bae3bd9f474 SHA512 d3a7b1362d77855d111eea2ca5922b3f43b3d6a0e2b169e4d8c518e6bb047b9329125766dc485d9967e7a5c72fc37888de69a0f37675085aed43e22f56f7df09
 EBUILD openvpn-9999.ebuild 4473 BLAKE2B f26cdcc07aee889c11213b91e7e35d34933195b4ec9523ca20ed9f711f3f939785f769e5c8ea94ac6bc58e6ec6b894ec2037f3153a8fd9cc906fc176d6ad6b8e SHA512 700392c91522915cb00d9282eb7f53f237b40d78c3d5702dfccd6255e86b7b1a86355fdc45902fcba572cbcbf5ee87239b0b4197557934413884b633b7fdc4fa
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild
index 798c6c354ac3..7143fb14c098 100644
--- a/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.3-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 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.3.ebuild b/net-vpn/openvpn/openvpn-2.4.3.ebuild
index a15364807f9f..48c5aaf18135 100644
--- a/net-vpn/openvpn/openvpn-2.4.3.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.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 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.4.ebuild b/net-vpn/openvpn/openvpn-2.4.4.ebuild
index c959b3f1fa11..886ed244e119 100644
--- a/net-vpn/openvpn/openvpn-2.4.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.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
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index aa056db586a2..944628f03b6e 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,6 +2,6 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
-EBUILD strongswan-5.6.0-r1.ebuild 9318 BLAKE2B 5bb221af5a2c6de6a36e2002acb2facab66ab85b6a5b46fb670ef30017db4373b88a1faf8679625be91b3d9880798ea6fc50e7111254ea81f572e3067f8100e7 SHA512 86d45c54b2cd5284466f43806bee421389eea5e93f9b241ee6ff90680feb179005f6ab6af733dd97fd830fb5a0822fca8616e6b53982debf8fc7c2080fa0dfa9
+EBUILD strongswan-5.6.0-r1.ebuild 9317 BLAKE2B 10940b5090de8855717a7a54e63b8252848b3361e39f7eee1e12945438b846e67af0d1eea185c490bbaef94d49ddd80329f9db50fed5456f766f996be75388d3 SHA512 dbe3b2a87579f77d943fb674d8f4f60b4dc2d928af26649cc56b4d408aed13aa683279788c261d57234cc9bfcb5823674bac28c7b105e4409a024332056126e4
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
diff --git a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
index dc0518eb40a7..f6c8a771da54 100644
--- a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.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
@@ -10,7 +10,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index d4b1078c57b5..6a218fda8cae 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,7 +6,9 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.7.tar.gz 6058284 BLAKE2B f2d825c82342cf1ca9354f051d532ef31e1d183be28f0f5b49f14c0d88176910292b6727b8cf0f066bae276e3a431851714cdb385219516d0a7519c5ed02b203 SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
 DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
 DIST tor-0.3.2.9.tar.gz 6250442 BLAKE2B 34f6436d94f105bc0e68fa89bd6b671c84c9a6389010b5741b2da339caaea2e4d549f799aa8c6867eddc90818195c73a4d13cdf7f7003d578779f7e2d9964cfb SHA512 60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
+DIST tor-0.3.3.1-alpha.tar.gz 6317585 BLAKE2B bba9f5c78c5a66c0232c5f2c982349d800ab7ed6245cf69583fc85ba97b5b0a5d974a667cb2a3204255b72f7c446f242581c9bfeef5437463fb97ab1ec2df897 SHA512 796deb6c31d78e3424aed72d3c9a0958c77a28fc883da77e724e94bb92376858ae094c73acf166a5415587186667d4ea3e87c0578e42f4a59b8397365d782314
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
 EBUILD tor-0.3.1.9-r1.ebuild 2020 BLAKE2B c2054caa10f4bd9e7cea92c1f99a944bfd2d9dc2456dccbc54b9715c38c3f641c31c5ee2ec81b4a7307c2465b020e085f75cb946823961aff8119745f690825b SHA512 b512c5d0c5cb51bd89b4cdca0eed158ead35785fd2d3896647b99447e88266e1719423538ce4a4a51d3da35ea780b098a499f4fcdca78a6a232ed11a992ee7b6
 EBUILD tor-0.3.2.9.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
+EBUILD tor-0.3.3.1_alpha.ebuild 2142 BLAKE2B 3482c9f988da8b2fe8cf7dbcd53a2c2dfe86b960240422aa927522e3c57a0eccfdd5abca4d56724f36399c9f6c07a043e7d72bd5ae45b2832b33594b4a811ab7 SHA512 e2653dcdeec3339effb79164c991cde78e691749866abb9ee4f8813ef7eb6abd51ce8eab846b9027b1784236b6c3be0a316bb2730de72777bc031b6d2396ec5f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.1_alpha.ebuild b/net-vpn/tor/tor-0.3.3.1_alpha.ebuild
new file mode 100644
index 000000000000..fc9664985e63
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.3.1_alpha.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+# We need to keyword app-arch/zstd
+#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-rust \
+		--disable-restart-debugging \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	systemd_dounit contrib/dist/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6fa4d508e11c..9c518176e453 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a53d4b5c89ae..e70f4834681f 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -8,5 +8,7 @@ AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad83
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
+DIST bluez-5.48.tar.xz 1733952 BLAKE2B 0a68a1b790d752b02b8ab3d0eeaa9387c15851003a1d691cb476cef564c032498935997b84af4dd8bdb448dbe434eedecb982a9a867dd4dfa2ca0c8a23f371c3 SHA512 38cb20b8acee8adaab286a0b042efa770df367e7a69556117961fcc46d9e0a0e2a48059c7df9511bb00fe7fc37e916e34c928df9372b45051fcc57c8965b0bb7
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
+EBUILD bluez-5.48-r1.ebuild 7900 BLAKE2B 581be04d9c18aee07fdbb3352d69d0eb4d9b9512ce5c76fe8653759b474b9803c439fe92d860266d5247eacf1e0061ac03dac9dd2e9f4bc05ba8a692df5e68ba SHA512 7fd161b372ea22338169957ab3ed314030ff1511d819451d980ee3ff45412d7b417ca9fb9d647aaef52a14693d094164e38bf7c4baa5f2017d9566021b834c2e
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.48-r1.ebuild b/net-wireless/bluez/bluez-5.48-r1.ebuild
new file mode 100644
index 000000000000..db6ddf08c047
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.48-r1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools ltprune multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+	user-session? ( systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6:=[user-session=]
+	>=sys-apps/hwids-20121202.2
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	mesh? (
+		dev-libs/json-c:=
+		sys-libs/readline:0= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+"
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? (	${TEST_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to control your bluetooth devices as a non-root user,
+	please remember to add you to plugdev group.
+"
+
+PATCHES=(
+	# Use static group "plugdev" to not force people to become root for
+	# controlling the devices.
+	"${FILESDIR}"/bluez-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	"${FILESDIR}"/bluez-udevadm-path.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/bluez-5.39-systemd-quote.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# ???
+	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+)
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# btpclient disabled because we don't have ell library in the tree
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--disable-btpclient \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable alsa midi) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			# gatttool is only built with readline, bug #530776
+			dobin attrib/gatttool
+			dobin tools/btmgmt
+		fi
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# example-gatt-client is the only one needing
+			# python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3
+			# for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+
+	prune_libtool_files --modules
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+}
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 9dbee5d72d6a..82fcec6c139b 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,10 +1,12 @@
 DIST iw-3.17.tar.xz 91796 BLAKE2B fd781c287d600a121e0464005f40a24124984c78c16fba4dcc8256a18297aac30e9c322cdbd4c3a6d3d924e10ab340bcbf4d881046e6c6f42b5933ddb4abf47d SHA512 ac4779a88aacb9e2f4859cdb3e953bfba0a83b2e8140777092d61ced6799f09d8ec5628a359109cc23e6389e0ec0ab5a98b9da93c400b7cffedd930013c44f39
 DIST iw-4.0.tar.xz 97352 BLAKE2B 7bc42ec26ad52fbf99184cab8291b4eddd63fd11abb7e2f9b234c57e2061676fa2f66348c0eedc9e784ff420d878b077f605c72562551935a58c1caf5bf12e27 SHA512 404852357166742f0104792a79ac7291c2d1e2b01f07f8bfe0efe14c8444eb87e045d00dd717e21fe9a27542e37f570b2d7bb44aee174091924455f3f3ef9e07
+DIST iw-4.14.tar.xz 114096 BLAKE2B 2b2e4667e37864b9f9e490a47546f9a1f458da7b230e0e6448216d68525a23e47425220132896b9b2bd424c9ecf32e35e2207a9004efa23152628ce3aa9c20ad SHA512 1ce6335628641eb14ed71d39b96a9907fe36e597e6413fdce7f98f7007939bbdc3fac5af69eb1c857259706937e1a7495cf8cbd4e4ba8528c2a471ef6e4bf809
 DIST iw-4.3.tar.xz 98400 BLAKE2B 7e76c85c43d82aed93827d8e534b10f9bbb96ba4e807481eabc502ba79860133aa1755c271ee12f6a504fa52663fbe180e5a4ca91c5ff5824a952e87f2c890d6 SHA512 ac2e15c4829ea7f47f56205942eb2ff5e26e5eeaeaf8991bd3910a758988263a24052b3b0d5fb7fed51456324524777f69e48991f99003ac7f6b2068aa18f9e8
 DIST iw-4.7.tar.xz 101800 BLAKE2B 3bdf49c2717e40ffff0ef78965d6252f0162577ccae945d46706f7900344b8c2a7900b1d336c9840a742ae3e7584e9bfc431ceea00ef104728b2bb48a065c41e SHA512 a43a61f6b10f1dc7ba69eea679aa82f041c8574f1323107581ee30e57296cdbaba80519a3e7d470ff3bbf2a7c2c7b687aae4839eb04b8938db1dacdb4610f5a1
 DIST iw-4.9.tar.xz 105764 BLAKE2B ad8105df91c4717293d5595b5ed9b4d022e455c608d70d1aeefc3d5516dcf92e507f38f424eca60f9d819e998286a4094a83002a1b9aaf4e204ca7a02fded67e SHA512 3c99d8fc07d6d85b8304ff34b96573e22af65aea688a8cb08051ce4857d7ce9ac32a5acd3b30157c6c78e942f84a18f9229c17e353b7a6d01c80324729af18b3
 EBUILD iw-3.17.ebuild 749 BLAKE2B cf343c9e723d6fcc2bfa879e0dc5d9ae2bdc5b9a1f86b836a624e6a6cb2e48cbe2af142b39dd3a8f8141fffec4f2adfbf83f66d599b0ce9ea58a725970bec689 SHA512 dde0a5fa6aebaa76c8f474d2f93b92d3e264a327b56e5a24e2ac3e86769414908da5db338ae3ac6ca6e7b18a9c011753f7c6ffa309e8ef11475cfec8195f0c93
 EBUILD iw-4.0.ebuild 753 BLAKE2B 0dcafdc4d190d6786d32ff487056184789d60745d1e7ab5b3a8b1e4bcba60a0cb8c4758e5f6995c0e696e0fc845c7a4a8109a1103aa4e6fa0fb95aad4967d029 SHA512 bb56694ed46d3214100aedff2d4ad7762f193b414accaf0030291be43bcc5b9f9370e4361fb34c50802dd596060a1307d0c0d2986b65c4d9416ff5737dbb4f98
+EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5aaa5ed49b128b480ec8253968fccd671feb683cf9d4e858ce2c8c64c135ef7c636845b63a45fe0dc71 SHA512 33b81ff5cbf786b406a759dd2b72d8e914c805df99d442c07bbf79723be063608ddab0851c3728862ef71e4d37b7baeb4b1a8b560836f4f4e93eb65c628e5d1f
 EBUILD iw-4.3.ebuild 755 BLAKE2B d9c359eb34d37efc6ef28f44aea898bf6d89e622c4db6fe206b2d04c2c40d543954498df913fa43c3ccd47338b1bb07290c91045e4a29f83d95b092e43443227 SHA512 46429aae6cc69881d3a1320df9e11f28c5e01d010839b99cab83c5f455ed986b4972c698f71c72b9063b3475be062bc7e05e8dd64de18727bf5978b75e165fa5
 EBUILD iw-4.7.ebuild 762 BLAKE2B 417d038aa7efece0cfd2dadeb4bdfc7fb10834053d1e4a0c72706c69deb06b8ba0210e663ff7b0c3ce48358e77a1df80992b2277d567ea76f689979a1d35c84e SHA512 4788121468e574ed343a9a8f781c3e83d15fef389661ffbf17032f29ba984e1bff46f837ec30cedbbb3f52ffaea558ed1794357bbde49be7384546acb5ec7d72
 EBUILD iw-4.9.ebuild 769 BLAKE2B bcf21b170e7dc3bff669711ce2ecc6b3e5a7234dae100dacc7d32b891187625ea8b1fea98e9c09a946dba73bbbfb43a4db309b488d4d8ac9491b0849d8699153 SHA512 9f320c85b568e4db24ef2379b67bc65f87ed14b624ebc7f204574b5825e16745d97d4936c8f366060ca0ca2e88bfc9d66524edfa362ee2106eea47580766f6c5
diff --git a/net-wireless/iw/iw-4.14.ebuild b/net-wireless/iw/iw-4.14.ebuild
new file mode 100644
index 000000000000..27879d734221
--- /dev/null
+++ b/net-wireless/iw/iw-4.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
+HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/libnl:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	tc-export CC LD PKG_CONFIG
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a2266ec11462..6fc3766c69ea 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch.list b/profiles/arch.list
index 6b702f1cd2d3..64e86438046c 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -14,7 +14,6 @@ riscv
 s390
 sh
 sparc
-sparc-fbsd
 x86
 x86-fbsd
 
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 28ca0b6472a4..e93d35cd709d 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -33,6 +33,14 @@
 #-video_cards_vmware
 -input_devices_vmmouse
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sys-libs/libseccomp is not keyworded here.
+seccomp
+
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# net-fs/samba is not keyworded here.
+samba
+
 # James Le Cuirot <chewi@gentoo.org> (19 May 2015)
 # icedtea needs testing and gcj isn't supported
 java
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 19cc5e875db6..b013468dfff7 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (25 Jan 2018)
+# Requires not stabilised app-text/libexttextcat, bug #637086
+net-mail/dovecot textcat
+
 # Brian Evans <grknight@gentoo.org> (9 Jun 2017)
 # sys-cluster/galera needs additional deps stable
 dev-db/mariadb galera
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ffe49921481c..21804a4bc501 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,29 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires dev-libs/efl that is not keyworded.
+dev-libs/dbus-c++ ecore
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# USE=eds requires USE=gnome that is masked here.
+# USE=collada requires media-libs/opencollada.
+# USE=gltf requires media-libs/libgltf.
+# USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
+app-office/libreoffice collada eds gltf postgres
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires mail-client/thunderbird* that is not keyworded here.
+app-misc/tracker thunderbird
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires app-accessibility/brltty that is not keyworded here.
+app-emulation/qemu accessibility
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires app-emulation/xen that is not keyworded here.
+app-emulation/libvirt xen
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires USE=sdl that is masked in this profile.
 media-video/mjpegtools sdlgfx
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 9fc805070230..572ef9602b27 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Jan 2018)
+# systemtap is not yet stable on arm64
+sys-libs/glibc systemtap
+
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not stabilized yet on arm64
 # gnutls: Needs net-libs/gnutls which is not stabilized yet on arm64
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 264cdc30ed9a..68c16727df37 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,10 @@
 -neon
 -armvfp
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sci-geosciences/gpsd is not keyworded here.
+gps
+
 # Mart Raudsepp <leio@gentoo.org> (17 Feb 2017)
 # x11-misc/colord not tested on arm64 yet
 colord
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 29f3d360f06d..d6f8e6b8091e 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 2ef9288fb862..510e4eee001d 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -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
 
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
@@ -251,6 +251,5 @@ riscv
 s390
 sh
 sparc
-sparc-fbsd
 x86
 x86-fbsd
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 730688845f01..499ca8b9f2c8 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
+# USE=grammar requires dev-libs/link-grammar.
+# USE=map requires media-libs/libchamplain.
+# Surprisingly, USE=redland requires dev-libs/redland. But also
+# dev-libs/rasqal. None of them keyworded here.
+app-office/abiword collab grammar map redland
+
 # Brian Evans <grknight@gentoo.org> (15 Jan 2018)
 # app-arch/snappy is not tested
 dev-db/mariadb innodb-snappy
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 384fdee257c2..dafba2b335f6 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# net-misc/networkmanager is not keyworded here.
+networkmanager
+
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sci-geosciences/gpsd is not keyworded here.
+gps
+
 # Brian Evans <grknight@gentoo.org> (15 Jan 2018)
 # Mask tcmalloc as dev-util/google-perftools is unavailable
 tcmalloc
diff --git a/profiles/arch/sparc-fbsd/eapi b/profiles/arch/sparc-fbsd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/sparc-fbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/sparc-fbsd/make.defaults b/profiles/arch/sparc-fbsd/make.defaults
deleted file mode 100644
index bab6ea3e1254..000000000000
--- a/profiles/arch/sparc-fbsd/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# System-wide defaults for the G/FBSD Portage system
-
-ARCH="sparc-fbsd"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ACCEPT_KEYWORDS="~sparc-fbsd sparc-fbsd"
diff --git a/profiles/arch/sparc-fbsd/package.use.force b/profiles/arch/sparc-fbsd/package.use.force
deleted file mode 100644
index dbbc84463184..000000000000
--- a/profiles/arch/sparc-fbsd/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_Sparc
-sys-devel/llvm llvm_targets_Sparc
diff --git a/profiles/arch/sparc-fbsd/parent b/profiles/arch/sparc-fbsd/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/arch/sparc-fbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base
diff --git a/profiles/arch/sparc-fbsd/use.force b/profiles/arch/sparc-fbsd/use.force
deleted file mode 100644
index 0520964ebe4e..000000000000
--- a/profiles/arch/sparc-fbsd/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Force the flag which corresponds to ARCH.
-sparc-fbsd
diff --git a/profiles/arch/sparc-fbsd/use.mask b/profiles/arch/sparc-fbsd/use.mask
deleted file mode 100644
index b76d06524ff8..000000000000
--- a/profiles/arch/sparc-fbsd/use.mask
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Unmask the flag which corresponds to ARCH.
--sparc-fbsd
-
-acpi
-
-# guile fails to build on sparc
-# Even with the patch from FreeBSD Ports it core dumps :/
-guile
-
-# valgrind hasn't been ported to sparc-fbsd yet
-valgrind
-
-# These should work one day
-avahi
-cairo
-dbus
-gnome
-gnome-keyring
-gtk
-mono
-opengl
-php
-qt4
-tk
-xpm
-X
-
-# Ryan Hill <dirtyepic@gentoo.org>
-# Needs sci-mathematics/glpk
-lpsol
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index acad3dcea1ea..0053c3734d92 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,7 +39,3 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
 	suncg6 sunffb sunleo tdfx voodoo"
-
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 7768b74c66b7..7169e6e54181 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -357,7 +357,6 @@ dev-python/PyQt4 multimedia
 # Ben de Groot <yngwin@gentoo.org> (11 Nov 2009)
 # Requires qthelp, which requires qtwebkit, bug 292838
 dev-libs/uriparser doc
-media-libs/libxspf doc
 
 # Raúl Porcel <armin76@gentoo.org>
 # Depends on dev-java/fop which requires java...
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 33c7089f46f4..a381058c68d3 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary mask to support stable bug 639476
-ruby_targets_ruby23
-
 # Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
 # Drop stable ruby on sparc
 ruby
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 6639125e6f26..118c3436da94 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary mask to support stable bug 639476
-ruby_targets_ruby23
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index bd862234ef26..62ac82a8a191 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -34,12 +34,6 @@ dev-lang/python threads
 # Package fails to build with dbus USE flag being disabled (bug #560208)
 =x11-wm/afterstep-2.2.12 dbus
 
-# Gilles Dartiguelongue <eva@gentoo.org> (25 May 2015)
-# webkit fails to build with USE=wayland, bug #549228
-# https://bugs.webkit.org/show_bug.cgi?id=142879
-# https://bugs.webkit.org/show_bug.cgi?id=136831
->=net-libs/webkit-gtk-2.8 X
-
 # Justin Lecher <jlec@gentoo.org> (10 Aug 2014)
 # Doesn't work without acl support
 # No patch yet, #516626
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 264ae931a2f1..9fc4a4c7d158 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -323,10 +323,6 @@ www-client/firefox system-cairo
 mail-client/thunderbird system-cairo
 >=www-client/seamonkey-2.41 system-cairo
 
-# Michael Palimaka <kensington@gentoo.org> (17 Apr 2016)
-# Fails to build with recent doxygen. Bug #569776.
-dev-cpp/eigen:2 doc
-
 # James Le Cuirot <chewi@gentoo.org> (10 Apr 2016)
 # Slower and less reliable than HotSpot and we don't support Java on
 # any non-HotSpot platforms. Don't unmask these unless you know what
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index f0f583ba3e77..aa24aa01a74c 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Jan 2018)
-# USE=wxwidgets Requires x11-libs/wxGTK:3.0-gtk3 stabilisation
-# USE=tcl does not build reliably, bug #624576
->=sci-libs/plplot-5.12 tcl wxwidgets
+# Andrey Grozin <grozin@gentoo.org> (24 Jan 2018)
+# Depends on unstable dev-python/sphinx-gallery.
+# Bug #643840.
+dev-python/matplotlib doc
+
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Requires proprietary fetch-restricted package that is not suitable
+# for stabilization. Bug #645092.
+net-proxy/haproxy device-atlas
 
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017)
 # Dependencies have no stable keyword
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/eapi b/profiles/default/bsd/fbsd/sparc/8.2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults b/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
deleted file mode 100644
index eaba730f9ddc..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="sparc64-gentoo-freebsd8.2"
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/parent b/profiles/default/bsd/fbsd/sparc/8.2/parent
deleted file mode 100644
index 43010996613b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-8.2
diff --git a/profiles/default/bsd/fbsd/sparc/eapi b/profiles/default/bsd/fbsd/sparc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/parent b/profiles/default/bsd/fbsd/sparc/parent
deleted file mode 100644
index 134cc7a38402..000000000000
--- a/profiles/default/bsd/fbsd/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/sparc-fbsd
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 793ae3689176..b1e80653f29f 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -20,7 +20,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index 37c202d1ffcf..33e09b35488a 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -14,5 +14,4 @@ media-video/nvidia-settings
 # See bug 426764.
 sci-physics/cernlib
 sci-physics/cernlib-montecarlo
-sci-physics/geant:3
 sci-physics/paw
diff --git a/profiles/package.mask b/profiles/package.mask
index 0ab86239a597..361b72fd4488 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,64 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka <kensington@gentoo.org> (25 Jan 2018)
+# Requires dead Qt 4. Dead upstream.
+# Masked for removal in 30 days. Bug #644532.
+media-video/qx11grab
+
+# Hans de Graaff <graaff@gentoo.org> (24 Jan 2018)
+# Remove packages that are ruby22-only, and either cannot
+# be updated to ruby23, or are in old, obsolete, slots.
+# Masked for removal in 30 days.
+dev-ruby/amq-protocol:0
+dev-ruby/aws-sdk:0
+dev-ruby/bson:3
+dev-ruby/camping
+dev-ruby/execjs:1
+dev-ruby/mocha:0.11
+dev-ruby/mocha:0.12
+dev-ruby/mocha:0.13
+dev-ruby/mongo
+dev-ruby/net-ssh-multi
+dev-ruby/pcaprub:0.11
+dev-ruby/postgres_ext:2.4
+dev-ruby/rack:1.4
+dev-ruby/rack:1.5
+dev-ruby/rbtree
+dev-ruby/recog:2.0.14
+dev-ruby/right_http_connection
+dev-ruby/rspec-rails:2
+dev-ruby/sass:0
+dev-ruby/sass-rails:4.0
+dev-ruby/snmplib
+dev-ruby/sprockets:2
+dev-ruby/test-unit:0
+dev-ruby/tilt:0
+virtual/ruby-minitest
+www-apps/jekyll-gist
+
+
+# Andreas Sturmlechner <asturm@gentoo.org> (23 Jan 2018)
+# Depends on deprecated Qt4, no revdeps left.
+# Masked for removal in 30 days.
+dev-libs/libindicate-qt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Jan 2018)
+# Depends on deprecated Qt4, dead project.
+# Masked for removal in 30 days.
+app-emulation/qtemu
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Jan 2018)
+# Depends on deprecated Qt4, upstream is slowly doing a qml port.
+# Masked for removal in 60 days. Revisit bug #645504 before deciding
+# eventual removal.
+games-strategy/hedgewars
+
+# Eray Aslan <eras@gentoo.org> (22 Jan 2018)
+# Vulnerable - see https://bugs.gentoo.org/630684
+# Please migrate to cyrus-imapd-3.0 releases
+=net-mail/cyrus-imapd-2.5*
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
 # Outdated and broken for a long time, blocking cleanups.
 # Depends on deprecated LINGUAS/Qt4/kde4-functions.eclass.
@@ -42,10 +100,6 @@ net-p2p/primecoind
 # Masked for removal in 30 days. Bug #513564
 sci-physics/geant-python
 
-# Jeroen Roovers <jer@gentoo.org> (19 Jan 2018)
-# Breaks net-libs/nodejs (bug #645018)
-=dev-libs/libuv-1.19.0
-
 # Patrice Clement <monsieurp@gentoo.org> (18 Jan 2018)
 # mpv-0.28.0 requires changes currently only available in ffmpeg-9999.
 =media-video/mpv-0.28.0
@@ -217,11 +271,6 @@ media-video/2mandvd
 # Masked for removal in 30 days, no more rdeps, bug #602816
 dev-python/python-poppler-qt4
 
-# Mikle Kolyada <zlogene@gentoo.org> (07 Jan 2018)
-# The package was suddenly forgotten during tuxonice-sources masking.
-# Mask for removal in 14 days as the sources package has already been removed.
-sys-apps/tuxonice-userui
-
 # Andreas Sturmlechner <asturm@gentoo.org> (05 Jan 2018)
 # Masked for removal in 30 days, merged into dev-util/kdevelop
 dev-util/kdevplatform
@@ -628,29 +677,11 @@ net-voip/ekiga
 =sys-kernel/gentoo-sources-4.14.10
 =sys-kernel/vanilla-sources-4.14.10
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
-# Ancient. EAPI=3. (Nearly) no consumers. Needs to go.
-# Removal in 30 days.
-dev-lang/swig:1
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
-# Last remaining consumer of dev-lang/swig:1, which needs
-# to go the way of the dinosaur. Removal in 30 days.
-dev-python/apse
-
 # Matthias Maier <tamiko@gentoo.org> (26 Dec 2017)
 # gcc depends on mpfr and this version changes soname. Spare users with
 # FEATURES=-preserve-libs from completely frying their system.
 >=dev-libs/mpfr-4.0.0
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (25 Dec 2017)
-# Provided (and blocked) by app-text/texlive-core
-# Removal in 30 days; bug 628820
-app-text/dvibook
-app-text/dvipdfm
-app-text/dvipdfmx
-app-text/xdvipdfmx
-
 # Thomas Beierlein <tomjbe@gentoo.org> (23 Dec 2017)
 # To adapt to changed version naming by upstream 
 # (pcb-yyyymmdd to pcb-x.y.z) we move the ebuild to
@@ -658,24 +689,6 @@ app-text/xdvipdfmx
 # Do not remove the mask until newer version gets stable
 >=sci-electronics/pcb-20000000
 
-# Mike Gilbert <floppym@gentoo.org> (23 Dec 2017)
-# Fails to build without glibc rpc support, bug 630670.
-# Use net-nds/rpcbind instead.
-# Removal in 30 days.
-net-nds/portmap
-
-# Mike Gilbert <floppym@gentoo.org> (23 Dec 2017)
-# Fails to build without glibc rpc support, bug 641154.
-# Dead upstream.
-# Removal in 30 days.
-mail-client/drac
-
-# Thomas Beierlein <tomjbe@gentoo.org> (22 Dec 2017)
-# Development moved to another naming scheme.
-# Use media-radio/tucnak instead.
-# Masked for removal in 30 days.
-media-radio/tucnak2
-
 # Alice Ferrazzi <alicef@gentoo.org> (22 Dec 2017)
 # Masked for removal in 30 days.
 # Linux kernel 4.13 can break various laptops.
diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent
index 16c974fd71e3..0d2c53ad27fc 100644
--- a/profiles/prefix/linux/amd64/parent
+++ b/profiles/prefix/linux/amd64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/amd64/13.0/no-multilib
+../../../default/linux/amd64/17.0/no-multilib
 ..
diff --git a/profiles/prefix/linux/arm/parent b/profiles/prefix/linux/arm/parent
index c9cb641f50d9..b53dc55dbd9e 100644
--- a/profiles/prefix/linux/arm/parent
+++ b/profiles/prefix/linux/arm/parent
@@ -1,2 +1,2 @@
-../../../default/linux/arm/13.0
+../../../default/linux/arm/17.0
 ..
diff --git a/profiles/prefix/linux/ppc64/parent b/profiles/prefix/linux/ppc64/parent
index 51fedc0bc3e6..ba569be12a9a 100644
--- a/profiles/prefix/linux/ppc64/parent
+++ b/profiles/prefix/linux/ppc64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/powerpc/ppc64/13.0/64bit-userland
+../../../default/linux/powerpc/ppc64/17.0/64bit-userland
 ..
diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent
index 0fbf3318c1e6..c1189513e91b 100644
--- a/profiles/prefix/linux/x86/parent
+++ b/profiles/prefix/linux/x86/parent
@@ -1,2 +1,2 @@
-../../../default/linux/x86/13.0
+../../../default/linux/x86/17.0
 ..
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index f1c5c365338b..7d1251609c0f 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # On windows, binary files (executables, shared libraries) in use
@@ -13,6 +13,20 @@
 # Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
 export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 
+windows_setup_dllhelper() {
+	case ${CATEGORY}/${PN} in
+	sys-libs/zlib |\
+	'')
+		# When a package build system does not know about Windows at all,
+		# still it can be built for Windows using Gentoo Parity.
+		# But as there is another file to install (the real dll),
+		# and installation is done using cp, we override cp to
+		# additionally copy the dll when the library is copied.
+		windows_setup_dllhelper_cp
+		;;
+	esac
+}
+
 windows_cleanup_removed_files() {
 	local removedlist=$1
 	rm -f "${removedlist}".new
@@ -78,17 +92,36 @@ windows_prepare_file() {
 
 post_src_install() {
 	cd "${ED}"
-	find . -name '*.exe' | while read f; do
-		if file "${f}" | grep "GUI" > /dev/null 2>&1; then
-			if test ! -f "${f%.exe}"; then
-				einfo "Windows GUI Executable $f will have no symlink."
+	find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
+	while read f
+	do
+		f=${f#./}
+		case ${f} in
+		*.exe)
+			if file "./${f}" | grep "GUI" > /dev/null 2>&1; then
+				if test ! -f "./${f%.exe}"; then
+					einfo "Windows GUI Executable $f will have no symlink."
+				fi
+			else
+				if test ! -f "./${f%.exe}"; then
+					ebegin "creating ${f%.exe} -> ${f} for console accessibility."
+					eend $(ln -sf "$(basename "${f}")" "./${f%.exe}" && echo 0 || echo 1)
+				fi
 			fi
-		else
-			if test ! -f "${f%.exe}"; then
-				ebegin "creating ${f%.exe} -> ${f} for console accessibility."
-				eend $(ln -sf "$(basename "${f}")" "${f%.exe}" && echo 0 || echo 1)
+			;;
+		*.dll.a)
+			if test ! -f "./${f%.a}.lib"; then
+				ebegin "creating ${f%.a}.lib -> ${f##*/} for libtool linkability"
+				eend $(ln -sf "$(basename "${f}")" "./${f%.a}.lib" && echo 0 || echo 1)
 			fi
-		fi
+			;;
+		*.so)
+			if test ! -f "${f%.so}.dll.lib"; then
+				ebegin "creating ${f%.so}.dll.lib -> ${f##*/} for libtool linkability"
+				eend $(ln -sf "$(basename "${f}")" "./${f%.so}.dll.lib" && echo 0 || echo 1)
+			fi
+			;;
+		esac
 	done
 }
 
@@ -149,3 +182,109 @@ pre_pkg_postrm() {
 	local removedlist="${EROOT}var/lib/portage/files2bremoved"
 	windows_cleanup_removed_files $removedlist
 }
+
+windows_setup_dllhelper_cp() {
+	if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]]
+	then
+		mkdir -p "${T}/dllhelper"
+		cat > "${T}/dllhelper/cp" <<'EOCP'
+#!/usr/bin/env bash
+
+mysrcs=()
+myopts=()
+mydest=
+force_dest_file_opt=
+
+nextargs=( "$@" )
+
+while [[ $# > 0 ]]
+do
+	arg=${1}
+	shift
+	case ${arg} in
+	--)
+		mysrcs+=( "${@}" )
+		break
+		;;
+	-S)
+		myopts+=( "${arg}" ${1+"$1"} )
+		${1:+shift}
+		;;
+	-t)
+		mydest="${1-}"
+		${1:+shift}
+		;;
+	-T)
+		force_dest_file_opt=${arg}
+		;;
+	-*)
+		myopts+=( "${arg}" )
+		;;
+	*)
+		mysrcs+=( "${arg}" )
+		;;
+	esac
+done
+
+me=${0##*/}
+nextPATH=
+oIFS=$IFS
+IFS=:
+for p in ${PATH}
+do
+	[[ ${p}/${me} -ef ${0} ]] && continue
+	nextPATH+=${nextPATH:+:}${p}
+done
+IFS=${oIFS}
+
+PATH=${nextPATH}
+
+${me} "${nextargs[@]}"
+ret=$?
+[[ ${ret} == 0 ]] || exit ${ret}
+
+if [[ -z ${mydest} ]]
+then
+	[[ ${#mysrcs[@]} < 2 ]] && exit 0
+	: "${mysrcs[@]}" "${#mysrcs[@]}"
+	mydest=${mysrcs[${#mysrcs[@]}-1]}
+	unset mysrcs[${#mysrcs[@]}-1]
+elif [[ ${#mysrcs[@]} == 0 ]]
+then
+	exit 0
+fi
+
+for src in ${mysrcs[@]}
+do
+	ret=0
+	[[ ${src##*/} != lib*.so* ]] && continue
+	for ext in dll pdb
+	do
+		[[ ${src##*/} == *.${ext} ]] && continue
+		[[ -f ${src} && -f ${src}.${ext} ]] || continue
+		if [[ -d ${mydest} && ! -n ${force_dest_file_opt} ]]
+		then
+			# When copying to directory we keep the basename.
+			${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}/${src##*/}.${ext}"
+			ret=$?
+		elif [[ ${mydest##*/} == ${src##*/} ]]
+		then
+			# Copy the dll only when we keep the basename.
+			${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}.${ext}"
+			ret=$?
+		fi
+		[[ ${ret} == 0 ]] || exit ${ret}
+	done
+done
+
+exit 0
+EOCP
+		chmod +x "${T}/dllhelper/cp"
+		PATH="${T}/dllhelper:${PATH}"
+	fi
+}
+
+if [[ ${EBUILD_PHASE} == 'setup' ]]
+then
+	windows_setup_dllhelper
+fi
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 689031ff912e..d323534ffc42 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -258,13 +258,12 @@ x86		default/linux/x86/17.0/systemd			stable
 
 # Gentoo/FreeBSD Profiles
 # @MAINTAINER: bsd@gentoo.org
-amd64-fbsd	default/bsd/fbsd/amd64/9.1			dev
+amd64-fbsd	default/bsd/fbsd/amd64/9.1			exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
-sparc-fbsd      default/bsd/fbsd/sparc/8.2                      exp
-x86-fbsd	default/bsd/fbsd/x86/9.1			dev
-x86-fbsd	default/bsd/fbsd/x86/11.1			dev
+x86-fbsd	default/bsd/fbsd/x86/9.1			exp
+x86-fbsd	default/bsd/fbsd/x86/11.1			exp
 
 # Hardened Profiles
 # @MAINTAINER: hardened@gentoo.org
@@ -324,27 +323,6 @@ ppc		hardened/linux/uclibc/ppc				exp
 x86		default/linux/uclibc/x86				exp
 x86		hardened/linux/uclibc/x86				exp
 
-# uclibc/embedded multiarch profiles
-# @MAINTAINER: uclibc@gentoo.org
-#amd64		uclibc/amd64					dev
-#arm		uclibc/arm					dev
-#arm		uclibc/arm/2.4					dev
-#mips		uclibc/mips					dev
-#mips		uclibc/mips/hardened				dev
-#ppc		uclibc/ppc					dev
-#ppc		uclibc/ppc/2.4					dev
-#ppc		uclibc/ppc/hardened				dev
-#ppc		uclibc/ppc/hardened/2.4				dev
-#sh		uclibc/sh					dev
-#sh		uclibc/sh/2.4					dev
-#x86		uclibc/x86					dev
-#x86		uclibc/x86/2.4					dev
-#x86		uclibc/x86/2005.1				dev
-#x86		uclibc/x86/2005.1/2.4				dev
-#x86		uclibc/x86/hardened				dev
-#x86		uclibc/x86/hardened/2.4				dev
-
-
 # These are Gentoo Prefix profiles, maintained by the Prefix team
 # @MAINTAINER: prefix@gentoo.org
 
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 3c79e5bbb7e0..554fb2728a6e 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,6 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Required by app-office/libreoffice[kde]
+>=app-office/libreoffice-6.1 gtk
+
 # Required by kde-apps/okteta
 dev-qt/qtscript:5 scripttools
 
@@ -25,9 +28,6 @@ media-libs/mesa egl wayland
 # Required by kde-apps/kdenlive
 >=media-libs/mlt-0.9.8-r2 ffmpeg kdenlive melt
 
-# Required by app-office/libreoffice
-media-libs/phonon designer
-
 # Required by kde-plasma/plasma-pa
 media-sound/pulseaudio gnome
 
diff --git a/profiles/uclibc/amd64/eapi b/profiles/uclibc/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/amd64/make.defaults b/profiles/uclibc/amd64/make.defaults
deleted file mode 100644
index 44f66951f3d0..000000000000
--- a/profiles/uclibc/amd64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-ARCH="amd64"
-ACCEPT_KEYWORDS="amd64"
-
-CHOST="x86_64-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/amd64/parent b/profiles/uclibc/amd64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/2.4/eapi b/profiles/uclibc/arm/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/2.4/package.mask b/profiles/uclibc/arm/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/arm/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/arm/2.4/parent b/profiles/uclibc/arm/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/2.4/deprecated b/profiles/uclibc/arm/armeb/2.4/deprecated
deleted file mode 100644
index d6b062e5bcec..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm/2.4
diff --git a/profiles/uclibc/arm/armeb/2.4/eapi b/profiles/uclibc/arm/armeb/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/armeb/2.4/package.mask b/profiles/uclibc/arm/armeb/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/arm/armeb/2.4/parent b/profiles/uclibc/arm/armeb/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/deprecated b/profiles/uclibc/arm/armeb/deprecated
deleted file mode 100644
index 6f0cf29c566a..000000000000
--- a/profiles/uclibc/arm/armeb/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm
diff --git a/profiles/uclibc/arm/armeb/eapi b/profiles/uclibc/arm/armeb/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/armeb/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/armeb/make.defaults b/profiles/uclibc/arm/armeb/make.defaults
deleted file mode 100644
index 46ce2331360d..000000000000
--- a/profiles/uclibc/arm/armeb/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="armeb-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/arm/armeb/parent b/profiles/uclibc/arm/armeb/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/armeb/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/eapi b/profiles/uclibc/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/make.defaults b/profiles/uclibc/arm/make.defaults
deleted file mode 100644
index 417e228caf71..000000000000
--- a/profiles/uclibc/arm/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="arm"
-ACCEPT_KEYWORDS="arm"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-UCLIBC_CPU_DEFAULT="GENERIC_ARM"
diff --git a/profiles/uclibc/arm/package.mask b/profiles/uclibc/arm/package.mask
deleted file mode 100644
index e2011990abf3..000000000000
--- a/profiles/uclibc/arm/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Segfaults, bug #193597
->=net-proxy/squid-3
diff --git a/profiles/uclibc/arm/parent b/profiles/uclibc/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/eapi b/profiles/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
deleted file mode 100644
index d891f0b122c8..000000000000
--- a/profiles/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc"
-USE="ncurses readline zlib uclibc -fortran -pam -berkdb -ipv6 -pppd"
-CFLAGS="-Os"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-FEATURES="sandbox sfperms strict nodoc noinfo noman"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/uclibc/mips/eapi b/profiles/uclibc/mips/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/hardened/eapi b/profiles/uclibc/mips/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/hardened/make.defaults b/profiles/uclibc/mips/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/mips/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/hardened/package.mask b/profiles/uclibc/mips/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/mips/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/mips/hardened/package.use.mask b/profiles/uclibc/mips/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/mips/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/mips/hardened/parent b/profiles/uclibc/mips/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/make.defaults b/profiles/uclibc/mips/make.defaults
deleted file mode 100644
index 2a17bbe61e19..000000000000
--- a/profiles/uclibc/mips/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-ARCH="mips"
-ACCEPT_KEYWORDS="mips"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-FEATURES="-sandbox"
-
-UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
diff --git a/profiles/uclibc/mips/mipsel/deprecated b/profiles/uclibc/mips/mipsel/deprecated
deleted file mode 100644
index d1d399b5015e..000000000000
--- a/profiles/uclibc/mips/mipsel/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips
diff --git a/profiles/uclibc/mips/mipsel/eapi b/profiles/uclibc/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/mipsel/hardened/deprecated b/profiles/uclibc/mips/mipsel/hardened/deprecated
deleted file mode 100644
index 1027bb28ae7c..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips/hardened
diff --git a/profiles/uclibc/mips/mipsel/hardened/eapi b/profiles/uclibc/mips/mipsel/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/mipsel/hardened/make.defaults b/profiles/uclibc/mips/mipsel/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/mipsel/hardened/parent b/profiles/uclibc/mips/mipsel/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/mipsel/make.defaults b/profiles/uclibc/mips/mipsel/make.defaults
deleted file mode 100644
index 80b70299abe4..000000000000
--- a/profiles/uclibc/mips/mipsel/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/mips/mipsel/parent b/profiles/uclibc/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/parent b/profiles/uclibc/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/use.mask b/profiles/uclibc/mips/use.mask
deleted file mode 100644
index 55dae7eac0e9..000000000000
--- a/profiles/uclibc/mips/use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Henrik Brix Andersen <brix@gentoo.org>
-# According to the mips herd, we currently have no way of testing
-# pcmcia on mips, bug #90359
-pcmcia
-
-# Luca Longinotti <chtekk@gentoo.org>
-# Mask php USE on MIPS profiles
-php
-
-# Peter Volkov <pva@gentoo.org> MPI was never tested on mips, but
-# some programs with this useflag are useful, e.g #227631
-mpi
diff --git a/profiles/uclibc/package.mask b/profiles/uclibc/package.mask
deleted file mode 100644
index ca174b1390ee..000000000000
--- a/profiles/uclibc/package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# glib-2.x requires working locale/iconv which
-# isn't available atm in uclibc
->=dev-libs/glib-2.5
-
-sys-libs/glibc
-
-# breaks gcc and such
-dev-libs/libiconv
-
-# requires funcs we dont yet provide
->=sys-fs/xfsprogs-2.8.10
diff --git a/profiles/uclibc/package.use b/profiles/uclibc/package.use
deleted file mode 100644
index 3b0ed50687e5..000000000000
--- a/profiles/uclibc/package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-virtual/ssh minimal
diff --git a/profiles/uclibc/packages b/profiles/uclibc/packages
deleted file mode 100644
index d02c949b3e6c..000000000000
--- a/profiles/uclibc/packages
+++ /dev/null
@@ -1,12 +0,0 @@
-*app-misc/pax-utils
-
-# remove stuff not needed on uclibc
--*net-misc/iputils
-# man pages disabled (noman)
--*sys-apps/man
--*virtual/man
--*sys-apps/man-pages
-# this will be added by nls
--*sys-devel/gettext
-
--*sys-apps/hdparm
diff --git a/profiles/uclibc/packages.build b/profiles/uclibc/packages.build
deleted file mode 100644
index 579dfcb01855..000000000000
--- a/profiles/uclibc/packages.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# this should be added by nls only
--sys-devel/gettext
-
-virtual/shadow
diff --git a/profiles/uclibc/parent b/profiles/uclibc/parent
deleted file mode 100644
index 6f0b2fa994bc..000000000000
--- a/profiles/uclibc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../base
-../default/linux
diff --git a/profiles/uclibc/ppc/2.4/eapi b/profiles/uclibc/ppc/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/2.4/package.mask b/profiles/uclibc/ppc/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/ppc/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/ppc/2.4/parent b/profiles/uclibc/ppc/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/eapi b/profiles/uclibc/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/2.4/eapi b/profiles/uclibc/ppc/hardened/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/2.4/package.mask b/profiles/uclibc/ppc/hardened/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/ppc/hardened/2.4/parent b/profiles/uclibc/ppc/hardened/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/hardened/eapi b/profiles/uclibc/ppc/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/make.defaults b/profiles/uclibc/ppc/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/ppc/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/ppc/hardened/package.mask b/profiles/uclibc/ppc/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/ppc/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/ppc/hardened/package.use.mask b/profiles/uclibc/ppc/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/ppc/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/ppc/hardened/parent b/profiles/uclibc/ppc/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/make.defaults b/profiles/uclibc/ppc/make.defaults
deleted file mode 100644
index 0514ca71084a..000000000000
--- a/profiles/uclibc/ppc/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-CHOST="powerpc-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT=""
diff --git a/profiles/uclibc/ppc/package.use.mask b/profiles/uclibc/ppc/package.use.mask
deleted file mode 100644
index 3375a9fc565d..000000000000
--- a/profiles/uclibc/ppc/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Joseph Jezak <josejx@gentoo.org> (28 Jun 2007)
-# Masked Parallel LCD devices for bug #180683
-app-misc/lcd4linux lcd_devices_hd44780
diff --git a/profiles/uclibc/ppc/parent b/profiles/uclibc/ppc/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/use.mask b/profiles/uclibc/ppc/use.mask
deleted file mode 100644
index 99ded03d7d2a..000000000000
--- a/profiles/uclibc/ppc/use.mask
+++ /dev/null
@@ -1,24 +0,0 @@
--altivec
-
-# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
-# Unmask the Apple drivers
-# Mask ALSA drivers for ISA cards
-alsa_cards_msnd-pinnacle
-alsa_cards_sb16
-alsa_cards_sbawe
-alsa_cards_sscape
-alsa_cards_wavefront
-
-# app-misc/lcd4linux
-lcd_devices_lph7508
-lcd_devices_m50530
-lcd_devices_noritake
-lcd_devices_routerboard
-
-# app-misc/lcdproc
-lcd_devices_sed1330
-lcd_devices_sed1520
-lcd_devices_stv5730
-
-# Both
-lcd_devices_t6963
diff --git a/profiles/uclibc/sh/2.4/eapi b/profiles/uclibc/sh/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/sh/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/sh/2.4/package.mask b/profiles/uclibc/sh/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/sh/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/sh/2.4/parent b/profiles/uclibc/sh/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/sh/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/sh/eapi b/profiles/uclibc/sh/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/sh/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/sh/make.defaults b/profiles/uclibc/sh/make.defaults
deleted file mode 100644
index 217d96769e7b..000000000000
--- a/profiles/uclibc/sh/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="sh"
-ACCEPT_KEYWORDS="sh"
-
-CHOST="sh4-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="SH4"
diff --git a/profiles/uclibc/sh/parent b/profiles/uclibc/sh/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/sh/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/use.force b/profiles/uclibc/use.force
deleted file mode 100644
index 3904f12fc0b2..000000000000
--- a/profiles/uclibc/use.force
+++ /dev/null
@@ -1 +0,0 @@
-elibc_uclibc
diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
deleted file mode 100644
index a8a38bf0b10f..000000000000
--- a/profiles/uclibc/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-iconv
-nls
-nis
-
--uclibc
-
--elibc_uclibc
-elibc_glibc
-
--hardened
diff --git a/profiles/uclibc/x86/2.4/eapi b/profiles/uclibc/x86/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2.4/package.mask b/profiles/uclibc/x86/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/2.4/parent b/profiles/uclibc/x86/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/2.4/eapi b/profiles/uclibc/x86/2005.1/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2005.1/2.4/package.mask b/profiles/uclibc/x86/2005.1/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/2005.1/2.4/parent b/profiles/uclibc/x86/2005.1/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/eapi b/profiles/uclibc/x86/2005.1/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2005.1/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2005.1/parent b/profiles/uclibc/x86/2005.1/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2005.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/eapi b/profiles/uclibc/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/2.4/eapi b/profiles/uclibc/x86/hardened/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/2.4/package.mask b/profiles/uclibc/x86/hardened/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/hardened/2.4/parent b/profiles/uclibc/x86/hardened/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/hardened/eapi b/profiles/uclibc/x86/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/make.defaults b/profiles/uclibc/x86/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/x86/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/x86/hardened/package.mask b/profiles/uclibc/x86/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/x86/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/x86/hardened/package.use.mask b/profiles/uclibc/x86/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/x86/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/x86/hardened/parent b/profiles/uclibc/x86/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux24/deprecated b/profiles/uclibc/x86/linux24/deprecated
deleted file mode 100644
index 45453344c8e1..000000000000
--- a/profiles/uclibc/x86/linux24/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86/2.4
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86/2.4 make.profile
diff --git a/profiles/uclibc/x86/linux24/eapi b/profiles/uclibc/x86/linux24/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/linux24/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/linux24/parent b/profiles/uclibc/x86/linux24/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/linux24/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux26/deprecated b/profiles/uclibc/x86/linux26/deprecated
deleted file mode 100644
index 45729f9460ba..000000000000
--- a/profiles/uclibc/x86/linux26/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86 make.profile
diff --git a/profiles/uclibc/x86/linux26/eapi b/profiles/uclibc/x86/linux26/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/linux26/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/linux26/parent b/profiles/uclibc/x86/linux26/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/linux26/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/make.defaults b/profiles/uclibc/x86/make.defaults
deleted file mode 100644
index 0b41209d6fc9..000000000000
--- a/profiles/uclibc/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i386-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="GENERIC_386"
diff --git a/profiles/uclibc/x86/parent b/profiles/uclibc/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/use.mask b/profiles/uclibc/x86/use.mask
deleted file mode 100644
index a75b2170bdd6..000000000000
--- a/profiles/uclibc/x86/use.mask
+++ /dev/null
@@ -1,19 +0,0 @@
--cpu_flags_x86_3dnow
--cpu_flags_x86_3dnowext
--cpu_flags_x86_aes
--cpu_flags_x86_avx
--cpu_flags_x86_avx2
--cpu_flags_x86_fma3
--cpu_flags_x86_fma4
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_padlock
--cpu_flags_x86_popcnt
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_sse3
--cpu_flags_x86_sse4_1
--cpu_flags_x86_sse4_2
--cpu_flags_x86_sse4a
--cpu_flags_x86_ssse3
--cpu_flags_x86_xop
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 88f667f04977..7a859264388a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -1,2 +1,4 @@
 move app-portage/kuroo4 app-portage/kuroo
 slotmove app-portage/kuroo 4 0
+move dev-cpp/gsl dev-cpp/ms-gsl
+slotmove =dev-util/cucumber-3.1.0 3.0 3.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0c76afb64ad7..62ef60c1b42f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -100,6 +100,7 @@ app-admin/pass:fish-completion - Enable fish completion support.
 app-admin/pass:git - Use dev-vcs/git for password revisions.
 app-admin/pass:importers - Allow importing passwords from other password managers using various contributed scripts.
 app-admin/passwordsafe:minimal - Avoid collision with app-misc/pwsafe
+app-admin/passwordsafe:qr - Enable QR code password display
 app-admin/passwordsafe:xml - Enable XML import support
 app-admin/passwordsafe:yubikey - Enable support for Yubikey
 app-admin/prelude-manager:dbx - Enables Prelude Manager storing Prelude alerts into database through dev-libs/libpreludedb .
@@ -858,6 +859,7 @@ app-misc/ca-certificates:cacert - Include root certificates from CAcert (http://
 app-misc/ca-certificates:insecure_certs - Install certificates which are known to be untrustworthy.
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
 app-misc/ddccontrol:pci - enable direct PCI memory access (the setuid ddcpci util)
+app-misc/ddcutil:drm - Use x11-libs/libdrm for more verbose diagnostics.
 app-misc/ddcutil:usb-monitor - Adds support for monitors attached via USB.
 app-misc/ddcutil:user-permissions - Adds a udev rules to allow non-root users in the i2c group to access the /dev/i2c-* devices. If usb-monitor is selected, users will need to be added to the video group to access the USB monitor. Otherwise, only root will be able to use ddcutil.
 app-misc/digitemp:ds2490 - Build support for the ds2490 sensor
@@ -1019,7 +1021,8 @@ app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
 app-office/libreoffice:collada - Enable Collada for rendering 3D models stored in *.dae and *.kmz format
 app-office/libreoffice:gltf - Use media-libs/libgltf for inserting 3D models in the glTF format into presentations
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
-app-office/libreoffice:gtk3 - Enable highly experimental gtk3 frontend
+app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
+app-office/libreoffice:gtk3 - Enable experimental gtk3 frontend
 app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
@@ -1283,7 +1286,6 @@ dev-ada/libgpr:static-pic - Build static library with pic code
 dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/xmlada:shared - Build shared library
-dev-ada/xmlada:static - Build static library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
 dev-cpp/eigen:cuda - Build with cuda support
@@ -1413,7 +1415,6 @@ dev-db/percona-server:tokudb-backup-plugin - Builds the TokuDB backup plugin
 dev-db/percona-server:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/pgadmin3:databasedesigner - Enable the Database Designer component
 dev-db/pgbouncer:c-ares - Use c-ares as the DNS backend instead of evdns (libevent).
-dev-db/pgbouncer:libevent - Use libevent 2.0+ and evdns as the DNS backend
 dev-db/pgbouncer:udns - Use udns as the DNS backend instead of evdns (libevent). Supports IPv4 only.
 dev-db/pgpool2:memcached - Use memcached for query caching.
 dev-db/pgrouting:drivingdistance - Enable to calculate driving distance
@@ -1936,6 +1937,7 @@ dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
 dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:clang - Use sys-devel/clang for building
+dev-lang/rust:jemalloc - Use sys-libs/jemalloc as the standard memory allocator
 dev-lang/rust:libcxx - Use sys-libs/libcxx as standard library when building with sys-devel/clang
 dev-lang/rust:system-llvm - Use system sys-devel/llvm in place of the bundled one
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
@@ -1987,6 +1989,7 @@ dev-libs/apr:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/apr-util:libressl - Use dev-libs/libressl instead of dev-libs/openssl for 'openssl' USE flag
 dev-libs/apr-util:nss - Install apr_crypto_nss module
 dev-libs/apr-util:openssl - Install apr_crypto_openssl module
+dev-libs/atcore:gui - Build test GUI
 dev-libs/beignet:ocl-icd - Enable compatibility with the dev-libs/ocl-icd OpenCL ICD loader
 dev-libs/beignet:ocl20 - Enable experimental OpenCL 2.0 support on Skylake and newer architectures
 dev-libs/bitset:jemalloc - Use dev-libs/jemalloc for allocations
@@ -2784,7 +2787,6 @@ dev-scheme/kawa:krl - Build BRL emulation and KRL
 dev-scheme/kawa:sax - Assume SAX2 is available with dev-java/sax
 dev-scheme/kawa:servlets - Build support for generating servlets with dev-java/servletapi
 dev-scheme/kawa:swing - Assume Swing is available
-dev-scheme/kawa:swt - Assume SWT is available with dev-java/swt
 dev-scheme/kawa:xqtests - Support XQuery Test Suite
 dev-scheme/racket:backtrace - Support GC backtrace dumps
 dev-scheme/racket:futures - Enable racket/future library for fine-grained hardware parallelism
@@ -4165,7 +4167,6 @@ media-libs/libextractor:archive - Enable archive support using app-arch/libarchi
 media-libs/libextractor:gsf - Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf
 media-libs/libextractor:magic - Enable magic support using sys-apps/file
 media-libs/libextractor:midi - Enable MIDI support through media-libs/libsmf
-media-libs/libffado:qt4 - Install qt4-based mixer frontend
 media-libs/libffado:test-programs - Install standalone test programs
 media-libs/libggi:vis - Enables sparc vis support for libggi
 media-libs/libgphoto2:serial - Enable serial port support
@@ -4281,7 +4282,6 @@ media-libs/openimageio:cpu_flags_x86_f16c - SIMD Optimization
 media-libs/openimageio:field3d - Use media-libs/Field3D
 media-libs/openimageio:opencv - Use media-libs/opencv
 media-libs/openimageio:ptex - Use media-libs/ptex
-media-libs/openimageio:tbb - Use dev-cpp/tbb
 media-libs/opensubdiv:cuda - Enable NVIDIA CUDA Toolkit support through dev-util/nvidia-cuda-toolkit.
 media-libs/opensubdiv:opencl - Enable OpenCL support through virtual/opencl.
 media-libs/opensubdiv:ptex - Adds support for faster per-face texture mapping through media-libs/ptex.
@@ -4439,8 +4439,6 @@ media-plugins/vdr-xineliboutput:xine - Compile the xine input plugin for display
 media-radio/ax25-tools:X - Enable some X based configuration tools.
 media-radio/fldigi:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio in use
 media-radio/tucnak:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
-media-radio/tucnak2:ftdi - Enable support for FTDI USB chips
-media-radio/tucnak2:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
 media-radio/unixcw:ncurses - Enables building the curses based morse code tutor program 'cwcp'.
 media-radio/xastir:festival - Enable text to speech synthesizer
 media-radio/xastir:gdal - Support for some further map formats
@@ -4711,6 +4709,7 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
 media-sound/split2flac:mac - Add support for Monkey's Audio files
 media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
 media-sound/supercollider:emacs - Enable the SCEL user interface
 media-sound/supercollider:gedit - Enable the SCED user interface
 media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
@@ -6914,6 +6913,7 @@ net-p2p/primecoin-qt:qrcode - Enable generation of QR Codes for receiving paymen
 net-p2p/primecoind:logrotate - Use app-admin/logrotate for rotating logs
 net-p2p/pybitmessage:opencl - Uses dev-python/pyopencl for GPU acceleration.
 net-p2p/qbittorrent:webui - Enable the Web UI
+net-p2p/resilio-sync:pax_kernel - Use paxctl to mark binaries
 net-p2p/retroshare:cli - Enables the CLI version of RetroShare
 net-p2p/retroshare:feedreader - Enables the Feedreader plugin
 net-p2p/retroshare:gnome-keyring - Enables potentially insecure autologin capability via Gnome Keyring
@@ -7836,6 +7836,7 @@ sys-apps/policycoreutils:audit - Enable support for sys-process/audit and use th
 sys-apps/portage:epydoc - Build html API documentation with epydoc.
 sys-apps/portage:ipc - Use inter-process communication between portage and running ebuilds.
 sys-apps/portage:native-extensions - Compiles native "C" extensions (speedups, instead of using python backup code). Currently includes libc-locales. This should only be temporarily disabled for some bootstrapping operations. Cross-compilation is not supported.
+sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of Gentoo repository rsync checkouts using app-portage/gemato.
 sys-apps/portage:xattr - Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.
 sys-apps/proot:care - Build dynamic CARE binary (more info - http://reproducible.io/)
 sys-apps/pyrenamer:music - Enable support for renaming music
@@ -7880,7 +7881,6 @@ sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility qu
 sys-apps/systemd:xkb - Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
 sys-apps/timer_entropyd:debug - Enable printf debugging and logging to the syslog at DEBUG level
-sys-apps/tuxonice-userui:fbsplash - Add support for framebuffer splash
 sys-apps/usb_modeswitch:jimtcl - Use dev-lang/jimtcl instead of dev-lang/tcl for smaller memory footprint
 sys-apps/usermode-utilities:fuse - Build tools (currently umlmount) needing fuse
 sys-apps/util-linux:caps - build setpriv helper (run programs with diff capabilities)
@@ -8218,7 +8218,6 @@ sys-freebsd/freebsd-sbin:ipfilter - Build tools to administer the ipfilter firew
 sys-freebsd/freebsd-sbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
 sys-freebsd/freebsd-sbin:pf - Build tools to administer the PF firewall.
 sys-freebsd/freebsd-sbin:zfs - Enable ZFS support.
-sys-freebsd/freebsd-share:isdn - Enable ISDN support
 sys-freebsd/freebsd-share:zfs - Enable ZFS support.
 sys-freebsd/freebsd-sources:build-kernel - Build and install a kernel (recommended).
 sys-freebsd/freebsd-sources:dtrace - Enable DTrace support.
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 7a9e53361787..75e95725558c 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index 019fdc0f11a5..bda3226cc83a 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1,5 +1,3 @@
-DIST speedcrunch-0.11.tar.gz 1516510 BLAKE2B 31c1b0f4f34357a66ad16efe67cc444f1b6eb49b2438b78729bd00148e4b0298a6f5f731b7e2fd9b1825bddba3b37b75a57f42edb0cec2499428f1d0141c17dc SHA512 19d7d5b80709063768abf7076a95e25b7c16956dd20ab181d3876b87bc26e7d8c18820a7ca23af22ea3b52d67de12238b7a106e575415ee755c8c204f732eaf1
 DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
-EBUILD speedcrunch-0.11-r2.ebuild 1237 BLAKE2B ed7636c3f580dc62f668de18ef6a5698c818fc6b1b25d83661f535671554bf9b5b150dd662bef2fa635e4b452c86831b0c1e3bc8da44cdd7bcdc4458868be0c7 SHA512 9264fd5c139e298bebb3687660d89924d8a736428acf3034ab7d2f0931d6af9d1a71032837c6426abb522f536ef0129008352d226cc321b5fd36340eda227b65
-EBUILD speedcrunch-0.12.0.ebuild 1487 BLAKE2B fa1ac3560da2fcdd30f88e26cb54206642d6c74f9537b1bf0d2e36df166bb278b3ffb6f5375d105914f6f4052059f05e57aec23a6c0b2bad4cc6cbc109b34e06 SHA512 7679b504c3f1ddd189c6fabbc4f8a891d4c7a06edcc8fd72993fd01575a262b84d84a8014d5f9456b005001a02954631f8a9751803669859600a8b9e895e2410
+EBUILD speedcrunch-0.12.0.ebuild 1486 BLAKE2B adae1ed5b6b0a160ca6bceb17b099718f39d56f45414df63becf11016f3f3b57b5bb01e57708b13a0ede56c90cf12cefd8703b81e147177741638503dc162f7c SHA512 ed2145534753a76c25ec20dc4b84266b89c0c783448881793ca457481eda0465f875a37789ca0300191b0c1c54f4fb213c93c6ae577d17a82a4e2e83420427e3
 MISC metadata.xml 502 BLAKE2B 8e0471f47af5fe59b74db725b30c6a3b1625b73faf7cfdf2db68b44ce63623d579935275bf28c3e01b48c17a0ed3792cbf25743845e16c4e4efd769196bf41a3 SHA512 9113af02758f4a55914c9492ba455cd66dbb61d0f0d53bf16acd7f7d26bbe3a98b0d9b4372845ea71c5a3ccf02f2b8b8ef9896616cfa3ee63d9534d4293b3f4e
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.11-r2.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.11-r2.ebuild
deleted file mode 100644
index b0fd6b32ac10..000000000000
--- a/sci-calculators/speedcrunch/speedcrunch-0.11-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="ar_JO ca_ES cs_CZ de_DE en_GB en_US es_AR es_ES et_EE eu_ES fi_FI
-	fr_FR he_IL hu_HU id_ID it_IT ja_JP ko_KR lv_LV nb_NO nl_NL pl_PL pt_BR
-	pt_PT ro_RO ru_RU sv_SE tr_TR uz_UZ vi_VN zh_CN"
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Fast and usable calculator for power users"
-HOMEPAGE="http://speedcrunch.org/"
-SRC_URI="https://github.com/${PN}/SpeedCrunch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/SpeedCrunch-${PV}/src"
-
-src_prepare() {
-	my_rm_loc() {
-		rm "resources/locale/${1}.qm" || die
-		sed -i resources/speedcrunch.qrc \
-			-e "s|<file>locale/${1}.qm</file>||" || die
-		sed -i gui/mainwindow.cpp \
-			-e "s|map.insert(QString::fromUtf8(\".*, QLatin1String(\"${1}\"));||" || die
-	}
-
-	l10n_find_plocales_changes 'resources/locale' '' '.qm'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd .. || die
-	doicon -s scalable gfx/speedcrunch.svg
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
index 0174aa0d6936..da111d97a3b6 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.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
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc ${PLOCALES[@]/#/l10n_}"
 
 DEPEND="
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index a9f654c54bdc..d9fb097ca7a9 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index c9c971378cc8..dc97a37cbb74 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -5,6 +5,6 @@ AUX klayout-0.25-qt59.patch 4596 BLAKE2B a9b4f0b0da71aaea7af9c09c73ae854a784ff4b
 DIST klayout-0.24.10.tar.gz 11262007 BLAKE2B 85e8d325a56672e6ba328f5ebf793f3c977542ed857621e504983a77e7762d795bbde0f572fb0017328bdb5c11e453f0cd9decedf3629f8ff0f2a6a25daf28c2 SHA512 0043b91e2dae9321299c217697c93af27bc7d795209bdf95248eee3690b97728854f9f82cc95f77f05a2cfbcae6a716ae594fe2485e04ed0a3f5d950abc0a31b
 DIST klayout-0.25.tar.gz 16461165 BLAKE2B 321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd SHA512 0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
 EBUILD klayout-0.24.10.ebuild 1548 BLAKE2B cdee87248344f2405b9d3679765857758b0ceabde12a143f6aaf39049575b90615e23915188f2ccad463633eb7527351378c5a485488202ba5d08070f6e6e358 SHA512 f22b8010cf6ff28217fa218ab24c6e44dd41e1828eb098fa8522e28e0d492528234cfd40468d1355b5c29af41962ac692c09a8b3393b99b3c0f667480914194f
-EBUILD klayout-0.25.ebuild 1590 BLAKE2B 54283a7ab2b7234331a6f3afbcee3a2fe79ac8b0533aa5748da693186740b5f00519df4340166a92bce407e683f0ae82ac13ef95eb4f5af9b4dece8323bfdd3e SHA512 8ae34b3b512346a845dfd2f81268fcfc2be97ccfdc87dbfcb5be4fdc51773cbd029ce5c3c444c3c7a968c428ffffca871660168f481bbe7356b9911808a8209e
-EBUILD klayout-9999.ebuild 1515 BLAKE2B 5cb8f131cc90ba87e2f4e02a65e27682fc82b659c3e0ba2c5d4504c2ea9de49ab4f829a66c3b52ef81474d4ddd9b04087d0685f7ff13de690fcf561fc2f9b01c SHA512 1b1279dfb06f8e0c01d13c6d050023339ef6de6ed4872f8f306d2bfc7794a040440f4d905f0e88ac62afd210933d57646bc705129a977b3d768d2db3defd67c4
+EBUILD klayout-0.25-r2.ebuild 1728 BLAKE2B 4a91a90c8baf1e63839210b36b6877345049c8155f990fc2606db67994dc49f218bd28dac4c2ff64dafe02543b8e7bb94ab1d3059c9bcb83402cb64f1f9eb185 SHA512 0c9cd444031b54d481950937f1d28429a8d7fdf4820fe09997ab689a09db9024168adf6ab41e1fa88ac2b0ee6af422ee0b2305a3a4a51dc66dffe907790f446e
+EBUILD klayout-9999.ebuild 1653 BLAKE2B dbfe6ee91bc03aeca6a32a626e053be5229febfab4dee2971d70ae330aef6c21854f9a4f9b5b7390ab7cce2187c4488823aee175d5cea2b89fd3dddc07bca380 SHA512 7efcc112a0f8a383deb85b81f80764d6b8796225090ff9cf3d335edbd7234cbb8e6b7474c42f9be119fb3c712a6a3ba49d289648236de0392c242fb8174fd0a8
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.25-r2.ebuild b/sci-electronics/klayout/klayout-0.25-r2.ebuild
new file mode 100644
index 000000000000..7a4e27c201ea
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.25-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby23"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="http://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt58.patch"
+	"${FILESDIR}/${P}-qt59.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	dobin *
+}
diff --git a/sci-electronics/klayout/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild
deleted file mode 100644
index a819784c86aa..000000000000
--- a/sci-electronics/klayout/klayout-0.25.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby22"
-# note: define maximally ONE implementation here
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit eutils multilib toolchain-funcs python-single-r1 ruby-ng
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
-else
-	SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
-HOMEPAGE="http://www.klayout.de/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	${PYTHON_DEPS}
-	$(ruby_implementations_depend)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt58.patch"
-	"${FILESDIR}/${P}-qt59.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-each_ruby_configure() {
-	tc-export CC CXX AR LD RANLIB
-	export CFLAGS CXXFLAGS
-	./build.sh \
-		-expert \
-		-dry-run \
-		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
-		-ruby "${RUBY}" \
-		-python "${PYTHON}" \
-		-build . \
-		-bin "${T}/bin" \
-		-rpath "/usr/$(get_libdir)/klayout" \
-		-option "${MAKEOPTS}" \
-		-with-qtbinding \
-		-without-64bit-coord \
-		-qt5 || die "Configuration failed"
-}
-
-each_ruby_compile() {
-	emake all
-}
-
-each_ruby_install() {
-	emake install
-
-	cd "${T}/bin" || die
-
-	dodir "/usr/$(get_libdir)/klayout"
-	mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
-
-	dobin *
-}
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index ad17c9f8d608..ccd9abcc8eef 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-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
@@ -9,7 +9,7 @@ USE_RUBY="ruby22"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils multilib toolchain-funcs python-single-r1 ruby-ng
+inherit toolchain-funcs python-single-r1 ruby-ng
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
@@ -30,7 +30,14 @@ RDEPEND="
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
 	sys-libs/zlib
 	${PYTHON_DEPS}
 	$(ruby_implementations_depend)
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 15cc170c3300..ac3be53eb17f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest
index 30329518411d..cf36a345298e 100644
--- a/sci-libs/chemkit/Manifest
+++ b/sci-libs/chemkit/Manifest
@@ -1,5 +1,5 @@
 AUX chemkit-0.1-multilib.patch 4694 BLAKE2B f52836ec887b9673c8eabac6ca4fb008aa23def355419f02704605438de44457f2a017a56a7fdd3ce387df08e5b57a0352052d2b88ff0e051a6cf47a192ffd1e SHA512 dedde9e5db14f088e5a70ebfcd9f46b6fbb2d60b1800a61ece1f7afef24caac502f129573823807caec050ba1515ad402a3615953b903a239c5287a5b96aa8b8
 AUX chemkit-0.1-unbundle.patch 6103 BLAKE2B 9ee0f121fec938a528abb837ab386fec62a8576b5c7d123538ce95604953f4f30d0b285b27a153ef98629f053954324f7c384329fe3ca6873f2d18700e914ff8 SHA512 9edd39008763b56eb7697562536c4c4d476880a414ae1a305d1af64cee04e4ccb82585cfd15d2f7608b5200e39863a9a97c2a152110b28e501fbd055737ce015
 DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011
-EBUILD chemkit-0.1-r2.ebuild 2000 BLAKE2B d6290e3de5dc1118bf89065d820cbfc1d44514e7aaf679d48d61beac4ef82c4a81cac93d34e6532601ed9f82572653d0524f136a6083cbdf152b64e87df75772 SHA512 14236546b1e91a844c32c0085d262962503c4ab5388ea0de6a3124920ee2975d1e5930509969d1ac1678acdeda6a35849666dc6b7e26babfeac2ce86a38de87a
+EBUILD chemkit-0.1-r2.ebuild 1901 BLAKE2B 2ffeacbbe0d24820327b0f19b3e876da35c654ab029ccafd0aaba9cea23c4c2489c5c584643f4383de7fa298299dc9d19ecdf2f9b90d19b130e2c78aed808891 SHA512 261ec048b4e31e7f73a82277bf3cac0721e92f83a849973dad0f74a6fd388adcaaa29dbbb5bd3f9ea45070d00cd7e3d47a87647ec09186f54e94e7a57b7ab4ef
 MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1
diff --git a/sci-libs/chemkit/chemkit-0.1-r2.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
index c1cb99bc9455..987c32161c18 100644
--- a/sci-libs/chemkit/chemkit-0.1-r2.ebuild
+++ b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
@@ -14,10 +14,9 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD PSF-2.2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples python qt4 test"
+IUSE="examples python test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python qt4 )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-cpp/eigen:3
@@ -32,14 +31,11 @@ RDEPEND="
 		x11-libs/libXext
 	)
 	python? ( ${PYTHON_DEPS} )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
 "
 DEPEND="${RDEPEND}"
 
+RESTRICT="test" # requires disabled Qt4
+
 S="${WORKDIR}"/${PN}
 
 PATCHES=(
@@ -63,12 +59,12 @@ src_configure() {
 		-DCHEMKIT_BUILD_EXAMPLES=$(usex examples)
 		-DCHEMKIT_BUILD_DEMOS=$(usex examples)
 		-DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python)
-		-DCHEMKIT_BUILD_APPS=$(usex qt4)
-		-DCHEMKIT_BUILD_PLUGIN_BABEL=$(usex qt4)
-		-DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=$(usex qt4)
-		-DCHEMKIT_WITH_GRAPHICS=$(usex qt4)
-		-DCHEMKIT_WITH_GUI=$(usex qt4)
-		-DCHEMKIT_WITH_WEB=$(usex qt4)
+		-DCHEMKIT_BUILD_APPS=OFF
+		-DCHEMKIT_BUILD_PLUGIN_BABEL=OFF
+		-DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=OFF
+		-DCHEMKIT_WITH_GRAPHICS=OFF
+		-DCHEMKIT_WITH_GUI=OFF
+		-DCHEMKIT_WITH_WEB=OFF
 		-DCHEMKIT_BUILD_TESTS=$(usex test)
 		-DUSE_SYSTEM_INCHI=ON
 		-DUSE_SYSTEM_JSONCPP=OFF
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 57ca02e02712..834aa9d4ad59 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,12 +1,8 @@
-AUX plplot-5.11.0-multiarch.patch 1937 BLAKE2B ebdb27cbb46103e0af2554d05a671a8443febb926842a7ee5967a9dd24d7de9d64a4bcda0ed481c60a866fa8d80231fb71eb08b6ca9e065064b5ee184353c742 SHA512 505fbd1d1c6700ba7d16795e262a930f58b77c3565ca844a3cca1313f004057c1432ad60132d3844d0f04f959c005236b9ebd10f3615d4368e4fa968141d147d
-AUX plplot-5.11.0-ocaml.patch 2736 BLAKE2B 199e4892541a62d79fcc743e38eb867da82592eb648551832e1ed3232c0941d94648e80694ed2a069622f5a404ca3064a51a1af218f9c583c42cdbfb99a6ae1d SHA512 3d41fec8b2c2a07771fefab7c0f9199f1b31376d71d0c0c8f7d3ddedea3889eebfd9d44432b8f22e6d6dca233d6011d0b1645b193d319eb953b18543ec212412
 AUX plplot-5.11.0-octave.patch 669 BLAKE2B 43361aa8c31f6b743b1a6d20b27701655ab4db475d330d5cde62e9f9774555d94ba8f26f2f5621e3625a7f86dce55d369ec387c8dcf5946ced4208ffe7463d9a SHA512 7ddd8105aa8ba684e423cac3657f2d1bc753b86eb2054edd2ff9497ec235354134da4ecfff5d26e26f01efced2f630f0e2488d114ce7dc887e7761f5ee060814
 AUX plplot-5.12.0-java-install-path.patch 393 BLAKE2B bd6860e694b5132a349699e25b79951308001b04b49d4ac1f070cd2ce51dc1e6ea76a7721e925c123669beb981ba756c3ae4e29bc0dee6f85f4e44fb61ac5f91 SHA512 0e87a67fd6821be07a56b68d8f9c23e4c25efea4fc9b56a2cec06d804202946917abd58271c71674d6b3b3ecda688be44920649095da3b125fe3a119fd22f1dd
 AUX plplot-5.12.0-multiarch.patch 1309 BLAKE2B 8bce8e12a82b361989e5b8a7c11c25a642fc2d62af37b74764db675ed6d91bc4b011318633b42a942abd0b59db70658f1cb28bf4873722095a998d5e63a00d51 SHA512 4fe0992ccc8f7f9dcab956c1ec06a647e4a7bab67c0f2a78c4e004491a5d8685240dadfd2c248e4fd6a58747a5da67ab8c8dc35c1a0de5a85431da431a00607f
 AUX plplot-5.12.0-ocaml-remove-rpath.patch 2012 BLAKE2B 47bbcc2c7e49b50f045c786ae3d5a799b45ab734e24e815168d9a6364fe09fc63869b57dd0a12b5c70ef5b69444ad6dba31bcc123faada6df9ac0af8cb0984d5 SHA512 6c40de6ab578ab8c347f12335b8a91976e5e4d8eee039512048039507c5e2b4a75b5bbfdde5ae347d2ccb167679b6574460d3f737ad37ee8902c7bcdc96af05d
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
-DIST plplot-5.11.1.tar.gz 15445404 BLAKE2B ea3d0cac2d47e9028f604c5665842aae95dd058c0b522f477e2a4397f686f1dd01321660c2b2d259771dbc30ce758721bc8db085b29f35d170ea8b89b539aa91 SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd
 DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
-EBUILD plplot-5.11.1-r1.ebuild 6610 BLAKE2B 3ada422069f80f73b43f9002740b58076c331d0762506e76389c27d6d8505c9275c71438494a919b53ed201387607b893e6bd023f1220eacc0148e6b4224566e SHA512 bbf20a0bdc49f23b3fcf4e58b8869ae701b8bb785b9ba31380d8ce7d8cf233e7eabecb78d5ae77dcc7158b1b6359fb5c54a2e0ae52dc440da1a4bee081f7a187
 EBUILD plplot-5.12.0-r1.ebuild 7230 BLAKE2B e2b765ed474958cb34f2f92a26c634ed70a728081a22d0886b89e8aa43aff43499e9c8c1ffc0588fc6c3e388e270715273d7d809a1aca522774b33524b792aaa SHA512 0ac1a50359de3c0c5b6fedcf9ee9ab0393a5e1bf38dac7ae02cf00c8555d3d5d3ee3e546b0ed7d21e079b011629c7af4fed423b62494b2bd6c6aaf26a00a94a7
 MISC metadata.xml 1487 BLAKE2B 33e45227a6094c8b7e8602081e267b5aad51cf90638269b544feb308f95e32757ae5784edc14cda97d8d0e4d5e209e9ba3528f8f763adada95ceb8c61d11fdc8 SHA512 ebace14f95cf9d6e3c71b8a4fa3ed411052183e2fa67197173f99045e22503b0e80dac6762ddb38fa97b7e36b67693b9c7352cba31d399d0b819d8da9cbf27ea
diff --git a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch
deleted file mode 100644
index cb6f7d01cf16..000000000000
--- a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch
+++ /dev/null
@@ -1,60 +0,0 @@
- examples/c++/Makefile.examples.in | 3 ---
- examples/c/Makefile.examples.in   | 2 --
- examples/f95/Makefile.examples.in | 2 --
- examples/tk/Makefile.examples.in  | 2 --
- 4 files changed, 9 deletions(-)
-
-diff --git a/examples/c++/Makefile.examples.in b/examples/c++/Makefile.examples.in
-index bb067e7..176706b 100644
---- a/examples/c++/Makefile.examples.in
-+++ b/examples/c++/Makefile.examples.in
-@@ -25,10 +25,7 @@ SHELL = @SH_EXECUTABLE@
- CXX = @CXX@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
--@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
- 
- @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
- @wxwidgets_true@	wxPLplotDemo$(EXEEXT)
-diff --git a/examples/c/Makefile.examples.in b/examples/c/Makefile.examples.in
-index bc47762..56d1f49 100644
---- a/examples/c/Makefile.examples.in
-+++ b/examples/c/Makefile.examples.in
-@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@
- CC = @CC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- 
- @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
- @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
-diff --git a/examples/f95/Makefile.examples.in b/examples/f95/Makefile.examples.in
-index 29631b7..32823d6 100644
---- a/examples/f95/Makefile.examples.in
-+++ b/examples/f95/Makefile.examples.in
-@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@
- F95 = @FC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- 
- EXECUTABLES_list = \
- 		 x00f$(EXEEXT) \
-diff --git a/examples/tk/Makefile.examples.in b/examples/tk/Makefile.examples.in
-index 98407fa..c15c94a 100644
---- a/examples/tk/Makefile.examples.in
-+++ b/examples/tk/Makefile.examples.in
-@@ -24,8 +24,6 @@ SHELL = @SH_EXECUTABLE@
- CC = @CC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
- 
- EXECUTABLES_list = xtk01$(EXEEXT)
- # Second and fourth examples depend on itk.
diff --git a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch
deleted file mode 100644
index 32841825f0de..000000000000
--- a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- bindings/ocaml/CMakeLists.txt         | 4 ++--
- bindings/ocaml/plcairo/CMakeLists.txt | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt
-index 93d073a..d31a64f 100644
---- a/bindings/ocaml/CMakeLists.txt
-+++ b/bindings/ocaml/CMakeLists.txt
-@@ -154,11 +154,11 @@ if(ENABLE_ocaml)
-     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
-     )
- 
--  # ocamlc -a -custom builds a *.cma library from *.cmo
-+  # ocamlc -a builds a *.cma library from *.cmo
-   add_custom_command(
-     OUTPUT
-     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
--    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
-+    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
-     DEPENDS
-     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
-     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
-diff --git a/bindings/ocaml/plcairo/CMakeLists.txt b/bindings/ocaml/plcairo/CMakeLists.txt
-index c4b4a41..ce1dc92 100644
---- a/bindings/ocaml/plcairo/CMakeLists.txt
-+++ b/bindings/ocaml/plcairo/CMakeLists.txt
-@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
-     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
-     )
- 
--  # ocamlc -a -custom builds a *.cma library from *.cmo
-+  # ocamlc -a builds a *.cma library from *.cmo
-   add_custom_command(
-     OUTPUT
-     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
--    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
-+    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
-     DEPENDS
-     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
deleted file mode 100644
index a46a090713e9..000000000000
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python2_7 )
-VIRTUALX_REQUIRED=test
-
-inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
-	virtualx wxwidgets java-pkg-opt-2 multilib
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/12"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
-	ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
-	threads tk truetype wxwidgets X"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:0=[svg?,X?] )
-	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	java? ( >=virtual/jre-1.5:* )
-	latex? (
-		app-text/ghostscript-gpl
-		virtual/latex-base
-	)
-	lua? ( dev-lang/lua:0= )
-	ocaml? (
-		dev-lang/ocaml
-		dev-ml/camlidl
-		cairo? ( dev-ml/cairo-ocaml[gtk] )
-	)
-	octave? ( sci-mathematics/octave:0= )
-	pdf? ( media-libs/libharu:0= )
-	pdl? (
-		dev-perl/PDL
-		dev-perl/XML-DOM
-	)
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-	)
-	qhull? ( media-libs/qhull:0= )
-	qt4? (
-		dev-qt/qtgui:4=
-		dev-qt/qtsvg:4=
-	)
-	shapefile? ( sci-libs/shapelib:0= )
-	tcl? (
-		dev-lang/tcl:0=
-		dev-tcltk/itcl:0=
-		tk? (
-			dev-lang/tk:0=
-			dev-tcltk/itk
-		)
-	)
-	truetype? (
-		media-fonts/freefont
-		media-libs/lasi:0=
-		gd? ( media-libs/gd:2=[truetype] )
-	)
-	wxwidgets? (
-		x11-libs/wxGTK:${WX_GTK_VER}=[X]
-		x11-libs/agg:0=[truetype?]
-	)
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXau:0=
-		x11-libs/libXdmcp:0=
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? (
-		>=virtual/jdk-1.5
-		dev-lang/swig
-	)
-	ocaml? ( dev-ml/findlib )
-	octave? ( >=dev-lang/swig-2.0.12 )
-	python? ( dev-lang/swig )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.6-python.patch
-	"${FILESDIR}"/${PN}-5.11.0-ocaml.patch
-	"${FILESDIR}"/${PN}-5.11.0-octave.patch
-	"${FILESDIR}"/${PN}-5.11.0-multiarch.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
-	cmake-utils_src_prepare
-	# avoid installing license
-	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
-	# prexify hard-coded /usr/include in cmake modules
-	sed -i \
-		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
-		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
-		cmake/modules/*.cmake || die
-	# change default install directories for doc and examples
-	sed -i \
-		-e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
-		$(find "${S}" -name CMakeLists.txt) || die
-	sed -i \
-		-e 's:${VERSION}::g' \
-		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
-		cmake/modules/instdirs.cmake || die
-	java-utils-2_src_prepare
-}
-
-src_configure() {
-	# don't build doc, it brings a whole lot of horrible dependencies
-
-	# -DPLPLOT_USE_QT5=ON
-	# Not recomended by upstream, check next release
-
-	local mycmakeargs=(
-		-DPLD_plmeta=ON
-		-DPLD_cgm=ON
-		-DTEST_DYNDRIVERS=OFF
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_ada=OFF
-		-DENABLE_d=OFF
-		-DBUILD_DVI=OFF
-		-DDOX_DOC=OFF
-		-DBUILD_DOC=OFF
-		-DUSE_RPATH=OFF
-		-DPLD_wxpng=OFF
-		$(cmake-utils_use doc PREBUILT_DOC)
-		$(cmake-utils_use_build test)
-		$(cmake-utils_use_has python NUMPY)
-		$(cmake-utils_use_has shapefile SHAPELIB)
-		$(cmake-utils_use_with truetype FREETYPE)
-		$(cmake-utils_use_enable cxx)
-		$(cmake-utils_use_enable dynamic DYNDRIVERS)
-		$(cmake-utils_use_enable fortran f77)
-		$(cmake-utils_use_enable java)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable ocaml)
-		$(cmake-utils_use_enable octave)
-		$(cmake-utils_use_enable pdl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable qt4 qt)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable tcl itcl)
-		$(cmake-utils_use_enable tk)
-		$(cmake-utils_use_enable tk itk)
-		$(cmake-utils_use_enable wxwidgets)
-		$(cmake-utils_use threads PL_HAVE_PTHREAD)
-		$(cmake-utils_use qhull PL_HAVE_QHULL)
-		$(cmake-utils_use qt4 PLD_aqt)
-		$(cmake-utils_use qt4 PLD_bmpqt)
-		$(cmake-utils_use qt4 PLD_epsqt)
-		$(cmake-utils_use qt4 PLD_extqt)
-		$(cmake-utils_use qt4 PLD_jpgqt)
-		$(cmake-utils_use qt4 PLD_memqt)
-		$(cmake-utils_use qt4 PLD_pdfqt)
-		$(cmake-utils_use qt4 PLD_pngqt)
-		$(cmake-utils_use qt4 PLD_ppmqt)
-		$(cmake-utils_use qt4 PLD_svgqt)
-		$(cmake-utils_use qt4 PLD_qtwidget)
-		$(cmake-utils_use qt4 PLD_tiffqt)
-		$(cmake-utils_use cairo PLD_extcairo)
-		$(cmake-utils_use cairo PLD_memcairo)
-		$(cmake-utils_use cairo PLD_pdfcairo)
-		$(cmake-utils_use cairo PLD_pngcairo)
-		$(cmake-utils_use cairo PLD_pscairo)
-		$(cmake-utils_use cairo PLD_svgcairo)
-		$(cmake-utils_use cairo PLD_wincairo)
-		$(cmake-utils_use cairo PLD_xcairo)
-		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
-		$(cmake-utils_use tk PLD_ntk)
-		$(cmake-utils_use tk PLD_tk)
-		$(cmake-utils_use tk PLD_tkwin)
-		$(cmake-utils_use gd PLD_gif)
-		$(cmake-utils_use gd PLD_jpeg)
-		$(cmake-utils_use gd PLD_png)
-		$(cmake-utils_use pdf PLD_pdf)
-		$(cmake-utils_use latex PLD_ps)
-		$(cmake-utils_use latex PLD_pstex)
-		$(cmake-utils_use truetype PLD_psttf)
-		$(cmake-utils_use svg PLD_svg)
-		$(cmake-utils_use wxwidgets PLD_wxwidgets)
-		$(cmake-utils_use X PLD_xwin)
-	)
-
-	[[ $(tc-getFC) != *g77 ]] && \
-		mycmakeargs+=(
-		$(cmake-utils_use_enable fortran f95)
-	)
-
-	use truetype && mycmakeargs+=(
-		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
-	)
-	use shapefile && mycmakeargs+=(
-		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
-	)
-	use ocaml && mycmakeargs+=(
-		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
-	)
-	use python && mycmakeargs+=(
-		$(cmake-utils_use_enable qt4 pyqt4)
-	)
-
-	cmake-utils_src_configure
-
-	# clean up bloated pkg-config files (help linking properly on prefix)
-	sed -i \
-		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
-		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
-		-e "s:${LDFLAGS}::g" \
-		"${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-	if use java; then
-		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_regso "${ED}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
-	fi
-}
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 32a09c12fa0c..5d0679d11007 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,10 +1,12 @@
 AUX silo-4.10.2-mpiposix.patch 1902 BLAKE2B c26f6681bbab0065f046414c406bcfac3cc1a993729bb67e1178e67261201afbaad3f0469b8859d5c34261ea00f4be4f131a9db9f981dbbe18f137b53dc9a435 SHA512 626a7b8084a936b667f704a1a35edb8f6ce9ab42b58857024b87f280364d99b452e3f149b577e45898eb08523f0741eecc1c4ad20a46018dae377ca17adcf97a
-AUX silo-4.10.2-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966
+AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632a05ef0a3a5d7b9cec2c9c7186c922d0630bf6600830c53263218b90fe66ab0156cdf143a4df5577b200f5ab SHA512 a6a22b7ef04179b8d101d38b72244be6c59d4d23bb8dd0855ba5f3267a181e2b175806dbfa6c1184bd5f3542e842701f096a389e6cae6df5d26209319d96316f
+AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 AUX silo-4.9.1-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966
 AUX silo-4.9.1-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
 DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906 SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83
+EBUILD silo-4.10.2-r1.ebuild 1179 BLAKE2B e785939ebf112b33777b56f99abfddfe68d042dd5e149dffc198e91378a8af86e3c647d3f0e5de707b0ff90ef4e425cbe4aed2b56ab4575d245f8f149280c056 SHA512 641e8e2f98ce7d916b565014760ca21dd43447080b8c47e186575414820868d7bba91ef7c951f57af35a7cee4e5ea6ea7f5d4f4db60e1dab6bd63a8ffb7bafb8
 EBUILD silo-4.10.2.ebuild 1099 BLAKE2B aa5bbf3d5f0451a5a8e711f594f315997247b4415e43845f8b94259979c1c4ec129de72184096bf22de0ab0862672fe91c15d55e100bf3695a6676e08c201a0d SHA512 1cd5333c6f337d876347b8f946365fbb9ccc1e4aec90ed00399eff2b2021ba60231a59db17312d993e25d99c28665511866d03fe4f6990652022e168a72143d4
 EBUILD silo-4.9.1.ebuild 989 BLAKE2B 68f2b46491e44c6ab2f60c3756195d316ad3ffeac91071338ad607e8daa32f5c36074880e5630ba5949c15435fe6678e8251332cf9643e6724c8a2456fa32978 SHA512 55f52bab2e917ff99fdfed8e2943be770981d064a5a29c7406d097b6667c6b99508a602a11c6a6a199e82362503791aee577f3fef794eb37809576eafe329c1f
 MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e
diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch b/sci-libs/silo/files/silo-4.10.2-qt5.patch
new file mode 100644
index 000000000000..1e1fe8803a37
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-qt5.patch
@@ -0,0 +1,44 @@
+--- tools/silex/SiloFile.h.orig	2018-01-24 11:01:23.354705068 +0100
++++ tools/silex/SiloFile.h	2018-01-24 11:01:34.843705761 +0100
+@@ -61,6 +61,8 @@
+ #include <vector>
+ using std::vector;
+ 
++#define toAscii toLatin1
++
+ // ****************************************************************************
+ //  Class:  SiloDir
+ //
+--- tools/silex/main.cpp.orig	2018-01-24 11:02:21.201708556 +0100
++++ tools/silex/main.cpp	2018-01-24 11:02:34.146709336 +0100
+@@ -58,7 +58,7 @@
+ #include <cstdlib>
+ 
+ #ifndef Q_WS_MACX
+-#include "qwindowsstyle.h"
++//#include "qwindowsstyle.h"
+ #endif
+ #include "qfiledialog.h"
+ #include "qstring.h"
+@@ -91,7 +91,7 @@
+     QApplication::setColorSpec(QApplication::ManyColor);
+     QApplication a(argc, argv);
+ #ifndef Q_WS_MACX
+-    a.setStyle(new QWindowsStyle);
++//    a.setStyle(new QWindowsStyle);
+ #endif
+     Explorer *w = 0;
+     if (argc > 1)
+--- tools/silex/SiloView.cpp.orig	2018-01-24 11:03:13.775711725 +0100
++++ tools/silex/SiloView.cpp	2018-01-24 11:03:30.032712706 +0100
+@@ -109,8 +109,8 @@
+         dirTreeView->OpenRootDir();
+         dirView->Set(silo->root);
+ 
+-        dirTreeView->header()->setResizeMode(QHeaderView::Interactive);
+-        dirView->header()->setResizeMode(QHeaderView::Interactive);
++        dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive);
++        dirView->header()->setSectionResizeMode(QHeaderView::Interactive);
+     }
+ }
+ 
diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
index e8fc4284cac0..ecd5297c281f 100644
--- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
+++ b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
@@ -1,66 +1,78 @@
-diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
---- silo-4.9.1-old/configure	2014-01-18 23:19:15.755030306 +0100
-+++ silo-4.9.1-new/configure	2014-01-18 23:20:52.595031159 +0100
-@@ -27503,7 +27503,7 @@
+--- configure.orig	2018-01-24 10:50:10.458664501 +0100
++++ configure	2018-01-24 10:50:42.967666461 +0100
+@@ -27541,7 +27541,7 @@
          ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                       sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
        fi
 -      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
      else
        # Use cached value or do search, starting with suggestions from
        # the command line
-@@ -27577,7 +27577,7 @@
+@@ -27615,7 +27615,7 @@
        ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                     sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
      fi
 -    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
    else
      # There is no valid definition for $QTDIR as Trolltech likes to see it
      ax_qt_dir=
-@@ -27589,7 +27589,7 @@
+@@ -27627,7 +27627,7 @@
          ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                       sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
        fi
 -      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
      else
        # Normally, when there is no traditional Trolltech installation,
        # the library is installed in a place where the linker finds it
-@@ -27607,7 +27607,7 @@
+@@ -27645,10 +27645,10 @@
        # See if we find the library without any special options.
        # Don't add top $LIBS permanently yet
        ax_save_LIBS="$LIBS"
 -      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
        ax_qt_LIBS="$LIBS"
        ax_save_CXXFLAGS="$CXXFLAGS"
-       CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-@@ -27668,7 +27668,7 @@
+-      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27706,7 +27706,7 @@
          # That did not work. Try the multi-threaded version
          echo "Non-critical error, please neglect the above." >&5
          ax_qt_lib=qt-mt
 -        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27726,7 +27726,7 @@
+@@ -27764,7 +27764,7 @@
            # That did not work. Try the OpenGL version
            echo "Non-critical error, please neglect the above." >&5
            ax_qt_lib=qt-gl
 -          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
            cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27809,7 +27809,7 @@
+@@ -27847,7 +27847,7 @@
                fi
              done
              # Try with that one
 -            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
              cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -27955,7 +27955,7 @@
+     fi # all $ax_qt_* are set
+   fi   # $have_qt reflects the system status
+   if test x"$have_qt" = xyes; then
+-    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
+     if test x"$ax_qt_lib" = xqt-mt; then
+         QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+     fi
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
new file mode 100644
index 000000000000..b8c03cde0cde
--- /dev/null
+++ b/sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fortran-2
+
+DESCRIPTION="A mesh and field I/O library and scientific database"
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
+SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN}/${P}/${P}.tar.gz"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="hdf5 +silex static-libs qt5 test"
+
+REQUIRED_USE="silex? ( qt5 )"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5 )
+	qt5? ( dev-qt/qtgui:5 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qtlibs.patch"
+	epatch "${FILESDIR}/${P}-qt5.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
+	epatch "${FILESDIR}/${P}-mpiposix.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-install-lite-headers \
+		--enable-shared \
+		$(use_enable silex silex ) \
+		$(use_enable static-libs static ) \
+		$(use_with qt5 Qt-lib-dir "${EPREFIX}"/usr/$(get_libdir) ) \
+		$(use_with qt5 Qt-include-dir "${EPREFIX}"/usr/include/qt5 ) \
+		$(use_with qt5 Qt-bin-dir "${EPREFIX}"/usr/$(get_libdir)/qt5/bin ) \
+		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/$(get_libdir) )
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index ecbefaa7071b..74162b392cc3 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -10,12 +10,17 @@ AUX vtk-6.1.0-web.patch 776 BLAKE2B e92d3abb96161f0d955c3c653ce67a2427538fcabcb3
 AUX vtk-7.0.0-glext.patch 393 BLAKE2B 416612e5a587378287d99c447a30703c66aabd8ad07cea83a984bd7b5feaa0f619e152d70a4c514b9e31a85a9e57693884918047e25609d5cca394e623929045 SHA512 67fcdbf128ea3bc32dbc5ea8de350fcb3e8447a90a7cb23501658d624703623c1d67c31e8783607fa995e8ac666075cbf00417c702a9a4a357e933b8e2153d64
 DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
 DIST VTK-7.1.0.tar.gz 31171521 BLAKE2B e607aa8437b4b4546cf3be5fa1fd771d07e2c0e5f85faeeb4585aae139fc40564939ccd3ec5efd4e63711789de300cf70edede46bfb54228bf6ea783d9dec39b SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534
+DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
 DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
 DIST VTKData-7.1.0.tar.gz 249106922 BLAKE2B 01505bd5e01c790d40be6966c6261de4eba2ec36b515580112b3291f894c9d2e361f31d20bb14faf40f125b82e5ea6a1b0002acbb598c79f11d541e0fe5de4df SHA512 8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e
+DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836 SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
 DIST VTKLargeData-7.1.0.tar.gz 166680011 BLAKE2B 6b630d13a7cf22909f2fd42a89eccfe2ae79c16ec46b99229f349ff47d20e38cf22b9b63803087d319d43915fce116d2874e450c439727dde5a795d003cd1c4a SHA512 79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455
+DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd SHA512 cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679
+DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
 EBUILD vtk-6.1.0-r4.ebuild 10518 BLAKE2B a303880cb6d411975e5e2d2b455385289390411a7bff4fc63fa69121e0f75749a6d235d5581b9bdc63475f87126f5ca6721cca9e7e7ab742a0cfe1fb2a799c24 SHA512 27a5deff359c5fae24ea08b3b697dcdd27e6457d44c594186ff4057ab3d18738cb52af787824c104645d116f44de46081bd3bf48182e29cc3c7b0877bd6d12f2
 EBUILD vtk-7.1.0.ebuild 9334 BLAKE2B 07ec2edf00e7e559fccbec16815d0780b2c1bb21cde482a14eeeb2301a9a732b16ea567fc39593bc2087269b3a34ca86020d8cee23705d3d9fdcfb9e7729fc8f SHA512 93bd46a125ef9993cdf9adde1f2f5ab0ba48bb0d4d9f81d01b792c40aa6a4280a01bfcaf1733c3451344d95fd6a809adf451707cb250499f403aa333f66627b1
+EBUILD vtk-8.1.0.ebuild 9257 BLAKE2B 32f7e2cc11edd4df3448b518e2f787c3240cf2c269591e3056927f088d3d446754c1010fec90e1add1dc218a0d271f21823a170918f3448ef941f06b07238c79 SHA512 e7c313462601ff5a19c6cc1a744c58dc887de1a752446028fba10de4c8f42bc8b48306159f3b76efb2601f917f6e4a93371d59bd99ca3b9324954b94e8edd7e5
 MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143
diff --git a/sci-libs/vtk/vtk-8.1.0.ebuild b/sci-libs/vtk/vtk-8.1.0.ebuild
new file mode 100644
index 000000000000..eeafc5ca3c22
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.1.0.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+	)"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
+	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
+	video_cards_nvidia views web R +X xdmf2"
+
+REQUIRED_USE="
+	all-modules? ( python xdmf2 boost )
+	java? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	examples? ( python )
+	tk? ( tcl )
+	web? ( python )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	>=media-libs/freetype-2.5.4
+	>=media-libs/libharu-2.3.0-r2
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( dev-libs/boost:=[mpi?] )
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	java? ( >=virtual/jdk-1.7:* )
+	kaapi? ( <sci-libs/xkaapi-3 )
+	mpi? (
+		virtual/mpi[cxx,romio]
+		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+	)
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/sip[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-lang/R )
+	tbb? ( dev-cpp/tbb )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	web? (
+		${WEBAPP_DEPEND}
+		dev-python/autobahn[${PYTHON_USEDEP}]
+		dev-python/constantly[${PYTHON_USEDEP}]
+		dev-python/hyperlink[${PYTHON_USEDEP}]
+		dev-python/incremental[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/txaio[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)
+	xdmf2? ( sci-libs/xdmf2 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+RESTRICT="test"
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	local x
+	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+	rm -r \
+		ThirdParty/AutobahnPython/vtkAutobahn \
+		|| die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_AUTOBAHN=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=ON
+		-DVTK_USE_SYSTEM_XDMF3=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+		-DVTK_USE_SYSTEM_DIY2=OFF
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_LARGE_DATA=ON
+		-DVTK_USE_PARALLEL=ON
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+		-DVTK_Group_Imaging=$(usex imaging)
+		-DVTK_Group_MPI=$(usex mpi)
+		-DVTK_Group_Rendering=$(usex rendering)
+		-DVTK_Group_Tk=$(usex tk)
+		-DVTK_Group_Views=$(usex views)
+		-DVTK_Group_Web=$(usex web)
+		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
+		-DVTK_WRAP_JAVA=$(usex java)
+		-DVTK_WRAP_PYTHON=$(usex python)
+		-DVTK_WRAP_PYTHON_SIP=$(usex python)
+		-DVTK_WRAP_TCL=$(usex tcl)
+		-DVTK_USE_BOOST=$(usex boost)
+		-DUSE_VTK_USE_BOOST=$(usex boost)
+		-DModule_vtkInfovisBoost=$(usex boost)
+		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+		-DVTK_USE_ODBC=$(usex odbc)
+		-DModule_vtkIOODBC=$(usex odbc)
+		-DVTK_USE_OFFSCREEN=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
+		-DVTK_USE_X=$(usex X)
+	# IO
+		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+		-DModule_vtkIOGDAL=$(usex gdal)
+		-DModule_vtkIOGeoJSON=$(usex json)
+		-DModule_vtkIOXdmf2=$(usex xdmf2)
+		-DBUILD_TESTING=$(usex examples)
+	# Apple stuff, does it really work?
+		-DVTK_USE_COCOA=$(usex aqua)
+	)
+
+	if use java; then
+		local javacargs=$(java-pkg_javac-args)
+		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+	fi
+
+	if use kaapi; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
+	elif use tbb; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
+	else
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+			-DVTK_USE_SYSTEM_SIX=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
+			-DDESIRED_QT_VERSION=5
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+		)
+	fi
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local tcllib
+	ln -sf "${BUILD_DIR}"/lib  "${BUILD_DIR}"/lib/Release || die
+	for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
+		ln -sf ${tcllib##*/}.1 "${tcllib/.so/-${SPV}.so}" || die
+	done
+	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	cmake-utils_src_install
+
+	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
+
+	if use tcl; then
+		# install Tcl docs
+		docinto vtk_tcl
+		dodoc Wrapping/Tcl/README
+		docinto .
+	fi
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	#install big docs
+	if use doc; then
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		einfo "Installing API docs. This may take some time."
+		dodoc -r "${WORKDIR}"/html
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ed76f478a46b..251bfd48d1c8 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 3f06c486dbaa..eaba5b811f36 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -7,6 +7,9 @@ DIST p95v2810.linux32.tar.gz 4610763 BLAKE2B a6c811235644cdc4d359406504051965b58
 DIST p95v2810.linux64.tar.gz 5707219 BLAKE2B 1ad26aa2fba4d7f4727bcd2dfe010d2b5b780e7516f7794111f7d5a782bb5d00080de3e87b98f110ca15a61c128ee18472c2655aaa68cb5498eb5bda11a06a4d SHA512 c4fd692df3018e5e73ba6095de5ed394f36d5c89dd81c2c7f2c74a4ce3184b22176dc13b8b59e4f42c1781e911107dc12224cfcddef882535931319ec93120f1
 DIST p95v294b5.linux32.tar.gz 5455113 BLAKE2B a615ff15a77eaeebd6a1324f59e6b780d88785952d2517c5ed088f16be74e33e75e98d971eefdce10d17ad0237672cde8111e7b3205d93a4b81bbb949f0d662c SHA512 e8a0061c363333a7c36eb24ef72e9293903404563d04cdcad6432e63d25d8b85e1f0c8e8a46d9795a204830a01031024f82362bcedec4fcec954899e4d6e7127
 DIST p95v294b5.linux64.tar.gz 6244650 BLAKE2B c81623f70c66ec9443c1f4858851525b9064bcfd948bb831f63774e6a09ee2e86eb2e295db4d849ac40e55f1d5166a470e248b5eac0a4b2a4322b7041f1032a9 SHA512 e315ea226649df2135895a1206e5845fd05587ad190b676228e5e1cfca04a11b698f1a7d5b8e7c96b0cd174ce3dbeb6000240b67a3f0f90572f3bf15166020e5
+DIST p95v294b7.linux32.tar.gz 5455201 BLAKE2B 2d542c06fb490f6619884be3cd510fb77e130184d2b7d3bb44fd375fcd7c95e38ef4cf80ed01079c9f395d6e8a526930a07357f20e14277beba4e232f4e2ca27 SHA512 21ee6a8f0a4482bdb22d80093b24a8b9d7e091577628dc797ad01d3a0ab98e946814c70a6313e2624fffa6658454707f88d24608e107048fc6361d15aa5a7fbe
+DIST p95v294b7.linux64.tar.gz 6244730 BLAKE2B ca5d0aad96e9bd5fb1bcb232435a26b7d8c2b9d869a6dc638d883fb892013df7a823abb0dae4545c2191b5f39b9cd29ee83400f452fbe63255f2dca899ad6bce SHA512 0579ea9ca1977884c8c50f8c8655b0fef1d5e2b456adca23d6d93542734727f265dc8f784c27fc9510c89afeec7386d4a9a9e9b5d691a97fed8189bef5577b3d
 EBUILD gimps-28.10-r1.ebuild 1427 BLAKE2B 96df89e289d93e9fb89ad2a21fbc45fa3d2ab7cc1d465f50d50fac4a424a50b2a90cdf6388653564b0191116cadb317762891286e33ccf97ace25d31f51979e0 SHA512 8ea450a833c7b7085cdd1065460a5d53f4e96c236c85bfca1439954898f426b7384dbedda750bb1a0a7806f815d253febfcc31168a3a1d0fd1b3a64098b6b26d
 EBUILD gimps-29.4.5.ebuild 1742 BLAKE2B 89729f28018d5430f6de4a2e85cec4f100e14b25c1a80ae56ff6e02617dcd249e06009a83fac001fd5237bf05cd427451c96131dcdf9ba93779104be8f04393d SHA512 6cdfacb26766255228b29f09f2ba1c11b7c8c83e76a2c9454dce47b91c383505c9cd57399433d198a869f91ea8e85146e36cc872f41071ea72d9cd217645478f
+EBUILD gimps-29.4.7.ebuild 1742 BLAKE2B 57830e98d2c26168e5fea43ea19906b8d48248679a8e9373b1c9992eec55befe5c536c468f6b38867ae37a1763f942ed67a7190ea93b4aad6087308db455804a SHA512 763dd2ba4c730ee396cf4327242a038ec652e52af10b405e46c66fa3dcb930585d661a9eacd8a855f6680f07aae57de6c8acff6a768e24ebd66a5b8539b93c97
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-29.4.7.ebuild b/sci-mathematics/gimps/gimps-29.4.7.ebuild
new file mode 100644
index 000000000000..09dcabd77d11
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-29.4.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils systemd readme.gentoo-r1 versionator
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="http://mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(replace_version_separator 2 'b' )
+
+SRC_URI="
+	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
+
+SLOT="0"
+LICENSE="GIMPS"
+KEYWORDS="-* ~amd64 ~x86"
+
+# 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
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${I} /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${I}" || die
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 55d8116504c3..7eb0e50aedfc 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d54c9b5c4133..8e6a86da03fc 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -6,7 +6,7 @@ DIST gnuplot-5.0.6.tar.gz 5093897 BLAKE2B 9cbd432b8177175b39b4c0068b4852951903fb
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 EBUILD gnuplot-5.0.1-r1.ebuild 5692 BLAKE2B 62aa0d443aeb5690a274c1a7e389e506a152eac52a4d0ec36d412158c7bd963a8eee6d558b9f2b1608b4d8612879a34b89f476f21ebef5c4d73fc95c28f2e70d SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849
-EBUILD gnuplot-5.0.6.ebuild 5891 BLAKE2B fd3af7f1a8184ff2ea2464fae22525d7832eeb21e37b64739016bdf4a3e9ed58d3dce75cb5763c61e5ec0fda3c07a70cb72cb002d3365304e9656c2b38de2cae SHA512 53e558357ab52930975be0fa3bf2bba9578c62d2f98658eafe0bb9581c477aa56f64f378705de51e1d284b0f37365b10e159d9e229a1a10a14f1a6d544cb25cb
+EBUILD gnuplot-5.0.6.ebuild 5894 BLAKE2B d8941924ae4636d6d5cbd91307c89619940c7a56f99e4f34bd60f21588104b70b768e85917805ba58e374a980652ebaf47790787db1169a1ff2151fac80ff835 SHA512 d472d7e9f63f8ffb53f749aeceb49eda3036e2303b509c7829e7fa003582e1e03dcf38b7f4a7a7c69fb39842cc17db09ca470e1b0bf52950cef3b0a352a8e451
 EBUILD gnuplot-5.0.7.ebuild 5830 BLAKE2B cb0609ed221db653ae7a25c41ec43afeac5358a8ce7334d4b127de353800bd14820c90d84c6b70ba1163f1c831a5a99e5bb33b46ee173d11b3566fe63d30f815 SHA512 a21375723ecf36385a2749c2710bb3e45448df198c373c190c5be0f293474cf97733a3ef8f8e16e83399d7dc85f6ff104110cf10e85c3ed98c5abfabd7852197
 EBUILD gnuplot-5.2.2.ebuild 5860 BLAKE2B 1c1cb9b7e2ac370674628a8bd9d1e444a60aae2967eca5d53bcbd52202d8f3e4623071da33ab12c2f58462855bcb871bf3edd8c42da7082e6a7616a282ee826e SHA512 ae23cfd5c27f35102e76dba5f204b69b5a5df8e7e41ede76be867043233a3611ca17420217c7adc3045a5f8480483253a34771dd3c97e2d59881607344a41e96
 EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
index c80b3bcfe9d7..94965ccac263 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.6.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,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~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 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest
index dbd57518d41d..7aab3c5f89e3 100644
--- a/sci-visualization/xyscan/Manifest
+++ b/sci-visualization/xyscan/Manifest
@@ -1,3 +1,3 @@
-DIST xyscan-3.31-src.tar.gz 1122203 BLAKE2B e98554af93bcd1ddae11d42aca00ca5609f95fd26690edf218e178c5a5058fec852c909a9a23440abf355d1aac411af40ced8106c1a674f688c3ce4484e5a786 SHA512 418456348d2493cc365c4cae4760a246d8113e1b0cf74c03aa385a5a40b02c20fdb873c007afea7e244e493c52eb2803cee4da0338f6e090ef87f20dc9a50f42
-EBUILD xyscan-3.3.1-r1.ebuild 1015 BLAKE2B 68b1d94ac897d16759f20e782a373648b2d5756a67de504b0fd7aff6ab96224d1cfdd422ee18fa55a161c682b5fabb99d81fdea92917939c55234d3f5797bf84 SHA512 fc39a7b8a222f5bd7d27b49c143448fa0f6a2218ce3e0992e5272af151f73b0cfa2bf2f141bcc080c254e355b79a6fed89fc03baf45c7429c32ab2b53c2d9b25
+DIST xyscan-4.30-src.tgz 2700346 BLAKE2B 553e751a8d8320aca0bdfcf9facb528463d4b9179f134c0d2739837af8756760e8831f868737658f21c109c76f87a0c7284c65138b5585481e8201f664f3653e SHA512 f520f9d54893e738e8c93c7f0f4c5940b17e25d2a8dcd42632993b92460cecd388e6bfaa69f3905bdb9e77ea2ec876f3b93d82079d3383d6edc4cc8baec512b6
+EBUILD xyscan-4.3.0.ebuild 1104 BLAKE2B 94324bd70219a3b4c3a65d6ca96169b0dcd1211c8f746e93dc3148aca68fd1938439b10dfbe2a16dfa852277c6dd97a234969133284427ba1cf9cb617eb72aec SHA512 6452bee263905a5d91b484bf7783d7e7c97723b55fedc0e8835ef449645931d36b43ce85fca16e29be4c57057fbcbf8397d828e4aefc988440421ac48e0ed827
 MISC metadata.xml 575 BLAKE2B 64935c668707ca1efba54b4a6a366dd9d04c1cf8b9ec606343fe896e731508d4bbb4be6790f5e20b5658bdcdc6659de090a136daf47294d4b769fe391c5242dd SHA512 b837b28ce6e5f2f44b93b14cfde853c2a41cf04f0aa2ce4cf2eb767dd4e355e13e6b24745ac3696f7bb1a27b717a41fef91cbcf4087ef0daffdafa63a7b0cd36
diff --git a/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild b/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild
deleted file mode 100644
index 5820b1da9667..000000000000
--- a/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils versionator
-
-MY_PV=$(replace_version_separator 2 '')
-
-DESCRIPTION="Tool for extracting data points from graphs"
-HOMEPAGE="http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/"
-SRC_URI="http://star.physics.yale.edu/~ullrich/${PN}DistributionPage/${MY_PV}/${PN}-${MY_PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="l10n_fr"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="$RDEPEND"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:qApp->applicationDirPath() + \"/../docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \
-		xyscanWindow.cpp || die "Failed to fix docs path"
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin xyscan
-	HTML_DOCS=( docs/en/. )
-	einstalldocs
-	use l10n_fr && dodoc -r docs/fr
-	newicon images/xyscanIcon.png xyscan.png
-	make_desktop_entry xyscan "xyscan data point extractor"
-}
diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
new file mode 100644
index 000000000000..383fa03de114
--- /dev/null
+++ b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils versionator
+
+MY_PV=$(replace_version_separator 2 '')
+
+DESCRIPTION="Tool for extracting data points from graphs"
+HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/"
+SRC_URI="http://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	app-text/poppler:=[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:qApp->applicationDirPath() + \"/../docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \
+		src/xyscanWindow.cpp || die "Failed to fix docs path"
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin xyscan
+	HTML_DOCS=( docs/. )
+	einstalldocs
+	newicon images/xyscanIcon.png xyscan.png
+	make_desktop_entry xyscan "xyscan data point extractor"
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 68e9ee309533..95b082c6deb5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index dc08cc5de6c1..98d52b06bbf5 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
-EBUILD baselayout-2.3.ebuild 8346 BLAKE2B e69042d75377e5993f7f834cff27fbb30ecc5c1b1f6bceae70b96c6c077918e214d1d25b2b335f9c711ec32bb0edbeed3daceb4a98860342e7ac0e9e66b15304 SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1
-EBUILD baselayout-2.4.1-r2.ebuild 8586 BLAKE2B df33e986a6d7f0135b7e0861c6a8f689c1eefded615d4d40f18fb1885b725f6b6c3115596c5da399426e54a40facf577fd4d6cdfdfb2ca59f520a79859dd6366 SHA512 c7816cb2f1dfb69608ee0a3ea12fe5bb4c4a94b63f281ebc727b6faae11e796cb2393c696bd04c9a197268c8d3fc73e8caf59c849ba2dc359597ff4a7396ccd9
-EBUILD baselayout-9999.ebuild 9191 BLAKE2B defd00dbef7c524e118b8d863c7eae6f87870d25169ea7919c43c68b5e20892b214d7cc72637dfaebb29b50eab546e38a8cbb745d0eb236a5155c4cdf20f8799 SHA512 0cc07338bdc4eaba42770dca5fb7be1e0c025325f9879d3a0d4081edd3e9f6dd11a7c1ea24d2ab2eb19b28ac2648f14877cf305ef65b6d9bd7aff11fc3d60e0f
+EBUILD baselayout-2.3.ebuild 8334 BLAKE2B e5a11ef84c953d802cf7d9b4a0aaffb62ae24882176067ca64a359ea3092cf6eac3e6666ee68dc74db1a1024ce99127342e09b8ecb287a0c16c807fe3b2665fa SHA512 c070760aedc79dc1fa2642aadd4db41d40e6c10738d2815d479c81a39a0d930cad150bdf01162f880f9cf64e81498d910278a0e028d696f915a13ecefb7babdf
+EBUILD baselayout-2.4.1-r2.ebuild 8574 BLAKE2B 13006a5d466e76cdc845198de3b9535c0ba5a08ae7584c7d2d1cb64cfb2005ed5becd0b3e05903d88f750c706457a235f65d88a811b27eeb57bd6d438c09deb2 SHA512 a64f391e2efb667d3b819fd14ea246eb09e2c4db305a00c7528c34eabf16a2206ab7b216cffdcb048c20038c1ff3238d32be9405e9c31f04b98692e425fd1292
+EBUILD baselayout-9999.ebuild 9179 BLAKE2B 0846b334af76aa2e121e476511f9623995b239aff79c25aab86d40302b85e641c95f0368758c68044b1ec256a68b2dbf0173b722725f0079f403e9e9258bacf9 SHA512 69bd9ce94c2a315f403d9cf539a0f5cd491ae752fe50f678d4e9e2ab61fbb9715c302d368aa1d21922101fb742b85596cb2ab38f9dc3e05d130bafae5dd0042e
 MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1
diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild
index c7cac095dbf5..153e53b5ebe2 100644
--- a/sys-apps/baselayout/baselayout-2.3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index ec9e36e9794c..bb57d59ef093 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a7d95e53ed43..4622672eb5ba 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-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
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index e1b1e71c9c41..8664fe1a9569 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -18,8 +18,10 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.25.1.tar.bz2 2103070 BLAKE2B 304e194d436b0625fa7cf03ab5d64f5a8c4b97180a00db248fcbbf399566cad85135e4f39b1fad9cf09a445f6d41ef58890e212be24807f65ee56df1a913fce6 SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb
 DIST busybox-1.26.2.tar.bz2 2120931 BLAKE2B 41c0bea7b1548df24cf1c5d655f4e767c2fb54f674065b3599d5d179ec2cc78a3806f14ee85535aa3831931fa0b19dbbfc2cae945123295eba1b31e20e70bfb8 SHA512 9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
-EBUILD busybox-1.25.1.ebuild 8597 BLAKE2B 14ef86039d47e2d6c2323aec3d25cf7840520b629888fd471af8a3eb5f096b314a4620ea4b819e487d5b77738a0c937dc85572bec5bac0869ed02e9afff9c83a SHA512 40c4af782f391f44a05bdde056c1c3d8935369dbfdad7b464f6883c4a4f82a4dc821427f7109da73a703891c0cb5ed65723c0b2c373fdf54155e7fafcb58553f
-EBUILD busybox-1.26.2-r1.ebuild 8934 BLAKE2B 6483597d33875e5298d285588a269a0ce4d3c88e4d8a3a36089f65a30939e19b749d234731cf35c54061b9bb7673e9f07f01cb661f68e81dc1e5ac490708687e SHA512 d5320f05e15b3b62e720d0fab274575a4ce4c18eca66b811e271c3dd7bafe2bcf9160fcb32d14a36849904f79623b9c1f4817029e813c51f2ef1aecb04375737
-EBUILD busybox-1.27.2.ebuild 8934 BLAKE2B c940f059c0f6bad5a1d90292f67692cb806188168f32d0b97c0925223c95ec5d192c9471824b2eb53648b7d0449ea92b859a4ba222ccdd7b1e844a0d6c5e3201 SHA512 28543dc9a553778bdcf7dbae63cd4a726a326bd679658f634927a12a8008d2fb2f421acbb734fb780163773d55ba7f5afe4d6d63abcd9124d273c0bd2a3bb534
-EBUILD busybox-9999.ebuild 8936 BLAKE2B 19f5a5e58b33ecc7524d91c8fcaa41b348764c6947aa9948ded98025969f88053447af00f3c787338cce25c5fb6d67d7a761b3c6552645e650f367c37b064b0b SHA512 fc1fd4f220690befc1795c42a61491caa20d4e45172f69e37cd20bdc7b0952aa749542423e037a1fb34811179a8fb464afff94d6cc84cc00bee87208a96dcd61
+DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
+EBUILD busybox-1.25.1.ebuild 8772 BLAKE2B 09a9f7fcf016901ae5d79fcca962ff13dec578bd2815f0196a9458d066b6ff1ecdaaa21a457ad0dc3fce6d8b4a5d8bc3cb66e79824067d7dc973e8163bc99c39 SHA512 0c1bfc1298ec19e03d3c1efcd974332f3f960937c69124d2f9399640f468b4b823b8196dfdc2eb955af8257c3bca538dc92ca6d71b1cf1e5838fa5f12fd87cd0
+EBUILD busybox-1.26.2-r1.ebuild 9109 BLAKE2B 310e0233de69bb18a6789f127dbcc97ef648f420e8119fe97eb99ddfa8efd124d7ec71536a0282ab63975241e5f8618969b38dc98c6736dac44e63027c96bed9 SHA512 c8acdb039cca5528efcb5c2861b4eaed3f7611909be5b368a72f35c86ed4d0bf386b5f88f8b1ee083663aa73da1812854e613d43b303150c9d2013bb151566e4
+EBUILD busybox-1.27.2.ebuild 9109 BLAKE2B 76fa055773bedb7511974c2e695bb23ddc48ec3233e169ef90d4ab789ddbd086fd7ebc9ffab8ed7b255382d1291618d554a56891bd76ec4c8b7a47dd1275812e SHA512 e2ea36c7a4f48c3766363f7f447e4ab5f31b88541db7c64207e0c3fc0d5410ba309d112d9ca6734adf631bd4bbf815049c79713de77a6aa9ad558f53a688fbb1
+EBUILD busybox-1.28.0.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
+EBUILD busybox-9999.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild
index 373d932ae1a4..e2608ae82c0d 100644
--- a/sys-apps/busybox/busybox-1.25.1.ebuild
+++ b/sys-apps/busybox/busybox-1.25.1.ebuild
@@ -139,6 +139,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.26.2-r1.ebuild b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
index 19d62510f287..2cf1f1574c30 100644
--- a/sys-apps/busybox/busybox-1.26.2-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
@@ -147,6 +147,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.27.2.ebuild b/sys-apps/busybox/busybox-1.27.2.ebuild
index 80b530dc184a..97b793186c4c 100644
--- a/sys-apps/busybox/busybox-1.27.2.ebuild
+++ b/sys-apps/busybox/busybox-1.27.2.ebuild
@@ -147,6 +147,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
new file mode 100644
index 000000000000..68000bffa174
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="5"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
+#	epatch "${FILESDIR}"/${P}-*.patch
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 73ee93bb96b8..68000bffa174 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-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
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -123,6 +123,13 @@ src_configure() {
 	# triming the BSS size may be dangerous
 	busybox_config_option n FEATURE_USE_BSS_TAIL
 
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
 	# If these are not set and we are using a uclibc/busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
@@ -147,6 +154,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index c30fdc277c84..28a33e54476b 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,7 +2,7 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5de43a691463bc24ac51087f986440d6464fee71f7723980b9c21c579cd4aef70213d5033c419f3802be3bd4cd29 SHA512 74110d194de8b6b61d40b133b97629520048a8fdedac349ec2031c793c0246526c1c7904e88098b4c2a121e5efba2d724924139ab1aca15d129a4d210f94a1aa
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
-EBUILD debianutils-4.7.ebuild 955 BLAKE2B 62f8d18a91a707314302473daab1d2e4645261e552036378271500238251cca8b8c9c9156532832637aeab5045ef1b8528c21fca9ceae8d4424a826862145bb9 SHA512 581e2efee6fc722bb26cb3f5072758f119927455e584c41be27562906d405309d121e9e7cde3d5427d6399f7e9519423ad4a7e99650a2214a142963b27f22cca
-EBUILD debianutils-4.8.3.ebuild 963 BLAKE2B b49bbda0dd4607a25393bb77fa722b0a4606db10f61234aea1b93dd7d22f50594e3489e3bc0665de0f0b286009800eed5be3134e3f8eb324df7a152967cdadd1 SHA512 9234f06a2b364d6e7ea3a347dc3708ff04a01c2168fba1d69a2db8eec62dfad88a49829c7e29ac9e64c2fcd52292516c7ac524bf678aabe53dd61a47d1964743
-EBUILD debianutils-4.8.4.ebuild 975 BLAKE2B b0578fe970dc5497fd7989f35e5b0e111ab901a660e996e5ee067a3f6d8fddafdb528d45ecfbed166bf5cba006552265269d18fd9cee6fd20d7af9a38d563947 SHA512 17f0039fc61ffe48e27a993465d208397abed8d50c823af3cab45749c6d841a96e2b1717b970d0ae98853b8b65f4b201d85012d9dceddf7dd21f64fceec1c7a5
+EBUILD debianutils-4.7.ebuild 943 BLAKE2B bfa2506c83becb7dbf47bf311f00ac931107679446551ab4f38938f957377997d5340009bf8947036f2b6c0fd9a8b4ab265cc8ac5b28c0ed5784938ee0ae906c SHA512 f45eada04cddfefbe2961d7c2a7ff5ddf3a742947d9ffa1dd66b37ca33b99dc06d5d811b24fd660e972b0650569483eba78b4d7e4d97fe957f9e0db297227dea
+EBUILD debianutils-4.8.3.ebuild 951 BLAKE2B a69242ed524af63dc881c3cfb61bdc1f525fbd33434f6e5fb5da7c96b11eec31981c9483deb1ec26644851c9993cdcdaff80ced3c5631b8c7bd93365aaae1987 SHA512 4b1ebc42a1da56fe9183ca91fee58909f696414e419d71f06aa21d295ac22afa5ae3523323c3ab0ad1355e22beba6fe03f35b785414a62f4dfc608409ebb62c0
+EBUILD debianutils-4.8.4.ebuild 963 BLAKE2B 32705ce1d6aef1a96bdb597ef36e3ca0465611f53b975dce303842ad3abf51984c719c5f68187cb1cd7d433d0e5be6738bba62a6369d9efa83571130c168ea50 SHA512 df8c91246658fb77f1e126a37479814e28d3c1dd8f8c532197689f5150088ebefe56d4296cd6674215e1eafadcf226e925d08a3c85d8553208faeaf6ea7a1071
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.7.ebuild b/sys-apps/debianutils/debianutils-4.7.ebuild
index cc93d0fc79ca..d2e7bb775738 100644
--- a/sys-apps/debianutils/debianutils-4.7.ebuild
+++ b/sys-apps/debianutils/debianutils-4.7.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 src_prepare() {
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index ce4ceda7e7b1..da3add83b946 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
index 6932bae8d611..b4860c091b15 100644
--- a/sys-apps/debianutils/debianutils-4.8.4.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index f9d4723e8b7a..46b7cd51f717 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -2,7 +2,7 @@ AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d2
 DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1 SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.3.ebuild 1449 BLAKE2B fc9aa80d28217eea857dcf170b438046f0a1b378c585b49407152f6b749805cc03c0c4554cd03acaa32dc31cf2869fd032cc4945643c6cc910c07c03230542c5 SHA512 b25387889515894f8b7249565f4c022b91268995ace9227829cbe67312a13222979eff92a9262816e5dff8043a70ddad635d6d53c06df2139324ab387dada12a
-EBUILD diffutils-3.5.ebuild 1262 BLAKE2B 62981e71f105a71876ed4dad748b9b1b41d91dba86d62a0260704df9b0b0226c6fe0038f0a4f925b98b61d228bf1a53a30881ca346974ff396501a8df7b8b65a SHA512 f7945872ccf1d61d411b1d209a522acc68e4a7c2261705b0be23f822c987b05ec92840693679e633ff5d1aaff198646c3df57aa12c0f0f16b2ea0297c5fef240
-EBUILD diffutils-3.6.ebuild 1178 BLAKE2B 247793c2bb8ad7eee4a8c0aef12266e2e11bc6885fbf7633499f8075314cbeb244571e1a15554810d2a10f56e7f2055c27aa71a2159c2ba42715068388585444 SHA512 27e98ff03aba18e11a681fbdee5ae2b23b311806d647fe5dd07179d90ea8e277de0aa34f7e60d5d4c6077813c15f77f82a8be480bbe62efa53fd1b40af0428ff
+EBUILD diffutils-3.3.ebuild 1437 BLAKE2B c2fc69bfbfa2dfd0953b9f1cb80a4a7a4980740dbc5cbba631e3311e4ee548fcbee51c3c191709b890a90e8f46409689c217762a64cbdef672383bcca23c4aff SHA512 d0f286f68b667e5049bd0713336308f43f6fd75353e285d9753a2f1d43a94e218beca55a6df58d834dacc968c672d64e0daa0229c3654da4239da57c99004bcf
+EBUILD diffutils-3.5.ebuild 1250 BLAKE2B ee2af68ab02655eb85ddc6afa4ed7a7ac8c45d618738f53cf41067440333dba8b2197d101253688081f27e81388af445119fdea9b5185b67fe14071250c05983 SHA512 50a51b0a9bf659004ce150eefcb3b969494fffe87e7f48365a3df0e54b5b960efa228a6ab3e3766aabc63ff3ae39c91eba7da00665a0567f2c0252d0c62ef5b1
+EBUILD diffutils-3.6.ebuild 1166 BLAKE2B d4c28e6a0eab8b9c66fa6c07199c4ee6d7b862e0c4fdee27dc2bac56e8bb3a0ba87e7ca91605f12bacd9b3bc2695cb4987523465003009bfb20674dc10ffdd89 SHA512 2ac74317252603d3da51aa5a038ad3da40c77ac94a53bea59e82e93c66a64a7dff87c10beb8ba469e83c016f57cbf8fd23d5b08a87d92939947547916387bd9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
index 74de856d5c86..ebe4d3023998 100644
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ b/sys-apps/diffutils/diffutils-3.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=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 4f4cc34faea0..12510de9dd81 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.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=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild b/sys-apps/diffutils/diffutils-3.6.ebuild
index 3a2a7b9e2be5..58f25710df80 100644
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6.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://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index e0f4ae9849af..f2d4163653c1 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,7 @@
 DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
 DIST ed-1.14.1a.tar.gz 91662 BLAKE2B 654eddf7328418507a3a9536da0daacd85c2ef3ea3b1a58b742fad3fc48cfc9a07f8232ecbf5e8e0da42ccf191b1da7e050b0779879e2dbe8b98a329e0f0d45c SHA512 423a30729c16355d80ed84e408034f63fe0d700d12441f82b476af1919c08e7fd4be18736c30cdecbdec5d851f9a08999242aecfe687beed17b779a7485963c9
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
-EBUILD ed-1.13.ebuild 923 BLAKE2B 781214a4ec07a5d207639c511f11ffb272382cd7b8105df77704e9b1c93385e89d9de39ee1a9123ad38bbf36a15025687267378efa7977964cb5230929367c7a SHA512 34afe2dee8259d42c4376ff17bace4eebee8236945e2518a786b2e25a8fdbe28aa28d38131e1f50d5f0e8f6c3c795a311529bce226fe09826f24e68f07a406fe
-EBUILD ed-1.14.1a.ebuild 933 BLAKE2B e8e81f5c5aa4fff276e5cd192f378772b5a920d8d6661bb0910d32f3f8470bf81633fdcfa017e1e65c30947e677da69cbf63a1d17bc6c6a826cea210893874f6 SHA512 27ecf81d89cc653e676f46cdea352a5438ddb09def853c6dbfc137af8c7b55211f79369c643a7dd8c85210ffbdc7e7e9104462028435b987adfc2b3850126d9b
-EBUILD ed-1.14.2.ebuild 945 BLAKE2B 6a9727ddf391d4d1d7f53654886ddd6aae5d61c2972a1998a65cf9beee7d9672275f69e770206f4ec82f540242c7773901e81a47e07541df6e8689bad3587b9f SHA512 6c4965c6657e419e0dd05ffc0106234567e27875f810ce06d6f97dc0568624e1f7993cf9ba73a741a7180a5a6572e38198cff04b4dd3f8f792bacd684c075446
+EBUILD ed-1.13.ebuild 911 BLAKE2B 9072480e149b2911d14861077f3c1d213cb32d8497d09f836be32b659d3774ee8f812ef757b1a2dec6139c75ab14f087494369432977e12b784a053f5a204a15 SHA512 6093f37ab651e0c6e12b74771a8e62e40096f5e2f84ea051a9875c56f66df495f71b07e01ccaac5bd8f24776a72fc917d87988949507fd6dc7371d46cecb32ef
+EBUILD ed-1.14.1a.ebuild 921 BLAKE2B 249e5469c4cd8ffe6d8b10aa3efd46b4159e6632124d720bba0437ea0866e6f799342eb0a2a9ee538b4037581df0783fd054ff9e3b2aa661a7b9db9239e3ef51 SHA512 e9aa3bff70c0af368e3139168ffd8c4098b61b3f1a601d2bc387e013fedcee4747277072bcc70890244f569e0054ea54a4addfc3919f79fe001e8d1cc19642ea
+EBUILD ed-1.14.2.ebuild 933 BLAKE2B 19f9fcc693ad3b1e29d2dff7a1fa270d41e3418cc2ee9aee2be3b63f17b67e49baa3568d8b1726b982e99756a905cdb4eff979abe73b2730cc4dd6d720fdc9fc SHA512 257ac23dbe5557474be40169d01ac71d5b244d5e1177fd33c742392873683884e2b0814807d11883f6d45b18b1f15af4452f99acd900faeaba9b3bc89e4e79ea
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.13.ebuild b/sys-apps/ed/ed-1.13.ebuild
index 950215c0ff3f..2004db464329 100644
--- a/sys-apps/ed/ed-1.13.ebuild
+++ b/sys-apps/ed/ed-1.13.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
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.14.1a.ebuild b/sys-apps/ed/ed-1.14.1a.ebuild
index 685492cee99e..3513310e6364 100644
--- a/sys-apps/ed/ed-1.14.1a.ebuild
+++ b/sys-apps/ed/ed-1.14.1a.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
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.14.2.ebuild b/sys-apps/ed/ed-1.14.2.ebuild
index 798cffa0764b..e4ecd98a48aa 100644
--- a/sys-apps/ed/ed-1.14.2.ebuild
+++ b/sys-apps/ed/ed-1.14.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=5
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index efeccfbbba02..4d2dd943d8a0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,4 @@
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
-EBUILD file-5.32.ebuild 2911 BLAKE2B af8288ff23bd5ad66fe7cb935d25f114b5f10221e76c910156bc28f027203dac22b30a97b87e0d467cf54a759bd5c4b888f27bf437487cc9bdedf2e06ca5bee5 SHA512 668586ad4b842d209c19266a6063493af7482b0542bc401af5c439c28f009c4c904a5edf258bb739984410e1eb345a4e0c430a7e8ec1b7a5e17d6e8d1f0819bb
-EBUILD file-9999.ebuild 2924 BLAKE2B 2342093bf71db8bad4b29aae0a3a1479c823881aed1ff635856f78da5f0a1d2405d0aca67c713d8c6f1b434d5f2b251a2a4e5af1be930e25f2ec700840bc262c SHA512 e656d0ecac3d195a3e61cb0168f4f7c9f2b74c351a583c6ed568ad73bdfe35885593a7f9c4258e9ef51af82a4489a3afb34f9baa39dc00e032b0485d7dad4b0c
+EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63
+EBUILD file-9999.ebuild 2912 BLAKE2B b63c099f3e2036f91a8d9866a453aa688b20fc9b303d1a9fe0f83ed3ee110eeb5120eaa657302e955f7dbfa81d6f3b92a669d6dffa948caa7885ad2d50e431bb SHA512 2609753025bfb22cb4a371d4799df8afa6e4c7393145cff6cc2751cd41039aee6b542ad269be823997ac994da2a5de92a5beba094d8a89b8d3e847ea45ff6e57
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild
index 43c64a51de95..c431956b3788 100644
--- a/sys-apps/file/file-5.32.ebuild
+++ b/sys-apps/file/file-5.32.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 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 4f3a87f8bf98..3c9e2e50e4a6 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-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
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 6384dbddbb1d..4561627aaf4b 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -6,6 +6,6 @@ DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc
 DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
-EBUILD findutils-4.5.18.ebuild 1577 BLAKE2B 1af0a4be329cef9cb2ddf986628d90b3cd86bc5ab9ea10b39d5b9fa1f9bdb9758093f6e807880610f2fd10ab04a90cab5657ac1cab39ff18ea1d205ff24bce2a SHA512 e149ce4f5dde29c308f2872068014fb3aa42e41d08d5eb0b41bab3c3dcaf223bd2b559371a3e7a5d2ffa748cd9ab52614d4f8136de80e7c08e9a0e84a79fb5d1
-EBUILD findutils-4.6.0-r1.ebuild 1917 BLAKE2B cb6059d106b7c70b6211264b3949537ed170968525e37a6f597cbb6cf9eb24399f0fd4ba4e86b8bbf462b3363f64d17bc22e7752731638ac8e501d03b599b667 SHA512 6c75ac0fbfcec910671d7341adda481ce3f1fc6d862b00039bc9af3ec17e2b6da7568b12812afa0d890db816c8e74e3ce739e9fc7b8ad1ea37ef30a338742595
+EBUILD findutils-4.5.18.ebuild 1565 BLAKE2B 98fc64b152d8df52278d07d5d1650c55bbd3c533ed68259fb99b460728e4c283d365cbe63b082492caf965ad9ef52021ebef68bf7258baa40839a9c095fc1df2 SHA512 1e26cb6d5fc097f32611cd8e5d21919b334938a2064e66d68238cbaafd34ae1cc32b773da807546111d1315d04c87ff71bcf317309c746932c5a39fafd2a13ec
+EBUILD findutils-4.6.0-r1.ebuild 1905 BLAKE2B e8a6f4faf5a488f83f4b41f03baed7024703fe49d9ca61d0b8864d7bc2757f4a2cae015bf558bcb0d8eee8d0f8a4caf44dfc22b4b469c0278794245b076cfd6f SHA512 11a56e7bc5ec30731a7bd2bbfd9979360a41f87a2f62b1d3316e34ceeec25e8c1fe271c3ea9c27b7123d3c57d234fbbb6af93cd390cb73a216125aaada53c9fb
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
index 9d821a86d772..ec1a6951c909 100644
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ b/sys-apps/findutils/findutils-4.5.18.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="debug nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index 6f7b51dcc2a2..ea8388072a29 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
index 2645d5523886..2cd69c6cc35d 100644
--- a/sys-apps/fwupdate/Manifest
+++ b/sys-apps/fwupdate/Manifest
@@ -1,6 +1,6 @@
 AUX fwupdate-9-objcopy_detection.patch 1616 BLAKE2B 88daad5739b7bc1e7a5fb2d9c96a4e8c3157b42e654de23061ea871cbab85d4d02c18066b213aeb9817a5926794eccfd83e30eed9d1b047c47ab29c7f3c263fc SHA512 d2e790aaf3a3e10d4154507d1243d429e3fefb914a1fdc3677ec8f7450b3059c34c6d8aeb48eba96647165d95b41adebb849dbba398be07031759499de4a3052
-DIST fwupdate-8.tar.gz 41062 BLAKE2B 904cd34cf490fc48d0bd89667b37ec23ab41432e1b6a5155cd3887697e910b5758404c47c85acb8c8acd5d41acc7ef68a08b49f0c8e39c6007b20690a763bbb4 SHA512 3b9b2693d7d792f0a6c7107325612cba35c891259d870152ca9ebcbd397edc307601e414f6f0fefbcb1aff422badac651ce00867c4dba38dac347ff75e1267b7
+DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
 DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8
-EBUILD fwupdate-8.ebuild 694 BLAKE2B b9dbe6e4a747ac4a0832b0d9d3c5090c41eb17b7e53190fb6317e735a9ca10b4a0ec6e664fad12d8929977ae708f2aca52c9ddbf2f000de728acce00d6af1d90 SHA512 59cdd6682ce60e98b2dd605e3edf32c7e458641a7ca5b5db14754ae8e3b87cd2e646566061a3fb1a8e68b53487fa8feecff882c6e7ee59970372b0b9c7e679d5
+EBUILD fwupdate-10.ebuild 852 BLAKE2B fde9ce5e48019e4b33907fe2c6c6c5887a02676297fb59282b90dd8ebbc69263d9634c5674218d56a0fa80cca4732950c92b28622eea54c4ddadfa62310c39c9 SHA512 40d3e3498c3797d230d3a38cd1ce9e5c8355942baad10f99d8f8d549d5416639f3375e6317f9762a42a5d477355f0016ae8286cbc7517d8c1c27a7d976e349dc
 EBUILD fwupdate-9.ebuild 901 BLAKE2B 3c6e68d44c4de562e43cfbc808624f0c06ad94a98d67ca4b7a4e78694680eae5be4681add956c0dce9c5a17850edc0809a612f64ff676856c63350fbb1e3006a SHA512 fe51dd20e9b7e8f23d5d76b48c027bb6b13df001b705d780c4a24fbc5b435d040d5c6a8bbac2293092e032d7625bfe9976ec5c1371ae5e80a469eba6560824df
 MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf
diff --git a/sys-apps/fwupdate/fwupdate-10.ebuild b/sys-apps/fwupdate/fwupdate-10.ebuild
new file mode 100644
index 000000000000..ac5e222c9472
--- /dev/null
+++ b/sys-apps/fwupdate/fwupdate-10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot toolchain-funcs
+
+DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
+HOMEPAGE="https://github.com/rhinstaller/fwupdate"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/popt
+	>=sys-libs/efivar-32-r1
+	>=sys-libs/libsmbios-2.3.2
+"
+DEPEND="
+	${RDEPEND}
+	sys-boot/gnu-efi
+"
+
+do_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		EFIDIR="gentoo" \
+		GNUEFIDIR="/usr/$(get_libdir)" \
+		"${@}"
+}
+
+src_prepare() {
+	default
+
+	# Remove -Werror
+	sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
+}
+
+src_compile() {
+	do_make
+}
+
+src_install() {
+	do_make DESTDIR="${D}" install
+}
diff --git a/sys-apps/fwupdate/fwupdate-8.ebuild b/sys-apps/fwupdate/fwupdate-8.ebuild
deleted file mode 100644
index bd9f9fc1fd01..000000000000
--- a/sys-apps/fwupdate/fwupdate-8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot
-
-DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
-HOMEPAGE="https://github.com/rhinstaller/fwupdate"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/popt
-	sys-libs/efivar
-	>=sys-libs/libsmbios-2.3.2
-"
-DEPEND="
-	${RDEPEND}
-	sys-boot/gnu-efi
-"
-
-do_make() {
-	emake \
-		EFIDIR="gentoo" \
-		GNUEFIDIR="/usr/$(get_libdir)" \
-		"${@}"
-}
-
-src_compile() {
-	do_make
-}
-
-src_install() {
-	do_make DESTDIR="${D}" install
-}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 4e221e4eed32..d0f6533b7a00 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -6,9 +6,9 @@ DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
-EBUILD gawk-3.1.8.ebuild 1794 BLAKE2B 0149b2393d2bfadc67e142a4e3e97639d34c15e8eea57f03e394198bc1e6feb45fe58fcf13f22275501b8d72588d0e1c41024fb7ecbd71755ae5b38e731a13a2 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61
-EBUILD gawk-4.0.2.ebuild 2088 BLAKE2B 6d7a23d4d2cecda99a5b740bc3efaf3c0da7635059eabf6589e6bddf03fcc997bccbe89ad104c8533534d96419101877a972912e4b51898eca729fa7b783c6f8 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063
-EBUILD gawk-4.1.3.ebuild 2201 BLAKE2B f0acd7924985862b2a260f8c241fac4fdf16dce5027eb0493b89a6d3ee74085a01bd0cb4a695b6ae1188cb84259c346c7374161d000d05c9816fca3fd3d1c2ee SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b
-EBUILD gawk-4.1.4.ebuild 2292 BLAKE2B 79736b9008392c0191f9b927730cf4c0ac989aeef5fc7ff88600f4ceb445e4060e51267f89ceba673d89a03739f2918958b25aacbde0ab983995e64bf88ef554 SHA512 1fe406de8f0b81d08618c884029e18843dd9304cb7d16ecb06bdd1057727d66c6623087153d50ea4ed61d7b68a556a9031268804ffc331195d9197f0fa83372c
-EBUILD gawk-4.2.0.ebuild 2415 BLAKE2B 991f5126b97d4f0e2add75e1657c5422b692485c95daa45ebec8b9544dac2722a3e8a75e339d0d536af8ae64301e469d24760ec059a0b459c57586c86e78a9ea SHA512 02b2dbba4b6a240c8d48a94b6f9037a556bb5182009b8318bd1ec0fe60caa341ffff64d8d33b9baba9ed2b3626dac6c097e1bfdd4fce7bcccb32528c8f276943
+EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
+EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
+EBUILD gawk-4.1.3.ebuild 2189 BLAKE2B cbd7a2fdd568544975ebea18313a3ee53578621f976fc60c38914ef17500b47f7e056b7ce7ff5ebd9d4e663b16f54fff67c4fc17acc2f49645da822a727f32c9 SHA512 674a608dd79b81e65f7fe473583403116f76a309afda68e75d2474125d399e6dc8e1396e67db213d0c68c0297f6940b4672c2f88e071506a213dcc58fdcdd9ef
+EBUILD gawk-4.1.4.ebuild 2280 BLAKE2B cc058a61eb920ada018002678b9525568c1cd6f75a1535d08c43bb3c4318fdbb3234caedac5c361d4cc413a765b1f09682f0b277ca6de5a3d1960a8050688119 SHA512 ca16121ba9c64a7dc335b2e8d343d96f6eee73b57347d8cc22d0780605e345ab8563103166feef03963e62c7aaf20741939fca4a419744c340fe6cf2a0ebe537
+EBUILD gawk-4.2.0.ebuild 2403 BLAKE2B 63eb90fbd3ec95a3cc739c8a6f3936cdb9245fb347cb8b08bc40043ee57c328701b7b1191dae0c1b94545a663ee60803f64bcc4f7285fc34228a9b78214cdaa5 SHA512 bf9c48fdd03eacdbd922e0117e8a360ce92a518e17c0e81413697aa2781156fc0c1b0963ca37f4bf2aa32e0a71bfc68b5496dd67c7d1a115758f7f7cc4033d2f
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
index 9647eae39c9d..8d9f004395f2 100644
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ b/sys-apps/gawk/gawk-3.1.8.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="2"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="!>=virtual/awk-1"
diff --git a/sys-apps/gawk/gawk-4.0.2.ebuild b/sys-apps/gawk/gawk-4.0.2.ebuild
index 5ca0de1ce0cd..4108ca1c6efb 100644
--- a/sys-apps/gawk/gawk-4.0.2.ebuild
+++ b/sys-apps/gawk/gawk-4.0.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="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls readline"
 
 # older gawk's provided shared lib for baselayout-1
diff --git a/sys-apps/gawk/gawk-4.1.3.ebuild b/sys-apps/gawk/gawk-4.1.3.ebuild
index b3a2af376238..6c403d62d926 100644
--- a/sys-apps/gawk/gawk-4.1.3.ebuild
+++ b/sys-apps/gawk/gawk-4.1.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="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 966fab13c929..1d9408a23ca1 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.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="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
index 231bcb851dcf..f2529a996aea 100644
--- a/sys-apps/gawk/gawk-4.2.0.ebuild
+++ b/sys-apps/gawk/gawk-4.2.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="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 4392331227e2..ba76200c2af7 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
-EBUILD gentoo-functions-0.12.ebuild 858 BLAKE2B a69011ae4096f3e49548eb183e11ef2b126f03edd391442403530ec6392ba93d418d2c50757f426fadb79c5cf2cfd1360bdf96467911ed48405aaa6b44c9a80b SHA512 1d4bf591d0d8661cbf87747b197d2a9185a78be1b67bebad8dac672ae00157b34839482f0595483a6bf0b1a4b91cf3d3667ba6d75e7b9e8fec956ca88379c2d2
-EBUILD gentoo-functions-9999.ebuild 859 BLAKE2B 6db273f1f2ccfeb05676785d8bae40d13338c266a74bf522dfb6c66753d345ed20f6dbd69a7d45e9f90e55eee97fa4f46d5b3f4a1ac70c2e1fe9f29a28454ba8 SHA512 8ed5e1564aad2a5c26f8f771cf027f3dc2ae471b08a50ab945cc9703c7dd96fb5a947f9a8e9d5f33a8afcd98876507279187165d0dca8bcf29a5fe56bac25633
+EBUILD gentoo-functions-0.12.ebuild 846 BLAKE2B 6f8138c350334a38c8e9ecc3421d2fe6af90fe4a687fb6e3ee9bc42d699376f92dcb1a8bfd80527946e970aae87902e80610c262f5f5d72f6f3dd2fdad29b2f9 SHA512 632abc3875fb537fcef9702685a07a2f9a55e540b3fb506f7168f2427e77c69d8fdc553090dc9060f8b63f32a46d7f05a39db922e773164e7d541b93f7351166
+EBUILD gentoo-functions-9999.ebuild 847 BLAKE2B bb3c020a1e5837b5897c1d6b10a7ea5486b44568189613d7fe2225811c09a088e9ac96e24fd4e907d6ff4b8b59c12156e95a6af73dd3b12b2cc3faa19cc44dc9 SHA512 c9a2cd71ba3a533867741a5b6dafa920f5e329b1bf475289e7412b0237552ab3fb10df7474005e25c2e7b7bf999afe19fb8c0083f85d7d76b99268af90f9e979
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index b790ea181493..4389b6a2075e 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.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"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 94ee57ba1007..71d08995e04c 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-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"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	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 ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 17bb40fff486..e6ab5d388e57 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,7 +2,7 @@ AUX grep-2.27-splice.patch 2056 BLAKE2B bcaa98b6c7b009194def6d0b3bba81bfcad6fab6
 DIST grep-2.27.tar.xz 1360388 BLAKE2B ed750fa7a6aea389c8f096acc9ac9cdebc9561c4b0cedfd5415ef033dd90076d5b9a42fa97c97207474b250ac0c4e4ed3c2ff216fe4462ac80baa6e47a2b90eb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781
 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
-EBUILD grep-2.27-r1.ebuild 1402 BLAKE2B b5239ae60457d2e7a6f5938303196a333f419e439b428a141e9c290ad85ff28a7499c93cd1c4da05e85068b1644e33bfdfeea6ab3a4180f4258323dfeede8445 SHA512 4f36b61dcf73306d8d49fdb94168c6312d46f0995dbeec288c95da193276dcfce3dc85c10aa539a8e68abe052395012d0004de1ed643f19fc7641afe7eed6fab
-EBUILD grep-3.0.ebuild 1370 BLAKE2B 9da292e0f453304f1e4c949c4a1630202f9145824d5da171410166455425861e78870eb4592f236d16b344c0d89c73a0451b3771c62f044006257c762c539d26 SHA512 faaaf06fb22d6cde684084c78dbb75281784700f4b71d1748184e1af6439233e3464615f71dbe60a36a6c840281a4f3c416423abb07ac821f639228e7ff170ec
-EBUILD grep-3.1.ebuild 1383 BLAKE2B 302d4a7ca2ff461b809b346fd870d74a3b1c83948ca4cfe4c5beaa24169d33e4c6a5e026fb69a55a3ee3ca2cb821ef9bd07c2abe29611b2b00e07f566f7fb269 SHA512 181beb8c30a3bb7b0375682c6f68c081b5bd8b4eb41247dc860c59f0ebd07fb19e7efa6ec32e4a584af09ab777a4c72e1ecbcf92d38b15167a65c86ee47daec6
+EBUILD grep-2.27-r1.ebuild 1390 BLAKE2B 007ddfe84acb25c755f6ed9ff9b31f0273196f7186679b0f69713713207a3b7cb04ab166dbfeae42cfaa1cfeb0fcbc68486ee991f3e62ca2f718f979eafe692b SHA512 e92f35dce7ac3790c79a155d9c2b6323dfdabe63d6ba35c7b7207ac7fa00cd2f18316241dc9038ddb120db5a7b6472309266e6d5658dcd57cd1ec1428d7642a2
+EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09
+EBUILD grep-3.1.ebuild 1371 BLAKE2B df9979b53cad2ba812eaec36fbae856ed48334acfa683d138e14e286262d6f6a7fdc7bc304fcbfd489f3b2409a3f6381b5a3c4ea790cddd94a67d21dbdf3ae65 SHA512 47961de1dc3f2b28eacd3b695253a6b86ae73b8690f9eddc2b6b9792a4f1dc6f21d01cd919b4f1e106268a319d4a28edcfe3813b5fbccba242e3a110cd9079ec
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-2.27-r1.ebuild b/sys-apps/grep/grep-2.27-r1.ebuild
index 30072ddf8869..b2e9b3858350 100644
--- a/sys-apps/grep/grep-2.27-r1.ebuild
+++ b/sys-apps/grep/grep-2.27-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.0.ebuild b/sys-apps/grep/grep-3.0.ebuild
index 087dc86877e8..69114f07cfa0 100644
--- a/sys-apps/grep/grep-3.0.ebuild
+++ b/sys-apps/grep/grep-3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1.ebuild
index 165ffbce3706..6424c8ba9474 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-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=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bb7dc9a2d842..7a414ae2d270 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -4,6 +4,6 @@ AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed8
 DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
-EBUILD groff-1.22.2.ebuild 2840 BLAKE2B 6c1a9841de517d07f7bdf65f2a206f83f5a15497259a97f85f91bb4ec806cc59b3fe962a31ba54df1279864b467047536b862a0c6cabb3e9e0731601eee46ff6 SHA512 62eaa5c8efbe59d5d9d531910ed27c542c3ac9d40641c7ac22566cf8afecee914d8d24747cf7a72d04d2c333d9193c6bb5130662d6f5047e58cae2154857dd3c
-EBUILD groff-1.22.3.ebuild 2567 BLAKE2B db4c3bea253ec89ce840b923565f2d7a11c4686523dbea4701962ad60381a6495e42cedc706c25f675fde8ecbb35626f5815d89f30c45a0306d316958c2d53e6 SHA512 4e702cb2c82141cd8b953c569ec9d9dd7e9ac9132bd2d0b94e54bd97ba02419ff2c840a3ad3f0e76ec64baec2fd256edb3e619395754579567a85d59df326565
+EBUILD groff-1.22.2.ebuild 2828 BLAKE2B cfdd8875e9b270ce3b38bbf4d707d34757c6d7b529041c85c7758b559936c0e3080062cca3a8d3461a8ade109f2d2cc81b735de5a6711010c5574d304cbda935 SHA512 6a28fdd8b6cdf9aeb5054631916a667aead8e1102cbee07322bb36bd8a1deb393818ba16418fd30819ea3d4ff573351b726f347a71283023995dee5bd50fc05b
+EBUILD groff-1.22.3.ebuild 2555 BLAKE2B 28de6ef1b32b32b0faaf83120353f031186a1b9ffe941cb4fc5a7bd3f44458a699705896dfd6401021fe92f59e74fadbea13fec9af13bde621efb279874bbc22 SHA512 7461162a44ebb7a20b36805534311df707968452ae7f7094ccb616bee20b724a56613ae8a4025b6249c41dc969f8ea5f61c4c55a5543492bf93ef69508ec7aec
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index 379d1b58aff2..f8c0b15a7e2c 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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 X l10n_ja"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index 5c88efb3500a..e9d0eeaf804e 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.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="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 X"
 
 RDEPEND="
diff --git a/sys-apps/hd-idle/Manifest b/sys-apps/hd-idle/Manifest
new file mode 100644
index 000000000000..8a078834f1d2
--- /dev/null
+++ b/sys-apps/hd-idle/Manifest
@@ -0,0 +1,5 @@
+AUX hd-idle-conf 1530 BLAKE2B a67f5d13a3a204c0e49e66c91c1503d1b9cb191d35def96f3e98ba6f3ce9094559eaaaf5cc974c2bb9f3017c9dfe99461fbf7ba8bf4e48935d30a2ea1c451c70 SHA512 d7f2b2324f3a248ddf0d205ed188aa6c886701bf18189c16284bb16143bda8e3707d30226c69b440058dd9eb4d6222ebe10df7e10c6bbb7c9fd442f88df216fe
+AUX hd-idle-init 296 BLAKE2B e4d2b4a7f7ff816198c7e9b1b5289ec3abb1a928d4bfe50175af2d25d4333a661ad7beaa0c6a6a6fc73775a2e61408e7b6ea2721239648d1e4142be09e07c9cd SHA512 aa26ad5f4d0e97197801ca3e791301a88bcf86f094b338f2c9f7b5000de7fbb91efb9cab8e3b142039b17d5dfb47bf07465a85d12a3ed3594a9d0f38e6e518f2
+DIST hd-idle-1.05.tgz 17951 BLAKE2B f99dd25d41f2ac4391025ff652827a8687db19df2dafe0f07eeeea700eaf0d67a255ee67017123510a3b89f3aba2f50de7204923d9ab85e80138f657f5e120d3 SHA512 8636d8bf2bce40f380afdea859aef7d142258071c62f87884a9af55c7c84310d89de712f56dff2bd825f0c7d79b04356df92e3012d8f683d8c41ebb23cd3920b
+EBUILD hd-idle-1.05.ebuild 564 BLAKE2B ce81e6345abc58ae06f99934760805ad5617d0cea1c8a3541432279cabe53100875c84baaf347adf8ee280b0cda1ed47279f0f3a011bd99b83bebbbf6f1ae531 SHA512 9e2f9fe60301428b8c99e16ab6ea8a2c5b68f36e52a1e0d854cfc383b4d52c2a0c9b841d58be7b3cfefa7ca13a58585485e31fce216bb128409555114aa2cd2f
+MISC metadata.xml 531 BLAKE2B ff7be843730e8fb8168e9ce1f738c1966f3d840e374e89e7e83d4600685b70eb1e08509b6d4e46b5f88bdc678bd22dcef524435c73cfa94f8ba2013967d35d90 SHA512 86911ee41d9874d57984d4d7d526a7a21913bccc3a3b3db52d1d2dee7b7d0cfcf11e1e8b7e3d547ee33036966dccf175a75699721e104401843382cf81b3ccd6
diff --git a/sys-apps/hd-idle/files/hd-idle-conf b/sys-apps/hd-idle/files/hd-idle-conf
new file mode 100644
index 000000000000..a0bd68336e2a
--- /dev/null
+++ b/sys-apps/hd-idle/files/hd-idle-conf
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# defaults file for hd-idle
+
+# hd-idle command line options
+# Options are:
+#  -a                      Set (partial) device name of disks for subsequent
+#                          idle-time parameters (-i). This parameter is optional
+#                          in the sense that there's a default entry for all
+#                          disks which are not named otherwise by using this
+#                          parameter.
+#  -i <idle_time>          Idle time in seconds.
+#  -l <logfile>            Name of logfile (written only after a disk has spun
+#                          up). Please note that this option might cause the
+#                          disk which holds the logfile to spin up just because
+#                          another disk had some activity. This option should
+#                          not be used on systems with more than one disk
+#                          except for tuning purposes. On single-disk systems,
+#                          this option should not cause any additional spinups.
+#
+# Options not exactly useful here:
+#  -t <disk>               Spin-down the specfified disk immediately and exit.
+#  -d                      Debug mode. This will prevent hd-idle from
+#                          becoming a daemon and print debugging info to
+#                          stdout/stderr
+#  -h                      Print usage information.
+
+#HD_IDLE_OPTS="-i 180 -l /var/log/hd-idle.log"
+
diff --git a/sys-apps/hd-idle/files/hd-idle-init b/sys-apps/hd-idle/files/hd-idle-init
new file mode 100644
index 000000000000..650d1934a437
--- /dev/null
+++ b/sys-apps/hd-idle/files/hd-idle-init
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Utility for spinning down hard disks after a period of idle time"
+
+command="/usr/sbin/hd-idle"
+command_args="${HD_IDLE_OPTS}"
+
+depend() {
+	after bootmisc
+}
diff --git a/sys-apps/hd-idle/hd-idle-1.05.ebuild b/sys-apps/hd-idle/hd-idle-1.05.ebuild
new file mode 100644
index 000000000000..4da29a661672
--- /dev/null
+++ b/sys-apps/hd-idle/hd-idle-1.05.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info
+
+DESCRIPTION="Utility for spinning down hard disks after a period of idle time"
+HOMEPAGE="http://hd-idle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+CONFIG_CHECK="~PROC_FS"
+
+DOCS=( debian/changelog README )
+
+src_install() {
+	default_src_install
+	newinitd "${FILESDIR}"/hd-idle-init hd-idle
+	newconfd "${FILESDIR}"/hd-idle-conf hd-idle
+}
diff --git a/sys-apps/hd-idle/metadata.xml b/sys-apps/hd-idle/metadata.xml
new file mode 100644
index 000000000000..6a1a90c15b59
--- /dev/null
+++ b/sys-apps/hd-idle/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>o.freyermuth@googlemail.com</email>
+    <name>Oliver Freyermuth</name>
+    <description>Proxy-maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">hd-idle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 132f58ab94b0..57755ee35a36 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
-EBUILD help2man-1.46.6.ebuild 961 BLAKE2B 10f138e3e25fb00117ba05f43970baabdcaa19ff2e581887278f41b5e6745dc4218f050e85281470e5de284e99c056409472bf9d0be3a557cbb58e8a35d4f6e2 SHA512 73e75acc9f8980950a9257e4e08c11f17cd67bf9965d9917e46c43ffe6ccc66aac1c0ae14df72f6b3f9e1fa4c7ca85d96ce260f76a6648f8fdc7907b70185881
-EBUILD help2man-1.47.4.ebuild 1097 BLAKE2B 59999bef241dc62498aadf9bb49dba91bc2171b673047d3a0c9d3576dab108cc2b592d654750f9f755c8fce3b5dee3447e41a502e965ef1fc4a55de8b6e88a6a SHA512 aeb8da2e473032d185a0ad1a8aef98e69650843ba50685528021a48c1f61a753d9aad9edea6a7f4aae1e53dc8588145ce66eed865486c10caba8b87bddf60cba
-EBUILD help2man-1.47.5.ebuild 1077 BLAKE2B 25c72181d5c9c10789f7cbd212d2e5169d1511e6d4c5e0dfefd07566263c57bbea86bd63091c823b07d724e63a64c4828f33973403f840210a33fd76db121de3 SHA512 8dc708b304aae08f8fad597a1e0537e3f709deda7ba7568c1acdfb3d37fe1c338376310160c16cb2a1e02661687f52ebb68fcc0987a418c57121e78376d2bcb0
+EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
+EBUILD help2man-1.47.4.ebuild 1085 BLAKE2B abe7a2655e5b9766d0d694251ba95b101c893028f425e55ea1c7ffd4272c81f465d3772d407bd22af62633925df1b6ef5f84d066ea091ed55431d8a27dac19bc SHA512 9f3da9258602e507c9ccc89ea45b5e26a4ec948fc9bffb43ddf084f91fd871364a64c5a3eae48ec603f2f838fae8051b9ba5ed819e69cadd101be1b2cc816da6
+EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.46.6.ebuild
index 323fc66a7f3a..3dd0890fd359 100644
--- a/sys-apps/help2man/help2man-1.46.6.ebuild
+++ b/sys-apps/help2man/help2man-1.46.6.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index 2f979facc7d3..4af6edd8e5eb 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.5.ebuild b/sys-apps/help2man/help2man-1.47.5.ebuild
index 8a0794c2c588..dfceeba86d7d 100644
--- a/sys-apps/help2man/help2man-1.47.5.ebuild
+++ b/sys-apps/help2man/help2man-1.47.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="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index f433deda41c9..752b3e819bdb 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,6 +2,8 @@ AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.7.tar.gz 1694854 BLAKE2B a46940da8b71439d803342bb640353498a9ae2ac5516930bcb76042aba9981c50bbe7cd2bdd4feb18e1074bb180d578fb213c151a3d10593985c8b9601eee905 SHA512 26a0c805f2c49102eee44052814a6f7af67c74082489e70b058bd4350526a65aad1e1352e33b12e1afeae5e9e96fd2eb361fc6a112d38782dee58f95c3e2a13b
+DIST ipmiutil-3.0.8.tar.gz 1695826 BLAKE2B 1a20ecdab438c461519db6c9065aab28c07ac26303c3ace0339b1aceb53da73d05e975fa0b73f543a2d1e6ae908ec291d167b545430b85c9744b7a1252d8850a SHA512 9997dac5bc48231ec5333c86cff669bb6b321940497d9e7397763482960956dcf066f27ad2fdf33f4e42033ae2479d8f1ed37fb096b06f9075ad43709b94950d
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.7.ebuild 1336 BLAKE2B 591dc4e0d765c7234b76c0641d5f4f2ac0563bdbbcf461fcee1a4fe9f9239b308fe9f9b5bb0ac5c0730adc75c79b983c5d729ad02608baf31d28d057077d0aaa SHA512 4893b8f52d6e3f4502394f39ce7d622575d73c247315c8752aa6924972e98086e6332bf58c3c2797cbd71b5e1fdc2920ddfe2304401d9d822006343f2cc053be
+EBUILD ipmiutil-3.0.8.ebuild 1336 BLAKE2B a64dab4dff49eaa2f5e0bdf22476e88ce7ee3e780b72e5692247e53bf64b83718b3ac1d407fef7d9bfd93f169dcad4f6074bc5ecbf98ab3d128813be920b6e42 SHA512 63e1c498e25e2dd153d840c3a78f7d9b3d74f4a9ccaee1efd728dde314b7c866875133b89d67f39a5589c97c3b7652ab71647a15a30b463dc1f3a4e5fe86d31c
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
new file mode 100644
index 000000000000..ffa3c3ea3fc2
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake || die "emake lanplus failed"
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
+}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 8f828aeae086..c1972053ed4e 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,10 +1,7 @@
-AUX kbd-1.15.5-loadkeys-parse.patch 2163 BLAKE2B dede07f128792190b91bdb3f1a6f6654b7cc2ed730a2227a0f9efde4e234a8d3f2a0b736868b7901b602ab3d1f506105f86ce64a7dcf4d14c64677f22dd283a2 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d
 AUX kbd-2.0.0-tests.patch 841 BLAKE2B 8162bc2521c6b6c470868ccabca87d9b5e2fa9417f8c4682bf9ff1cb67a0f4fefd403a1a9da99685403c8a280f9d0ed39c06768cd8cb436a88c42ec9ee813953 SHA512 b189b02c509f851bb871d75903dcbbef0177b39db923cf7b3bff4b3058868074975dd7c32bdafb54d50d3e4798ae8648a5b4e461078c86d025257e0502405f58
-DIST kbd-1.15.5.tar.gz 1730719 BLAKE2B 3a331237b235a0731abbfd6d2846bb1fd8e90ba6641559598d7c970fb6be12a0d57f293a7e1d79ac93d5bf4279513825e7ebbbad0c5d13afad5de349fa7b5100 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c
 DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
-EBUILD kbd-1.15.5-r1.ebuild 1040 BLAKE2B b0a2cd71950581a1a7bdcf75b4aa29787ef9b5e22cb5e482c885733be799b02b0d4433fd6a47a50a54efecfc0596d98a9cc30f42e67af9fd831414280f2a2039 SHA512 aea6c477a1527e5f38419c2356bf97e52bbfc9473919b182392d1a0bff96af9d0912b2cd132e4d015889a55e9b3a8613937b1d8e0d847b0d794596309ddc9ceb
-EBUILD kbd-2.0.3.ebuild 1360 BLAKE2B 3d285f5816f752701e123fc4441e9991dceb0d80eb9ee5f84f87f4cdb140306d23f7e7d40abca7df0ce372ec79ad55996e37b0fa6dc0bb67030fc5b8fde00cde SHA512 358c6679bea2e0270159fa07a4578f75c8356d1774e6d9f8def085f94225ac733a3e2e9a9e552485e15d763a0835256a9ea238893dd0280b4435f724cf23edba
-EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B 8eac72198ebbb768d02a6a6e9ae50c6f2f37d1a2938f6f10c0cdea0d053431fabd5864ccc3383bb017aee0b0921e2d90fc4466d03e0ccdea2c3020266c61e05f SHA512 232570febfc48781aca0167cf1ef8294895cf6cf6b497b7a3cebe656685be9a921a4a3693f6f25c52ac714d99a18da2558aef3231de8f1161f3b0cd678359320
-EBUILD kbd-9999.ebuild 1412 BLAKE2B e0ed21760db01f1b81ed5b41225edb1fbc2b7638875fb663b7b4a70edc7a0f8dff5d02aaa289be61d2276035ec56589a4eebd2a3f9bdf2bdcf26a700b8a0020e SHA512 73150ecc4977e06aab03c867d97a9e78cfc749b1261fb099347072a4b07ff6a0fbdfa868c2262ed6d1c8ae2e994c137906aaf70e9a83919ba27025a600594fb7
+EBUILD kbd-2.0.3.ebuild 1362 BLAKE2B 2467e0d4c9d52258b9568b96df23f612bfc894b1861c16fff67d129b0d0345b2b7e6c3c0b9562678905cee44128758d8d6ca007b0f64cf64ce651aa918abeb01 SHA512 1d75087eaf1125646cd7650be96b45b9267751e0f4a278c635f760f30fd7c755f39ec49b7abb2c7fb5821a0357cbdd2ebf830042223f3e2d3da90e9a6fe7da65
+EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B e7c4e92f4ba8c98107dabdf72b2bdc9bb09c3e34aca20e972f1268d75d2b3d48c6959a8b5757343013b8099f43756ef278bbe4135b64b3dc65d312275fcb46df SHA512 cf72dd4ec1e2a68793a4880136abcbde1e5a5e2683bb170c7ecd543b3a3714b5ebe2e069c380d6abf4f18b87e1a3bd1516550a741d445cc529c69e1e150f3e9d
+EBUILD kbd-9999.ebuild 1414 BLAKE2B 3b9e77383bdc18b4801eef6a7758f9eae122b3811dc924c06edad6c3826bf1d2ac68bc8231e7c159565a7fb00e64a026f6479502d9f1c7a791964eb144ecd0f0 SHA512 dbd5f7b4cedc8192b400aeca9f63dbed8d6f65cf075067dfe580ea8b77232e77ba0916e7b08d2cf71a12a78c9a52b697b55de485b1f7c8c8390d067da1a4585e
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
deleted file mode 100644
index c78a22780840..000000000000
--- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/447440
-
-From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Tue, 11 Dec 2012 14:24:44 +0400
-Subject: [PATCH] Fix regression in 16117ce6ab
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/loadkeys.analyze.l | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- a/src/loadkeys.analyze.l
-+++ b/src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To                      to|To|TO
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
- 				yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To                      to|To|TO
- 			}
- {Eol}			{
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -428,8 +430,10 @@ To                      to|To|TO
- 			}
- <STR>\"			{
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- .			{
---- a/src/loadkeys.analyze.c
-+++ b/src/loadkeys.analyze.c
-@@ -1359,8 +1359,10 @@ YY_RULE_SETUP
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- 	YY_BREAK
- case 3:
-@@ -1393,7 +1395,7 @@ YY_RULE_SETUP
- #line 324 "loadkeys.analyze.l"
- {
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -1670,8 +1670,10 @@ YY_RULE_SETUP
- #line 429 "loadkeys.analyze.l"
- {
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- 	YY_BREAK
--- 
-1.8.0.2
diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
deleted file mode 100644
index 7c4451fcab11..000000000000
--- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls pam"
-
-RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	cd "${S}"
-
-	# broken file ... upstream git punted it
-	rm po/es.po
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386
-	mv dvorak/no.map dvorak/no-dvorak.map
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map
-	mv olpc/es.map olpc/es-olpc.map
-	mv olpc/pt.map olpc/pt-olpc.map
-	mv qwerty/cz.map qwerty/cz-qwerty.map
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam vlock)
-}
-
-src_install() {
-	default
-	dohtml doc/*.html
-}
diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild
index 084b72febeda..3d02370de950 100644
--- a/sys-apps/kbd/kbd-2.0.3.ebuild
+++ b/sys-apps/kbd/kbd-2.0.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="5"
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index d1af17e39a9e..aa313ff81c3d 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 inherit eutils ${SCM}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index df8a5adeb6c8..60f4d9718542 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 6d36dbb56471..2072eac569a1 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -14,7 +14,7 @@ DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf
 DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
 EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
 EBUILD kexec-tools-2.0.15.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
-EBUILD kexec-tools-2.0.16.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
+EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
 EBUILD kexec-tools-2.0.4-r2.ebuild 1639 BLAKE2B ffd12a8db13e9075fb7992fdf1c59c52de7f1c950dd25366513db71f41856a977c55e88df61ea3581aefb61ce4ee10abc61cce4048a3bfd32fd3a8925bac26a8 SHA512 0b1fdd825a235646f6589e1043a7edb190d3aeab6ec4dc153235140995d5ee6b09c226eb159182a3cebfcd9ff9251e241ef12fc0313a6f092a8187e197a3ce82
-EBUILD kexec-tools-9999.ebuild 1752 BLAKE2B 42eb31ec7702b158b34894847b838296e1a73c2ad1170740747fb9f4f0605190a4ed898a63f684f9e89abebe440a5fadcef00797a0f66a958cd73c0e889b3669 SHA512 5ce109028b7a097a4039e8ad516deef61e2dfbf012164396d29f28ab013efc8e18c7bd8d90bc71eb18ddc95203ac4b1d8769a52d497d70db46681f05433ccce0
+EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
index f3f01574c051..e691dd6cb127 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.16.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 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -43,6 +43,7 @@ pkg_setup() {
 src_prepare() {
 	default
 	elibtoolize
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 784f7a48e98b..89ef61b3896d 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-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 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -46,6 +46,7 @@ src_prepare() {
 	else
 		elibtoolize
 	fi
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index f3fabf5020ea..b222ab694f85 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -9,5 +9,5 @@ DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2804 BLAKE2B f0f4d4b762592597e38e358c721e6625288ed5b443b37b459d4edf3f285f17d3776a1695d6a04cc24435df297de76b151d2d5ae4939472a88276d72a28db6ab6 SHA512 88cd81319c89a05b6f4f446f22833810e894802809610afc3066df35ad0d426349e964e739aaa34bdc4dab9368d5c728cb791af2486f38f0e966be9c49981323
 EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2951 BLAKE2B 9900bae33b3e40f55f9a8a82de36398fc0933ed73ee6c2e6b3883469f383e8f5c49f0af6321dab0b6b983d903822748c690d768658b53ae44a47702ee9f63337 SHA512 ed51b0f3ef93d81f135b20d5c54ae867221c8da2a4246706c62af409a97a462bbb5c85f587c8951a654fb3a9134b4b77965b7a9b98a094f40db7e5ea6d1759cb
+EBUILD keyutils-1.5.9-r4.ebuild 2950 BLAKE2B bd0aae5077e5f2932a3f7424faf07a8e2f8e943b171c49f3735bee5f35b8741efee5d84756f85c5d4246e1c6b885d90142fa71a3e7b467021e1d18c827ce60fc SHA512 f678e927bb7d6dc199d94c0d821ba2dfd0cbe9c1ca2f43da2cad7fac8a49d9c783ee7a6d69d6b8d210de45dfffb953113078548b6aa47cfd17b750a823617574
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 9a2e98de587c..3ca355e6df9d 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 299d50a4136f..ca1ff7823a98 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,7 +4,7 @@ AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd
 DIST less-487.tar.gz 318488 BLAKE2B 294ce992da39488fe5b50edf80d70179a45a449f5bcf8b93d6735be9f57db708734984f3a58654773155148c96037e2c445dac63abed1bc4ce655a4e472eca08 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a
 DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26aa6437015e152bd74e8231d459c6369457c07f01b62869431c278585e4499b02285476bb70740003d6423 SHA512 67b51f4734a3b5a7871509110f87bbd6d1fa3068ad2d524adaa07b8917ff18a962b706cf5d55cf9800a39f9e583f21d0249837841d3c999babaaf5aa2bc4ff9d
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
-EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
-EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1392 BLAKE2B e553fd8175982f06c0b4aed598df102eb79f0c8d3317966d87c7e81118acdc5ac24077631c393f2086ca4f197483c515742e09caf84f57a3c858df1a0ca6c1ea SHA512 90b9cafcc6541bd5c47ffc742ddcf2a3bcd84e1e7ed979e0f25c5669c973b91647b5b7f08841f529c32de88469342d7cf15471b69c6108b7868e5c1aa908edb5
+EBUILD less-487.ebuild 1428 BLAKE2B f1f6d3a489e2d96d948717877e0f6c0cd57eb0fbb611cc8210f5718cfc68cd02b616195c626501cee03ea2b264089cbf88b26aa3cde47e9aee95c3bfc5a6c8c1 SHA512 0cf3e17c9deab9b81e3e3d17938d84e4008dbc5875955dc7d3aa5514f36556a5791d580a3b897cb36310dc6520ee383e432c47d38b1c2dcc1a4c0c065d39cfd6
+EBUILD less-520.ebuild 1392 BLAKE2B eb779b740776cbb763f13a1e9212c80f5935b03dcfc80d4ae94ffb5efb6499a191551de03b0265c2d6a7fceb2fb5a66f5222368f6c9baa603a1224d3297705e6 SHA512 8b5fd99e7b47fbdb9bb3e079079a33783d5b1ff915a057e6cf6d2f7b23016d4882fe3395778ba173638a2b07593291a5c6ea1840a7fa2e97bb52b96295a41078
+EBUILD less-529.ebuild 1380 BLAKE2B ff64439bb5f138b1d037b658881f5c68e25f37b1d6a85b453c9ae93f23c0bded7e066dd0585a81ce11ca847f14efa60d688b4fcc00f6e13bcbc0b19606d2098b SHA512 a7c281704a9bce283c1ca247f7b9a710879394fc35aaae5a662d16160fe04e56d100e601abf299923b5d29648b7a8493139be2e574a59e37eb4f188f44038212
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-487.ebuild b/sys-apps/less/less-487.ebuild
index 89f64cced928..b1552f3d1c11 100644
--- a/sys-apps/less/less-487.ebuild
+++ b/sys-apps/less/less-487.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 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-520.ebuild b/sys-apps/less/less-520.ebuild
index 643a59bc2b71..84d4144cc47f 100644
--- a/sys-apps/less/less-520.ebuild
+++ b/sys-apps/less/less-520.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.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 78d7018ad037..aa3e5024689f 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index ab7903195a91..e0aaaf12c52f 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,6 +13,6 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3703 BLAKE2B 0b14333d5030015180ab5f5f7ab4794dbbab01d678370481c01f650111901b86f1165a0a8479a51d4e677e3190723746ce97509543289c451429c0c32cf30dbd SHA512 2e6306b888a1c9be4f80f3b7e407cff67e05aae868fbff29c85793002aa209d5d38946c829b717969583017d5564747d7fbe61881640d06b86d9986fb798ec4d
-EBUILD man-1.6g.ebuild 3627 BLAKE2B 00f0dd960a3fa7e7c1949c22bb604bf2c57cfa2ac74a3cd990b94887175da090d5b66059760d97cfc51a6c78ce8f7371e5b4a59248a112d66dde07d3d37f14dc SHA512 ab6b2d67d6944d07a1291c3518c7ecd9d6c69e9d6ef10c5a18794e5808cb34871044ef9e5180e0c45171478076e90bb2fb0919c55fc0cb647112dbdd7554f9e8
+EBUILD man-1.6g-r1.ebuild 3691 BLAKE2B b1b70ac40645756896dbc07bf0e8b03d3ff890b832dd7c4247f67bc040449eac08e115a6c254d949cb17d19b66bddd7df6828e57f6510a3769d32e356aed9cb8 SHA512 345a60fb954eda80191fc035f8925bba5456adda0e8bed8ab210378bb3ad9011b93386c315a4633b080af21d053ec3c644c55d168797a85c38638b0ec96bd30a
+EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index eda4969dce0a..f1ed1ad03406 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild
index c72bff3d0c25..eedcdcab96b3 100644
--- a/sys-apps/man/man-1.6g.ebuild
+++ b/sys-apps/man/man-1.6g.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="2"
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 032b6ad0aeb9..eccb97788f02 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d4293524
 AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
 AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1235 BLAKE2B 7abe58ce8e41918c2074d6e2b0841ca3552a01b8f4e1a7c68a19f806b3f598879e86bee8f4b4805928e471e6edeb0920781835c2f754af0fdac6d3edc5d6c252 SHA512 3c8c616e959c8b5b2d3ae801357f3122b7b50f22c4894df0074d418d9063226c9de9add2c0a575fd99ad59a548897cfef1380817ac0bd737ff8fb90d8203c1d6
+EBUILD man2html-1.6g.ebuild 1223 BLAKE2B f0dd20b17f61ecda6cfe472ebb8f76c6a6d6e57c808036df79a713ebfa5e4bbe3fcd106023036978e68933382f332fa53de34db80690c3c2dabb295fc810eda8 SHA512 6c738ae40dfe4d8fc4943c6aee69d21990848cfe3a89d5253a2f8f344c2639e9fd50cebbb5bb8e09c1c6b8a7a393d6f84ab31df4158c2267e5f2434ee1c5de33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index 605d4798b82a..6edff8090093 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.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"
@@ -13,7 +13,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!sys-apps/man"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 3dd9ae83185e..50b2d1ae1d19 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1855 BLAKE2B 7cad46bb8019cc919355f189acd39bb9ea5547ea69252232dd40881fb29fa55cb769b708b9348ba96dacc955dee9bde5e581fbb234ba22fe7245c354a53246d8 SHA512 9420610675ef25e9f05e3a598d79a9cc5fa12d0048af0b6978d202e393530cdb08ea6083ec3596a1cf235c435c2bd75a1fcd5bcaa5553e5bc2c08ea2b5a8ee41
+EBUILD miscfiles-1.5-r3.ebuild 1843 BLAKE2B 63149a345e6fdfc49282682f7313be56326770234df3a9907c0a7e130f3dab4e319e376f39b8b51aecc811313ab40aa9edea1db57532e23b880dbb64175ec560 SHA512 8b76e4977ba3f7d521c64baf53b44318d2ea7e0e5dbb2d5d126892db88c4001ea2799080c441e0b6aedfd5ee7503a1df05921d20113f900c2efeace4761d259f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 32a2b8071329..60dc54811311 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ee8df8260e16..e3caec6fe5e6 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,8 +3,8 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93
 DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73e370fa00560b77ab0587ba49fb4a49608aba4ad85ed7279eadf54e023961e25784e3078edeed4891956995f38 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
-EBUILD openrc-0.28.ebuild 10123 BLAKE2B 93866eee80dc86f95a4e1f2a506832048720a01608c020108bc20a54936b857b1e5e5c1f88625c01afa482247677977c33c478ef3ef38519693b01e4d09694bc SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72
-EBUILD openrc-0.32.1.ebuild 10162 BLAKE2B 2948ad5e2f905ccd933861ce20c1ccf8dae1a51e3f11086015f250d217c76f70cc87d99ecd8fdfc1f525984f2337841dd0d3eb83fa5ff8c9369fa8f8f476b65c SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0
-EBUILD openrc-0.34.11.ebuild 10157 BLAKE2B c40f4e35c5be8609a061e763521eccea6c6a83f1b3e244157a9100387e68c8a9e300930b217aad9d9f9dd4e234485fd8258cd90d272255856840117a6aee8e8e SHA512 36f92e6cffb5effa0304c2117ae436649d9f2a885917a43c5b71d9c46f6327188d32ac70ef82c30d9d869727341c26ae0776b23b1bcb6e0de9515301c3d4f827
-EBUILD openrc-9999.ebuild 10276 BLAKE2B 40b25d0b8dd57aed46814ad381caa3df4a6b56f3f66c5271943eafd83d44f536d8fd654fa91efe00ce20a51c01f40c871cf0c94ceda41b81ddc89bf301dfd88e SHA512 370126a545dec34a34366badcd11ead8588c58f2e8414c85afb80c3544c94610caa7fb258118a7d2b2b4b289d8c67cd3d7119fd2ff4410613a1a1942be984506
+EBUILD openrc-0.28.ebuild 10111 BLAKE2B a089c38ecc6b602a7a9c94fafbab8d5afae7784578fc9be238fa47039bc218edfeb0935c96531a3b7c350ab11a9c43c60b26e818ee8fd85b5d367222d7118c8d SHA512 0327bd3daab7411065e80c3eef8dad7b14b963ddab254fbafa9e4d62953aa3c05fba8eb3b1b46dbe089add1e6fac95ad6722593982f56a7053dc8c10bc41dd94
+EBUILD openrc-0.32.1.ebuild 10150 BLAKE2B 18205fb38a46193f0134b00570ebc2b11cb873eedbe8a3aa638ebdaefddb3742f49e6e21b3dce100795174ed3cafb347566e7878a0cf1443fc20ddd739d1bb82 SHA512 7d4948ff6de5c2b9027e0f00cd43a9b578d3e5c924683ac8af8d4f817132370297cf1b9fd673bd1a5c473682d0030a2cf3e67ed1f5f89b120c9baee3d31bea58
+EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
+EBUILD openrc-9999.ebuild 10264 BLAKE2B 98b1cb59f635ef3d07d6faaa536964fb5408f613a7418d56425810a9adc579373ab4de9fba31a5239fedc83688aca7dc623d47b1e5ab163ec32152fa52e9fdae SHA512 7198628422361a508f83f3d5af9820296c75636725f39b708ce0f7af53153dc2fee75d781117869f3c5d9d3cba3ab20311d4cd89e0f50b869468cb88ee27e669
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.28.ebuild b/sys-apps/openrc/openrc-0.28.ebuild
index 85f67e95d70a..23e168975f36 100644
--- a/sys-apps/openrc/openrc-0.28.ebuild
+++ b/sys-apps/openrc/openrc-0.28.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 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
index f54f45f0fd3f..87ce1832378a 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.32.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 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 129eefba81e6..83b1d927468a 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.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 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 52c13e050884..dc6f3b58eabc 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-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
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6336cdafe8f8..7e0417a2f62e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,12 +8,12 @@ DIST portage-2.3.20.tar.bz2 956633 BLAKE2B cf166a10522c5fab6b273674be4d7a673b961
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
-EBUILD portage-2.3.13.ebuild 8209 BLAKE2B 1004c283bb2b76242c9abc06664d4370867265c55ba9d62a1f477e769dce602018f6777891ea9f5674f0ae0f86ef52bd13ff5c353f48e7b711a418b2514af776 SHA512 9c190f7b21e34fd33e4d63185cefa011fdd9ced949c8310ea84e959db7834df725fa5d89de22fab958e6942589f44dae2e4b17047c060395ec69f0f7e9bf70b1
+EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b7963b196ec4853bcb3cef900711ae50d0776200d8f9b74e7552022435dd7f260266c90e49b7bc0a4319a082673 SHA512 60ec8c92d5a46572945d90b9136f4b2f7e4fdf439beabe2d03563002075fa8cd3edc6fd101694795837de770e0545aa6083e2023f7a1483161f7355e8327215c
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
-EBUILD portage-2.3.19-r1.ebuild 8411 BLAKE2B 8fef5e60dda148ec909e41d7baec1d4fb62544cc76afbcdeab9e12a0ece109435b3c7c1c330126fdfab8efc3b15a931bb8a8a8a23edde8744ecef48109e04cdc SHA512 4f391d25e2388a39775def36576da9a69d04d6055a61723bd1ec4df75f507759c7060451697a20aeca0e64f7a0df2a2efc1c360ef7dbe6d405a12b58b1576451
+EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
 EBUILD portage-2.3.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
-EBUILD portage-2.3.6.ebuild 8650 BLAKE2B a455ad0c60356d9e27115f20ca098536fe8ba76ec67c44a6244a5cbf1f2aeb3d5700e332a462decd77a78285bf9d2200a41a8487a0c8465b78625f1a9dcfc2fa SHA512 19083847eb304f04dcf63f3362ae6bc6fdb14cdb0f40673841e5155f9c9dd9578734dc93a8b8721cca3546b42a45b838feafc7632b35e916280d55041e5fe1cb
-EBUILD portage-2.3.8.ebuild 8196 BLAKE2B cd4e96948e07dd8f9c055847a6638e95725b8fe49158ebcde1a22b7aac1d23f269160e62786c58e78d6ab0273a555dabc17ff0f2d4560d3b52f5c892f3e7e631 SHA512 6b829c279d6447c6041723e113d71157127bef8d103b9f89a8e0c24b225c599b579f4f6d60b5f207590c79854d035ddc2b4ccf596f8d8f1d9bb93ed2d4dfc49e
-EBUILD portage-9999.ebuild 7951 BLAKE2B a1b82cea5366a9ca1b6291a997328035a5c1d84591028227f3f96f84905ea73b0074ef3e6f90624272ed23b7783971b6425e9609b7e93d77774ec15f6cfa02e7 SHA512 e158702758f00977e4f8f59371ea8025f019cde06aeb2ceb29a2f90a52582fe6a09169ed71da58cf2946d6bd4c8e867aa204141d02bcec7628d24a54bf14365d
-MISC metadata.xml 1147 BLAKE2B 7a665b1c7a67e5f14020c1604c846840698a973885b6ab3d48c1ccd0782504a4ded3b12c81ccf3b17e539a593ee03a7ea23ec1656d65b0aceeeb59cf67e76408 SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c
+EBUILD portage-2.3.6.ebuild 8638 BLAKE2B 0c50b63b0b233cc9d6d13e914659b0057c7f330e05906d4cd7ee19bef5ad2874749a403e48252e321a42e8109213cb7d6861aa7fffe9616447b2587f5d4a4810 SHA512 a80367ffbeaf00d887e0af09e239a8deb7d37818db50a6f3df59aa2c0ed7b8b6fe233f0520aebfdfad583694f1f6b7252d35d00d9bea2943251fd7b216bee602
+EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
+EBUILD portage-9999.ebuild 8252 BLAKE2B 1601f99de425e84989aecc1779a905d48cd4561948a9dffbc071920a7a5a6e56f466fb49b046e0b152efac7073a6aea0b9de0d091fbbad6aeb804074e68fb691 SHA512 5768f872f6024328c926ffa80a755a15cbb93b5cca4c406890964ee289944b53d90e636d6d13712ea4eb71eda0db36a0797814866938432f46f3d06cf32e5040
+MISC metadata.xml 1324 BLAKE2B 3e403e150d3487708ac804f718aee00557810f2ea1c6f3dfa4c37666f3c5ca710b61c00f9fc01404fb88dd96dd675fc81c90021305c3e903dc0ab4f540f206df SHA512 052fc2dd654dbfd81f62646de4c6b6dc38d09637afc2e80e7c98eb20b65acf2e985466700bc8068145f08746cc7ccdb0555c5a549969fb8177b6bd83310669a9
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index c66241962c33..8d4801007bc4 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -20,6 +20,10 @@
         This should only be temporarily disabled for some bootstrapping
         operations.  Cross-compilation is not supported.
     </flag>
+    <flag name="rsync-verify">
+        Enable full-tree cryptographic verification of Gentoo repository
+        rsync checkouts using <pkg>app-portage/gemato</pkg>.
+    </flag>
     <flag name="xattr">Preserve extended attributes (filesystem-stored metadata)
         when installing files. Usually only required for hardened systems.
     </flag>
diff --git a/sys-apps/portage/portage-2.3.13.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index fc6f962041e2..a3f111a6dd3b 100644
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ b/sys-apps/portage/portage-2.3.13.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 04830e6a4b2e..9dd63fc62c97 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-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 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.6.ebuild b/sys-apps/portage/portage-2.3.6.ebuild
index e4a7c2f62378..6ed032813336 100644
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ b/sys-apps/portage/portage-2.3.6.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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index b67871e7a197..58eeac56b574 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 69caf4064227..98724289cf76 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -33,6 +33,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # for now, don't pull in xattr deps for other kernels.
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
 RDEPEND="
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -48,6 +50,10 @@ RDEPEND="
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
+	rsync-verify? (
+		>=app-portage/gemato-10
+		app-crypt/gentoo-keys
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
@@ -104,6 +110,11 @@ python_prepare_all() {
 			|| die "failed to append to make.globals"
 	fi
 
+	if ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
 	if [[ -n ${EPREFIX} ]] ; then
 		einfo "Setting portage.const.EPREFIX ..."
 		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index a238b991c5ef..15d8b31079ab 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,7 +5,7 @@ AUX sandbox-2.10-memory-corruption.patch 1515 BLAKE2B 2c0ef4ca1899efd2d525aafb26
 AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949ee39921f9dafea4445f4cd49d88a5bef9b19769ed0c2c37a7a30fd6e241c159b21aad4f6465ef159ec1652cbb0d4a65e6531869 SHA512 cbefae8aa9c289db0bfe7b2429f64aa4c437be0e269eaa657eb3b22a3086db1fca45a624cb181978b4157f0cb9b475b4ece2eb9337285bf8bede709ad4431c52
 DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
-EBUILD sandbox-2.10-r3.ebuild 2168 BLAKE2B fa95588691da010c6239e89a52e55f5d7b006276e269527319ef2628956f35719af65d918ef046fa6feb2a8c7d28531e49c218e0b26c3c41209138e114300fd6 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc
-EBUILD sandbox-2.10-r4.ebuild 2234 BLAKE2B 7ec0b2ea8c5aa220f6a99bbc7135b5f9ed0d57c119988d37a75a02b8f0797a68c6dd0ad1b90c45a69e7e941b61cbdac0705c53194dfdc61704155e0ae8675b2e SHA512 08ca4e1d4923b663483d097541020725a8f50efc36779519ccf591d4cedc55017d368b474da5b7d010cf15cc3814b5d31937e742b02a327bbb18b225d92cf78d
-EBUILD sandbox-2.12.ebuild 1943 BLAKE2B 3d9e79d200e30c891a3c81c2a779046da49e57f943b500ace6eaf820c536c39643f0c5fbdad3fa9e369f829225ca8aa955470c787f2213f763e1c737e3a09b8f SHA512 238eb5b34c72430fa4854eb70e7ec3ffbc74e387c61ba85c6a05799533951edb0c6b12f6ffa6a877ed887e5e2f5da71d621a204d77ad348a99da83280f677866
+EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
+EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
+EBUILD sandbox-2.12.ebuild 1931 BLAKE2B cd545ca0c7b3b1ca9672e7a0562da03b9eae5dbef36cec7d1eb59d452785ee8f11c03b9a25a9cfe0862a923d5b0f9349c15c6076f9735062cb43505607520b73 SHA512 2a5ec9b1aacfb63d3c4d8f64d067091ab28c7f54ca295a857d14d11d1f4e410c5475cf32d0801cfa1362ce57045da0ef5e1f413a1b56dc541c5efe56d4410d7c
 MISC metadata.xml 266 BLAKE2B f0eff1a6b8face69d2c99fb4c4426deb3800b2b0c4a009ead29e2c5898fa0650e8003c85961ba4c3303053ae9dd6707619d25d03a40e0919ff779c2f1f893316 SHA512 8dcc34d3a08407d6807bc5e30b23c6696dbfc63c19106338780d4e2a61be360e17faeb54af993c962f347ada5d24cb314de866506484b04de4c619d6a88787e3
diff --git a/sys-apps/sandbox/sandbox-2.10-r3.ebuild b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
index 0f7d12d168dd..49e172c3c527 100644
--- a/sys-apps/sandbox/sandbox-2.10-r3.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-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
 
 #
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 4a5c4ddd52c6..29827378c0c2 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 78b591933e89..2a7f3ce6beb3 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 2c59e6789c48..751130fefb8a 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -5,7 +5,7 @@ AUX sed-4.3-dfa-segv-3.patch 5334 BLAKE2B 44cd0e56f46e0ed458ff6e157f28bf2e0f7c5a
 DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
 DIST sed-4.3.tar.xz 1167168 BLAKE2B 5751943cb64d03afef727deba3bee7027a1611b4729c7b33497c28513b61571d1c323f1d07ab68a252a9e45d0f7c95e303f05443310dcae74bedab28160b079d SHA512 4d76a099cf7115763b79b45be5c96338750baa47e34c36075f714e022614397aa9240099d6d009e69aa4d06b6cfc14dcc0f8313442a1465f448b36fb6874a26d
 DIST sed-4.4.tar.xz 1181664 BLAKE2B 03804c209c2108cca4aa991cd68065fd03a15c726b6daf5212603835b5c046c63e9c2e4c28f76dfe165128f060db5b992c981f314d2fe230f30521545d00a468 SHA512 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70
-EBUILD sed-4.2.2.ebuild 1715 BLAKE2B f67af0d6dd4f4b0044ed543b8159c8a2d72776ec8033dd143fbdda07fdbd861c7677b22edf2dc01c3dd7478a5e1351ea8aec6ac04a1182303daba994b822f3a8 SHA512 512f3f3da20b8f556c9d0c65ff31a8c6876bc22f4075831dd3d147d856232f8e97293119dceec902534bc74478e4aaa83bcc0ef87737ae98879beb18bfdb82ae
-EBUILD sed-4.3-r1.ebuild 1483 BLAKE2B ccdaeeddab2c9bd6c5c5d846f03586ccf856a6baddd0cc62e322bfcb1a39713576fedf174d5c33f1079f71c5860124c014fdbc44668296273682dda5d958ee24 SHA512 df98241b8a8f1b1d2bd2ba906fba4ae23d8fd3d1a4a09a129fde9f07261f306863078d27daee401085500be15536b1d87724c75d8382bae7673d6b3d0f75b7a5
-EBUILD sed-4.4.ebuild 1443 BLAKE2B e2fa57152f458ac40576331fd81f9951ad8be58bd29424018b6ad61c6fa2b53cbc719cefa090bf2de63248395f58bef9b05db8e25ce7b043b994e80adbca3a9c SHA512 cb5a40e371063b96b4c7f514944f8da502a83a526718214bf296a62dc1870def5074a1d91d99679011c2ea1619b85b3049f5ee6c77cf1ab911101b7c839bcfaa
+EBUILD sed-4.2.2.ebuild 1703 BLAKE2B 85de6422cc772bb64b6e4ccb3a8e385e21314f266497a30753dd37f193c95ec57f0522488efb6e956f582e34182ae38d13492b01cb3fe90d504b6af4f9ca25ef SHA512 83ad39ac0a61046ddfb1ceab35284b776bf1bac6656f7a60d3e4eee8070febec7bdbfe23138934d0b6fb688142759825deab25eb6988c90b54d269b553cc274b
+EBUILD sed-4.3-r1.ebuild 1471 BLAKE2B ccfc211be1e8ee18580188db738958243c13af4ed0a42934386628a086199bb48ce1edac9609098545f599b352824fd3bbf1e984fbc02dc928676150f010c16f SHA512 a87cb60ca1b125d0db8b90f5cd4211b5f90316cee63d5543ab92e089a1c6782599d66b9fcea2431523126a1e7b1b1230d14c396fdf2c6de1d2704aacee08ea87
+EBUILD sed-4.4.ebuild 1431 BLAKE2B 81ed2cb028f7f748629b8c9b73a2786ed48bab298e92ad10c1b6b5436ac03d515766ad1223d1cff4c8157714abaca950e9791b498fbb1558dbbe8f2609039dda SHA512 d1cc340b33bb8d5ac0565136d9dabf84d261f5496fb0ebfe27f69a2d37dc8031bedb43e610e744d7bd60de0b672afde5e6fbdb4862d556ed960de832f2f7b94a
 MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
index 7c91a5f00047..ad3f071a2b1b 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild
index fcc30b064a0e..b0be9297fb01 100644
--- a/sys-apps/sed/sed-4.3-r1.ebuild
+++ b/sys-apps/sed/sed-4.3-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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild
index fcae761846b0..aa52e2921cdc 100644
--- a/sys-apps/sed/sed-4.4.ebuild
+++ b/sys-apps/sed/sed-4.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="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fd01755e923c..930ed5e9fbe3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,6 +18,6 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 888f373f78f0ba49f91d765b1568c7b6183b2cc2794f66cff37bf1518aa926148ce67411077de68f45419021bd4b99610e4552b1bd7d84dd2a3ce594f109be43 SHA512 ba05ead8530e2276ebde9b5dbd76d129ddb80224cb551114bcd0d55a079597a77b57f1bf58be520b74bbbb419a0c4020cf1039897a6d01c1e839fe3b67cac711
 EBUILD systemd-235-r1.ebuild 13515 BLAKE2B a7c8172b85924b970a5104681c0577c447408d88232eff3dd9a607b86f18952db48ed358c7451834291214432424694e5873719a1e0d2d30888d9747d3313729 SHA512 263a14227163ca7d4a993f150e864a67e7ccc1092f808a14493206f418780453e4e74df3b700cb746060d46da5025d8c0db5841404db09afc13e2e968bdf93b8
 EBUILD systemd-236-r4.ebuild 12986 BLAKE2B 1ea709672003c2864317751b1471e088bdc5cd430a9449fe28b43840d9af53ecbcfa4877bf6a9eb0f96999a5d4ad4c47c7b548d5125196c5df5984a187868210 SHA512 ed6f3ff41b7266f6010e73d67659619836f17f8900e64d0172b335631ae75e2d357af0ceeb5424c691a546e9b4cf5f68ff2a01d766fa73319567a0b628752ac7
-EBUILD systemd-236-r5.ebuild 12986 BLAKE2B fa47e67d13fc1dff405f14d9d55aee478b9cf6efb1ade36481101929f476421703fe75633479a497be7dfe69fa2021df5c73268c5f2adb3c6a17c3fcde708db2 SHA512 9715f12f3a27756a07acafbf8001353c23c6194a5c53d77b52e0a845ccef8d4452e283a79f1e6224dfbd87bf233d96e1e1ad780551c091895b83a4d5691ceaef
+EBUILD systemd-236-r5.ebuild 12985 BLAKE2B 13b9cd1545d7aec213f84c165031b1c07a60b16723ebe7c9ef06b8cb066c0542e4b36faee64b48f29cc12521ca3d145ed8c04c4dbe3299935aa099824acd9eb7 SHA512 4acc78aab5f23c0b620b62551135329940a89dbc4c1cc105fd4cec49c1f25240ef399d568e243a512e6b6fe3e212bfdc4df76eaad20a953089987f3ed8a898e5
 EBUILD systemd-9999.ebuild 12925 BLAKE2B 44e3ff49e2898a8199a1d106de12ceb286e33dd810e6fcc046ededd7f720914c355f5ab189af07b2f8d4951dbee1ad4046fc403fc357d6d6a13c67e67045d39c SHA512 f31ee8d40c1eb31af6a06b58a79c3121b824eec0ecbc0e8d3a37ba77368d8c3f3b96e2167f1d7ca10690c1963da37a0394989c0d4ba8789e39666924c5188b26
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 6066595bd1b7..961530f55ed2 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 6451da8c54d7..ddf41eadfe79 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2646 BLAKE2B 703b3f92cee57f3d2387b9d99ee347476518e05420afe587880bbabd97e23e3f7c3bc5b3854a8f104af848d95e81cc1454e16a3d8452f1b91822f049289b9a92 SHA512 14ee69fbebc7a93bd887284f110d67c33f6079f91d41b9e6b9819f758d73875c300c557378dc1f3146b736730de843be7cc94b7534bf34f5ad81bd23ef828115
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2634 BLAKE2B b9477640f2ba6f1d5de3638d8782e4f96e11e7154093cc0ff0a7427cb85fd6669da6d3b7a3312979e015499704323ab37dae545085c4f058c28b38ba5e7bb94b SHA512 f3a8f5608e4841841eb3d9df67c5fb4a7c1fef9de59c403d561e2336c2f8e4d84312ba7b3d995e9943f9440c670906afc89ec9e4f39ff37edc20f3301c058352
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 041dd954900f..44faddac36fa 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-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="4"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 61c6dc00c30f..743a53f7b6cc 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -2,8 +2,8 @@ DIST texinfo-6.1.tar.xz 4520376 BLAKE2B 3b96ed431288815df4261fcd0266f2be01d27f82
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
 DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006
 DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
-EBUILD texinfo-6.1.ebuild 1118 BLAKE2B f6148426cb8877028d7dd1922f7c3156f3b9d2f670c8b83b2ffda6bd09f04795d7849f07c53f3ef8988f40a3397d7a9b2d25a1dce675c7f1b2488b33bb6a415a SHA512 6b73e1c59c2e8ef12fa8ca5699a5c5b1da4e5f97b969fd5e31c292625a60fa09c7f9301a172a919e127de9287fcd2279a672459c0009d21f6686b2a1152e8165
-EBUILD texinfo-6.3.ebuild 1118 BLAKE2B a0798af983fa3aed9601049874198e02b2609af1e2a41b8765e096d35092f9f3f094da6cbf7490b6ee1301a831e8fa1cd597c47c925108223db99ea283fba790 SHA512 88823b265dcb5ad8dbc185372922338cdb4e8492054c14ac7c4e1f811bdf2a24077f698e2afa0727cee85552326885359d32d56c55bee8b4f085922d7a7983b8
-EBUILD texinfo-6.4.ebuild 1131 BLAKE2B f9fc3ecfe6cfc405fe223a0fb43436df46b3250e89c63fc680446fab541d2adb52c1ac2636b2deed927d1f9e99eb6340b1ed79292aaf370711a07d5ee26fe381 SHA512 b6500793ac06068572006959e5a029b06fe12099b2a6b34fbef76f6ca5f555400595e422ad8b4526ffd07d9c44d1e6ca8702e84b5c470fc9818d0a4abf92b7ad
-EBUILD texinfo-6.5.ebuild 1165 BLAKE2B 56fb3747536631391c7db2e9ea855c02575f8952be4f6bdf6999545814758e88ef8e0e65672df09dd971e2174ed5b093fe5b32b1584462081b3387c97bd04027 SHA512 e60fda9767bd71c97c52bebef5f4fc44369aef6b5a06a75f5368d74ad930976d45191770a56d282376442e5188fa9baea605df4ec90d4b8e21fdf0f12569c57e
+EBUILD texinfo-6.1.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
+EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
+EBUILD texinfo-6.4.ebuild 1119 BLAKE2B 3758a080518277f705a6d0726015e5bb9f1dfbeb3b14bdbee668f3641acbf564d4d41f147a827011f358b0e739307e2fd5994af3fa93210275e717e588c82382 SHA512 3cb88782ece710208c38b506fdb028e03390c6f798fc13a9bf8e2891d0096a8bea5531d16e454b091a6227b905ffc73f4d2d786f3fdef7102637fa3023de7530
+EBUILD texinfo-6.5.ebuild 1153 BLAKE2B 114c01323863fee4903830e36f798eff5b525f3d67618100cfd713ec06a3edc79d960e66ee2973622f5d11d711f7a35880185c103d8da40fa79fc21f8a17f3ad SHA512 5968b0d3b4455e5c6b32c52540c17014566a1a2f7604dcb26ecf01736da6077a002dbf3b17a5170909c26c4ac46ca48b85f07c66fe415c85fcc07d52d4adf991
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/texinfo-6.1.ebuild b/sys-apps/texinfo/texinfo-6.1.ebuild
index 3eb60888fe80..eb694ae0d9c9 100644
--- a/sys-apps/texinfo/texinfo-6.1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.1.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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.3.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild
index 2528cc03f8a6..eb694ae0d9c9 100644
--- a/sys-apps/texinfo/texinfo-6.3.ebuild
+++ b/sys-apps/texinfo/texinfo-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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.4.ebuild b/sys-apps/texinfo/texinfo-6.4.ebuild
index 596690fa8512..f710186e798c 100644
--- a/sys-apps/texinfo/texinfo-6.4.ebuild
+++ b/sys-apps/texinfo/texinfo-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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.5.ebuild b/sys-apps/texinfo/texinfo-6.5.ebuild
index 6e53f592081e..e7a4ae266926 100644
--- a/sys-apps/texinfo/texinfo-6.5.ebuild
+++ b/sys-apps/texinfo/texinfo-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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
deleted file mode 100644
index 39a9765515bd..000000000000
--- a/sys-apps/tuxonice-userui/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tuxonice-userui-1.1-freetype-2.5.patch 947 BLAKE2B 3518851962800934a1183b45246ddd03768eaf47a53b0a0fb44a08e3ed9b75f7d5239098aff7ecde501e25cc9b3e86117386ee8df359c5c65a94c8dd36f57d28 SHA512 7dd5541e61b9093ed4d89de6905ab59f865e305a0f263a92c5978200556e891d6c868fd9eea0737f74274da253c54e118686e8d881ec1af916ad0750d84fd3bc
-DIST tuxonice-userui-1.1.tar 3317760 BLAKE2B 1890802442b84f00bfdad92b8853ec041e1ec04c178ea078564245834e9d8f38b4a416b4285cb33b005a98e240a4277a06da9e47c1f21b1fad6ed699769a996c SHA512 b837e3302437ccfcc7e984817c52576be27c774681abc18b1ad34990eab342b5d11ec13cf48cfef07f419f425c111715843c7ca427a1d4778bd48f1d7352684a
-DIST tuxonice-userui_1.1-2~exp1.debian.tar.gz 7628 BLAKE2B c3bec47cc1c85f440db79274a180c82610a88893973aba89b7e5628c89ebdfe2057df8d257b9aa0f72334124f585480054017007416b7fe19eea529d2cb3c6e7 SHA512 5aebc331452f9d8cac3f3d4db9fcc04c5a68759df2236a70a9fdf5c6e03da27170b1db71031b4b9bb2939c4e5a98c4755d26b6ebf0f81362a71c35e77b688f0b
-EBUILD tuxonice-userui-1.1-r2.ebuild 1484 BLAKE2B a57bb9064ac2798fd0ed22add66697f6a8272cc48adb3a971023aadbc70648f7d9f0c5c968c455934534537261744c106159f6338d322c7c61b0af75207ebc81 SHA512 4ee5a911ac596c1d3b5df7f584105777c5783fc0249fb97bc3080d951938e2021fa4092a28a348999466745a0e49dda9b596797b6677ac776ebf598ba99bf04a
-MISC metadata.xml 567 BLAKE2B 180e1ed20fea8a2ac504eb4638418393eb7dcd43cbca7b95f7ab15ece5057b5ba633968e61c749ced0674f47a596b9e615dcf7090aed1072beb0909440753836 SHA512 748cfd9c9d26b2e92401c08c3d025b93e541a24bceca9bd89a7970b8cd7d2e61966759159a2fcd39a4916a37c740f0953e8adc50a2acdd6523ce91eb14dc1bd0
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
deleted file mode 100644
index f86f99a650fd..000000000000
--- a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ed1b73cf2f073f39200be79c633deb292cb8d4af Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski <gdamjan@gmail.com>
-Date: Mon, 6 Jan 2014 03:06:18 +0100
-Subject: [PATCH] fix #includes for recent freetype versions
-
----
- fbsplash/ttf.c | 3 +--
- fbsplash/ttf.h | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/fbsplash/ttf.c b/fbsplash/ttf.c
-index 384f400..1dd841c 100644
---- a/fbsplash/ttf.c
-+++ b/fbsplash/ttf.c
-@@ -27,8 +27,7 @@
- #include <assert.h>
- 
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_FREETYPE_H
- 
- #include "splash.h"
- 
-diff --git a/fbsplash/ttf.h b/fbsplash/ttf.h
-index 034bb9e..6a4da9d 100644
---- a/fbsplash/ttf.h
-+++ b/fbsplash/ttf.h
-@@ -1,8 +1,7 @@
- #ifndef _TTF_H
- #define _TTF_H
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_FREETYPE_H
- 
- #define CACHED_METRICS  0x10
- #define CACHED_BITMAP   0x01
diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
deleted file mode 100644
index 8dcef3c457fd..000000000000
--- a/sys-apps/tuxonice-userui/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="fbsplash">Add support for framebuffer splash</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">NigelCunningham/Tuxonice-Userui</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
deleted file mode 100644
index 3de4429bd9e1..000000000000
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User Interface for TuxOnIce"
-HOMEPAGE="http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/Tuxonice-Userui"
-SRC_URI="http://tuxonice.net/files/${P}.tar.gz -> ${P}.tar
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV}-2~exp1.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fbsplash"
-
-DEPEND="fbsplash? (
-		media-libs/freetype:2=
-		media-libs/libmng:0=
-		media-libs/libpng:0=
-		virtual/jpeg:0=
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-	epatch "${FILESDIR}"/${P}-freetype-2.5.patch
-	sed -i -e 's/make/$(MAKE)/' Makefile || die
-	sed -i -e 's/ -O3//' Makefile fbsplash/Makefile usplash/Makefile || die
-}
-
-src_compile() {
-	# Package contain binaries
-	emake clean
-
-	use fbsplash && export USE_FBSPLASH=1
-	emake CC="$(tc-getCC)" tuxoniceui
-}
-
-src_install() {
-	into /
-	dosbin tuxoniceui
-	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
-}
-
-pkg_postinst() {
-	if use fbsplash; then
-		einfo
-		elog "You must create a symlink from /etc/splash/tuxonice"
-		elog "to the theme you want tuxonice to use, e.g.:"
-		elog
-		elog "  # ln -sfn /etc/splash/emergence /etc/splash/tuxonice"
-	fi
-	einfo
-	einfo "Please see /usr/share/doc/${PF}/README.* for further"
-	einfo "instructions."
-	einfo
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 99eec9ab989c..130e3ac92ebc 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,8 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-EBUILD util-linux-2.30.2.ebuild 6106 BLAKE2B 2b0dabe265e415e43075cb9fec515e53a1cf1983f9d94141438bad1f1d9cd3c0f577a16a4b8ff6179909edae701ee82e75ecf6ab06799085919154bed8f92fdc SHA512 7a868edc01fd28a910ceea86b47c1c9d663bedb04809ac7cd70b19c80af3f97b53699fa3959fb99a318fe745afecc5862ea590538e9e2bd1555259427bc81e52
-EBUILD util-linux-2.31-r1.ebuild 6218 BLAKE2B a99d0b36f48496caeab7d478664748f6844c9f696c66520927f7b38177daacb88daaa67830216aabc34dc7ef93ab0cf309acb4ce4353dbdec060491ce5c139bf SHA512 7a10a69393c664a9467c254e44b0049352ab4a3c7f72f8187177a415a91a7bf0ed8956a026f41afd5fb94e58d5b236876b25e00e8d2e6f447ef741acdf466a49
-EBUILD util-linux-2.31.1.ebuild 6141 BLAKE2B 6011ed4d8ea642b73ae1d0e30508ba18d53034b0b3c5f5a331836a37a2fb258bdac304a86cab175fb4dff26a0a9df4e888ffcd4b2d8bd44704ed6b8fd052d7e6 SHA512 e2d0d9eed1874f7bd50b467433a6e8eb4c49d9f60d5401dcdf16e6e8154756cc04a2ad6f34b8cd5086f9ffcd83ed71e063195a7d62faaf3032036adfd9d7e438
-EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
+EBUILD util-linux-2.30.2.ebuild 6088 BLAKE2B 90967f2b8c4cf9e5125226fe2bd34a4bf0786e4380316c13ead390daa81165bf39b106a344c0f1de27db1623f65bb0ca17ff285090358d57d68415c66de1c0c2 SHA512 92e96b92c6e6e05b2d828f0f7f41ef99963a9b6fe82dfea85945c7986a67fdb7ba3f8291e5abcd1124fd3973ef415d09f337fdf1828eaf7bba87fb2a2de574aa
+EBUILD util-linux-2.31-r1.ebuild 6200 BLAKE2B ac7a9047da0ba8ca5c3b0d74ffad0279959579573ae921db0e2484ad605b61357cd544762464fddec4a13c30ca71d836ad6c45114b524ef576e15595e6e56464 SHA512 6ac9ff512e5090bce89279e9c91ced5a6d5b654e67827b80041b3998b5ef3641e91cb855fe9a43640b1327c511128c3557a0c5d027add52bdd89720baa04aec0
+EBUILD util-linux-2.31.1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
+EBUILD util-linux-9999.ebuild 6090 BLAKE2B 912da0452d851eef8b8d9dfdf014117a4d62e3e4ef3bd6cc27c5fe7251cf8b08fae6aa9fe8ba4caa1de00f2c226c7550dfcf02f9943d63e8b643ac6fe5dda3c1 SHA512 21f6cfe59cce0a8bb08e462011296fe5f2a21ba1a62fb57de74659dde40f432f9b81bacdd7a6bc8422609bbed73b601204d80147f82bf270c643f1928efc37c6
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index d3177f65d394..80a2fbe2a628 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.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
@@ -52,7 +52,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.3-r2
diff --git a/sys-apps/util-linux/util-linux-2.31-r1.ebuild b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
index bcacb9a8876f..963e973d2779 100644
--- a/sys-apps/util-linux/util-linux-2.31-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31-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
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1
diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1.ebuild
index e9e1cbcda502..ee5b6efcc218 100644
--- a/sys-apps/util-linux/util-linux-2.31.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31.1.ebuild
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6c4f284810f7..998ce9b3d728 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-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
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1"
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 14fbeefdbae9..d24cbfbc2b05 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -7,6 +7,6 @@ AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbae
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r2.ebuild 1501 BLAKE2B d8ed4a6eedd43ecd2e0c5e41dd3ec9d4ab4b893e2f3351fab30f7ad567fee2d4b6d8be5c9c1466711635b06c741de58dc40d8a47c14341b93a1f739613895802 SHA512 17ca405368e7cb718666a1bd1dfee814e0551c83dafbdc29d62b1d843459e8a322d119751363f38ae1dbc95cb4539964a5bba37d02ad71af79f808b96c4901e7
-EBUILD xinetd-2.3.15-r3.ebuild 1596 BLAKE2B fe521dceb32ddf84b2de3b68ed095daed9f9d414fb728f68a23504b28d1b52550d255ed1b68351e749f27a7c9c5782db0b7e1833a051508f98d21ebe6712b817 SHA512 9c4ba8e6a4536d170850070c99db88e3267099b9c467a569e65576a80177335f75a7d0c1b257a89cf63c97c26361065c8c266c6a47c687efed95a22b072589d2
+EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
+EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
index a80e21a8c194..bd8c5d93a129 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index b22a4d57198e..31d86d05cec9 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-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
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 71b8ad306dba..aec8fb0dc227 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 4b1c2c5e871d..b3dcec7989d6 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -7,5 +7,4 @@ DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
 EBUILD elogind-234.4-r1.ebuild 2904 BLAKE2B 01348724ce12ee709bf444794544e1cd15a9b97a976f50c41f0686ad82d935f99a12f081481c22e0dfaf63c99426ec63961b1aa7bee926b377744b7bf09a247d SHA512 dfd1fa283a1110092b32bec7ec6627b3819c44242de6387eac9abbac457f11fe31bb93f76852fbfd1a88e646273eccd884fc90b353cec718f82dbd1ea8759982
 EBUILD elogind-235.2-r1.ebuild 3486 BLAKE2B 53d22fc4d4a6a0d9d44e5f21f74ca1750702c259025fef3a57d6fb821c9bdb47a5dcf61f366c4e7110a579bd673aca91148a22f2c3ff159031a32b79f58718a6 SHA512 8f944e79cd223e81ffd7e10a876417f130056f4b6b4771c5a967013e864d9cdbb7aad4ca9bdcfb3c16f674f377c736333f2c5a6fdd5824ff4650e2cbb46cbab7
-EBUILD elogind-235.2.ebuild 3437 BLAKE2B fd17797c07dade1d5c4250fe638d0458f6be4fc853b145ac39a363da317e5af6d2bc39ea17028f93127df6b12338b057b0270f833e22d0202e6dc06bd92f0c86 SHA512 0b332b0fd3fcd898bc2b5ef74534cddf9d77e109c2a4a9590d2e53c9c93b423d0937f0f5fceadd0e8d5147490846b31dee3cac62cfb94462866ed87d37bc0536
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.2.ebuild b/sys-auth/elogind/elogind-235.2.ebuild
deleted file mode 100644
index d6c31d67e037..000000000000
--- a/sys-auth/elogind/elogind-235.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+acl debug doc +pam +policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-235.1-docs.patch" )
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs cgroupmode rccgroupmode
-
-	rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	cgroupmode="legacy"
-
-	if [ "xhybrid" = "x${rccgroupmode}" ] ; then
-		cgroupmode="hybrid"
-	elif [ "xunified" = "x${rccgroupmode}" ] ; then
-		cgroupmode="unified"
-	fi
-
-	emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}" \
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" \
-		-Dpamlibdir=$(getpam_mod_dir) \
-		-Dudevrulesdir="$(get_udevdir)"/rules.d \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		-Drootlibdir="${EPREFIX}"/$(get_libdir) \
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
-		-Drootprefix="${EPREFIX}/" \
-		-Dsmack=true \
-		-Dman=auto \
-		-Dhtml=$(usex doc auto false) \
-		-Dcgroup-controller=openrc \
-		-Ddefault-hierarchy=${cgroupmode} \
-		-Ddebug=$(usex debug elogind false) \
-		--buildtype $(usex debug debug release) \
-		-Dacl=$(usex acl true false) \
-		-Dpam=$(usex pam true false) \
-		-Dselinux=$(usex selinux true false)
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" \
-		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" \
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list boot | grep elogind)" != "" ]; then
-		ewarn "elogind is currently started from boot runlevel."
-	elif [ "$(rc-config list default | grep elogind)" != "" ]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
-	fi
-	ewarn "Alternatively you can leave elogind out of any"
-	ewarn "runlevel. It will then be started automatically"
-	if use pam; then
-		ewarn "when the first service calls it via dbus, or the"
-		ewarn "first user logs into the system."
-	else
-		ewarn "when the first service calls it via dbus."
-	fi
-}
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 34ba24d45ea6..58d5c566caef 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -2,6 +2,8 @@ AUX mdns.allow 29 BLAKE2B 9227054a8809f3fdb2f08cf317bc72d8ba44e860cacdf781873799
 AUX nss-mdns-0.10-avahi-socket.patch 394 BLAKE2B df775332dc37a4f333985688f910b7b2f7ed6669635c2b6629ef4e01e1877a8d51d4b090a4f21147cd08dfa0dd19a33969ea4be7d24d3497b67c9ded0550e3f2 SHA512 79bfccaab009a3affc44ea5d02b572adbe3637aca27064e6cc5d347a74d36c0244b31f7d95b68f9771af02dc1baa788d041ecbaf5d3632dd3507b52f1559f661
 AUX nss-mdns-0.10-ipv6.patch 15651 BLAKE2B 4fe76fdf2f39295bf6a6084662c396520fedd7fc00e67f5703b69605f5d22b3e74edf56cb8b752665145d5acfd44134b5e17d09533bdb191272e3e0771c68b9a SHA512 8021b5dbb7e484fc29041e54d88a01346ee1dac7840b1bc13caacb4460e7b6baa99d079f34e0b28e9d665e821ccddccc83580f315454c63bf7ba1b2f6ab4c230
 DIST nss-mdns-0.10.tar.gz 353130 BLAKE2B 88cc7cbc908f397bbf52f590946b3bc8bc4c71585c9a0a52648ae3dd23b3f5ca9fbd24f0fc7c34dff08d7a4c8d72fec94a51a65650bed41b07aec6c81220d517 SHA512 7c9f4150648dfab34bc6f8551e5b58b0b7065e4c1472efb8ce1b00b2bd75627e5928b2c199d9dae742abe839968a8774e39c7646f8ce855d342b4d90252efc0e
+DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 5523c76d6f7364efde54b9bf303dfdf34c11b96c9348bfd4a62d095215e7d6f32e0d44e22d21677d51700d458a10f9c36f7ccecb7b4add04fcba629ee19abc21 SHA512 9dceb0f244c4cd27b04ca2014637873a0d137464c26780dfdb228502b06b310991494b115e42e1057c45478361d0e441ec73099fbf56a13a5933618b72390af4
 EBUILD nss-mdns-0.10-r3.ebuild 1840 BLAKE2B dd41dd364d82e918747bf8876953e763d8fd9886cccf9706bd67aa4a4e637f369039fc0148f33bd2db893d3c66a2a92c2dddbc767ec668af62382fde61cdc93d SHA512 50265452786edd3ac7b554904a57fdf38b9a121641363bc14587633efada2017d7b36c7f131740ce69e2a5389fc4be2d4a6b5c52bb6193dd0320891748f3ce5a
+EBUILD nss-mdns-0.11.ebuild 1667 BLAKE2B 35aea7515b9117cacc47f8680886d5d60e63752515712ba654655e127f40e4fdf40fc8ac6967e85d01e8b32e6894b84358d344faf95b5eb199c9fb7dcd9b6fa7 SHA512 4b4f9c48ea0bb498061b98f3add9b06b148e524140b798f3ac0b3a60e830a084506231118cbf3cfd3f7d3795b7c43e9e3dfe036713a03f45b4d8dd694549eace
 EBUILD nss-mdns-9999.ebuild 1596 BLAKE2B 5eac3ed93c9d9d291090b767c6d8c9193e6d0d749cc4d36a7e00fa8dd3bfed6fc99b7c9f6f0ca433f39b3d0257f8d71b02e6897fa039ceec6d181c8246621c65 SHA512 bdb772d5fcb650405dff7baa52049d1cc1943489b65ba0f786c8fb6ab22ea3ab14425a259e04515879b354db918efbc14cb32dbd22d9d628d18eb2fa7a7a1c21
 MISC metadata.xml 795 BLAKE2B 9237e6e6cc772633d1e45db608880c8bf112a361a2914ccc8f413020d31905d10e5822c922659bd500072f47580c63c94a68f54171a259ae3dc28b0b17499387 SHA512 912e8a154a0672a58bd89ee1f52efd8d43cfbeff1f1c40def47d6bd7600fb9b74e1b11dd633ea1ad6f75ef9ae9979ac5b741cfd5df97ea6b0055b060df33c977
diff --git a/sys-auth/nss-mdns/nss-mdns-0.11.ebuild b/sys-auth/nss-mdns/nss-mdns-0.11.ebuild
new file mode 100644
index 000000000000..d93a77b414f8
--- /dev/null
+++ b/sys-auth/nss-mdns/nss-mdns-0.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="Name Service Switch module for Multicast DNS"
+HOMEPAGE="https://github.com/lathiat/nss-mdns"
+SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myconf=(
+		# $(localstatedir)/run/... is used to locate avahi-daemon socket
+		--localstatedir=/var
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+# the check target only compiles manual-use test programs
+src_test() { :; }
+
+multilib_src_install_all() {
+	dodoc *.md
+
+	insinto /etc
+	doins "${FILESDIR}"/mdns.allow
+}
+
+pkg_postinst() {
+	ewarn "You have to modify your name service switch look up file to enable"
+	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
+	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
+	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
+	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
+	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
+	ewarn "and 169.254.x.x addresses."
+	ewarn
+	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf."
+	ewarn "An example line looks like:"
+	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
+	ewarn
+	ewarn "If you want to perform mDNS lookups for domains other than the ones"
+	ewarn "ending in .local, add them to /etc/mdns.allow."
+}
diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
index e17deeb1ace0..d456ac97cbe2 100644
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -2,6 +2,6 @@ AUX openpam-20130907-gentoo.patch 5832 BLAKE2B 994af413f1c2811ec09069f67ad2450a8
 AUX openpam-20130907-module-dir.patch 507 BLAKE2B af0b160ddbd380078f98c5deb443cd21ef39dacc8d61588512df11a2d26d04b788b3b0fcda7c3f4d36ccd87884863155140de5e68d8722f08f4c1fe319dcd2e3 SHA512 724af899dddc1932e841aba2f0fe94c18a1d944e5da35d0ff01438ebecb59888db0dbe66f3882aaca2b56661fd7a07afa5438c009baa704fc9e4534854e5c7bb
 AUX openpam-20130907-nbsd.patch 463 BLAKE2B ae2d50ba4569abbed0fdb127508b0571659a0fd545edafaef396abb74516e4176e42e2893770030424c584cd340d13338828997f0430bd9f7646c169166ff6d5 SHA512 8b9f8729830d47b47972ed3c7cbfca0c9bd5b87a245e0fb3e37594a247c89780f481ec3480285a829c1f86a90d591dc9778f6b2e2a57f718a5ec85d74a21af08
 DIST openpam-20140912.tar.gz 457600 BLAKE2B 8c963d9447c55a4f181e2524f9846d92038b3a5172e14ff0bad15ad7e595455896946f0dcf1d8f6dfcbc571ad01b8565447938a0fe9c001da39611d1d265f58a SHA512 c6cfbd669fe1b67af43a33c33bf2587e1512c27f1b96b9b38df37b81ecc4999d85e04b361b19a7265dbf271ebd3de3bd55342ee4fdbee9c68836b69714706423
-EBUILD openpam-20140912-r1.ebuild 1029 BLAKE2B 354fbd52fe628c580d3d4363af8ab58e8a054a1f4945c13f709b7c58ff3307377d5cc4cecfc5e61d89c67ca085242271e09063921e4e5a5b5d25bccc469e0ae8 SHA512 99fb9f7c41d87c1c7a8aa5110b507eeeb99f56dc1a8576f8071412c20207373150ae098083b438c17b6eed178291d9c82822f32e69361c0e34b2120509c980ad
-EBUILD openpam-20140912.ebuild 1025 BLAKE2B 0269814d9e3b1aa285339dd31b385926a102d299e3c31e727a8353ab32dc7bcb3f6904d6cdec572262c3b8f57fcbf199c8c3871e19ccedc6b20bb2ce62e16f0d SHA512 f9507243bc2a24234250a5cd4f059ff40c433e682453f94ab3a56adc098638bafea3072787e1a976970ceb6d200e5cb01ca2105afa71c1d826f419122c5ed76f
+EBUILD openpam-20140912-r1.ebuild 1017 BLAKE2B b67e38340a4edef4b4ecf7aeb630fab475b29d51229297cf3e76a1a01b10251568f54abbeda44263c8c0401d9bd2582e1cd37dfa99b0cb8a021bdb235af89ca1 SHA512 3051b2ebf950039cd4b504d5d6fcb91847b7a945c395bdfc3e17b9c3e6c68ebb5d0b3a80bbd75037af141ce9dc0817f94c538d19a42b55c5167abd8310372d41
+EBUILD openpam-20140912.ebuild 1013 BLAKE2B 78fd65e4faf3d6b9c77aa7b53684cb160e0e11d36f09e727bd383caf5497e134e8bf741991b885241d092e0ee8da5e735cbaa1bfc5a1e3a85934296ebb98feb5 SHA512 0b6fa63fa8560fe8c7c7c52b4ca1fe66c6cb260d3936d7fa5ea5eed73df485b742f0a569a443964bdad8834dc11243ac057beaa8088423385cdc9a2c34749f42
 MISC metadata.xml 319 BLAKE2B cd7e77def6913851b7c1ef25c47fe3e3548c076e5cb8f86a72886936b4f4601a70fe756f107433cddc1c2a26a0d826bd7e167d875b07003af54623bb4e0eadaf SHA512 e15befc8be39bc70ef094473b9e5fb9d2a504abf27b4217431c0ec707665b62e6a582876abaf280aa074e9f71637e792e9ce7e31d09d9d540502900e6a518975
diff --git a/sys-auth/openpam/openpam-20140912-r1.ebuild b/sys-auth/openpam/openpam-20140912-r1.ebuild
index 9a8583315e19..287db3f24eb6 100644
--- a/sys-auth/openpam/openpam-20140912-r1.ebuild
+++ b/sys-auth/openpam/openpam-20140912-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"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="debug vim-syntax"
 
 RDEPEND="!sys-libs/pam"
diff --git a/sys-auth/openpam/openpam-20140912.ebuild b/sys-auth/openpam/openpam-20140912.ebuild
index 3b84fcbd84aa..f32258087444 100644
--- a/sys-auth/openpam/openpam-20140912.ebuild
+++ b/sys-auth/openpam/openpam-20140912.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="debug vim-syntax"
 
 RDEPEND="!sys-libs/pam"
diff --git a/sys-auth/pam_mktemp/Manifest b/sys-auth/pam_mktemp/Manifest
index 05b058b02af0..d5586b99bf5d 100644
--- a/sys-auth/pam_mktemp/Manifest
+++ b/sys-auth/pam_mktemp/Manifest
@@ -1,4 +1,4 @@
 AUX pam_mktemp-1.1.1-e2fsprogs-libs.patch 1613 BLAKE2B b25f5a74b1235e32c4e8f22efb4f277037d74ab83c83d92c9384d691a06e901e97d2a04440d49173b4f4f1a6eb75678ed4bed1f06ca9117ba9921bf5085b0aea SHA512 8ba4836d9fcf4fd44f8f210c81c9bb3152051dff291b5e9b94f569b94bc1602990fd27defe80a3c971061a94a076aedb1289a06599d16749ebaacac923d4e488
 DIST pam_mktemp-1.1.1.tar.gz 6754 BLAKE2B 5fc3cdf56c7bca9d46c339cc14eb13c74eb590ff4e19824dd2b6e313c2825ae18248873f0aca19a1c7ca8a4dfa5d6944ca9d07ea8355a4c0f7b57567a79b0e3c SHA512 e2e42115a1fe70c128397d842dc69f96863d721dfa886ebc21b5e8249333adc671d74213ecf1222d65417cd4747eb6114f515271fd7eac4376a2b7e28925996d
-EBUILD pam_mktemp-1.1.1.ebuild 1241 BLAKE2B 70e61d39d74ca1331e330ebf678ced712abd8ed2fb6e000c2c15184919a2e9dd3bde9385194a65c56bacd7ffc54deaef921b4222e361950f81cc4dac8ab63c09 SHA512 de42baf1b53ded97a39a36cbd381a8a6a28fc14c0df7789aaa83802ef6cb1a92533e36d1ea02a5a06d1671aafbbbeb68a1525b20ecdb387e5e2a32fb54d66cd7
+EBUILD pam_mktemp-1.1.1.ebuild 1229 BLAKE2B 2364f8817b0dbd574ae1505ed9a033990753a11eb3552b0df0f69129a43e6d4e8c61d6dfd752fac026e4b0c899acef1cb2adc0b517081a19a055e548920293a9 SHA512 cd45157531282ca28ec33834e7781ce8a4bc7ed17b0494ed93f93f1e5c7069cf24e33b4b66e9106454c90ebbbb320ae8e680e6aa0913bbe7d85d9efd4ff94eab
 MISC metadata.xml 500 BLAKE2B e1bd3d3746b998189fc634e6e2f31eae29c5165a84caec04ae9b1beddd9bab7ba6bf4fc1a77b3d3bf5931137e5743658f2ea7a3f9605ab4dea6892b2fb769f0f SHA512 3754bf9bdd145d97ed13da18f21de463a4f8a58f89cb42e4a820a5ac8813ffa0d0dd0df986b6a1e278f7ad58974920e49dd7769e0dfce136106ff3a164a6cdcc
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index e79e64aea6ca..f78bf7517447 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.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="4"
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="selinux +prevent-removal"
 
 RDEPEND="virtual/pam
diff --git a/sys-auth/pam_passwdqc/Manifest b/sys-auth/pam_passwdqc/Manifest
index 8153321e413e..0bfc03410fc0 100644
--- a/sys-auth/pam_passwdqc/Manifest
+++ b/sys-auth/pam_passwdqc/Manifest
@@ -3,6 +3,6 @@ AUX pam_passwdqc-1.0.5-makefile.patch 1245 BLAKE2B b0bca31fa21a9d05093093d04a045
 DIST pam_passwdqc-1.0.4.tar.gz 30572 BLAKE2B e41a8253fa6b05b88181da83244b5191b0bbb406a25ecc6b0de03e0ca9d515defb1617801418b0e5b21e5931b55466fe8a4c7dafbe81776f364deb4d9452fca1 SHA512 f9ea432614b5ce68a76d2fad0d290f5c9400e1185c8a893eb716b232c03c037a5cd725403b4ff74cd432d7368788dca708fafbc1b4305dd14089405d56c540d7
 DIST pam_passwdqc-1.0.5.tar.gz 29973 BLAKE2B e2edce3fa63994afc1f1fe65709ad241662c81113b67f6d17e1c5b36d6ea48be1d7f2cde77766fe2b92da2c22546a71122b95dc70b193edacfbdfd219f56ca6c SHA512 8ae6cb4cc520b06b05fadf60ac360964721a8a1e4481aff9cd7247c203e62b58d3aed4c14ba687b303de820689e0f5cdcf070fd396b7e13b0aae4cc5d1442235
 EBUILD pam_passwdqc-1.0.4.ebuild 1054 BLAKE2B f4549f222721e787d38a07b42890a59d342084590a57ef85b21314226af6e60092a0ecc13f9705e3f45cbb56f920b536af9b2b43c6a46f60719e1a8b4f80c948 SHA512 c146b436d0f0fb13f466bb0b21b5482bc5b94ab11398d4cd610b102ab9e3eca3734953db455b9d3c0da6c351a5f182d256181b6956f13016e19842f25c1670e0
-EBUILD pam_passwdqc-1.0.5.ebuild 1120 BLAKE2B 1c62c486cbe9d29c43fb111b49b76b3e8e3c72cb7ccf6aabffff1731ef930b759f199b29c58ab053ff5279448a20c45da1edba0c9a7489e04f4de4a333ef0318 SHA512 04c7befb362ead9947121fd20bf40a8f6dd5dd359876ce6359bb86a6928fe72705921fbb4635cc57c21935d7e4691380e98c82c0874cf96dec5afe7c288934c1
-EBUILD pam_passwdqc-1.3.0.ebuild 480 BLAKE2B c053524c4f960a383938f54053bb4ad40cf65d375b8e0f7a5dc85db5586701deaedc4ddf64ebe85b18b063370e51f0f5b25370e17f7fba33ca890aaf5253e013 SHA512 c8344e37c9c64488a6e7cb14b93d34e761ffecb699e5e4263a0f7c4d8efb216602bfc6deb457774fe79aa4084d31f214789713af0f328b03f2be0a15cfe845c7
+EBUILD pam_passwdqc-1.0.5.ebuild 1108 BLAKE2B 9a056485a1341da8c89e4cc7db288950c07a26d36a5d4affbfd02add1f70041c84e4e7541bbb89b753b35b353dee3fbbf41eb19d61e6a612ec64a523e0966a2b SHA512 c085df0c8499b9753d0a46a038c42487c84ef689dd44754d2683ccbb32a65d84e7560e45f96809b18ca58160471bdd64d1f6b9634694540a635798557540b57d
+EBUILD pam_passwdqc-1.3.0.ebuild 468 BLAKE2B c027d68c3f8e10ceab33b26ddc89316176eed36339558f68a496bf049eb6cad562e2ac8b59979a46e005c588703624e9ee21e6ac2c0acfb13a566f109d6e201d SHA512 52ed3e5fc99572c43a3c50cdf12c12ecaab89d46fd4f2ad965521f172144f1cf984bc0035a5ae144c6a23d0ec892c6dd3d078fa6299af306e83341fdb582d633
 MISC metadata.xml 586 BLAKE2B 677f93d293a7ffad0551bb35ad9b281ecaf31c62f15f64f0cf483c6f63048820bab11e798d1d69bd1cc13c27cba56f47632b3ae848add5d9490b051afcf96bac SHA512 09dda48a697cb4ca6fdd114d471bc8d0045903376b231b74e70f6f561862c5c79c2c5ed002e1fa41f7d1d63faa9c66d8d3b30fa80e7338508dd3a18bb1dc1b98
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild
index 106358f09379..99663893cdc8 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.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
 
 inherit pam eutils toolchain-funcs
@@ -9,7 +9,7 @@ SRC_URI="http://www.openwall.com/pam/modules/pam_passwdqc/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 DEPEND="virtual/pam"
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
index fa6c22ac00d2..9d9ab28e9169 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.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"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.openwall.com/passwdqc/"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 DEPEND="sys-auth/passwdqc[pam]"
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index fe9db845f14a..25b6e2f438f5 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -7,9 +7,9 @@ DIST pambase-20101024.tar.bz2 3201 BLAKE2B 714da8dd0b354cee29ad175a0ed2094fba8f3
 DIST pambase-20120417.tar.bz2 3361 BLAKE2B 6b2799de56deb59cfc50c807700949072e221c2fe8d66fd6fb0150bb636390de51171c3af0c252c878f25d24d367cf53053aebc3cb392a6c06c86c4aafd06c45 SHA512 7a666eb67f6484e536ecb070402036bcfdd137aced27df3f08b136d06eee5c13a6dc14aa93ea09e94c7f31e5a98db97dbaccd0c46af24b57028247de3a7cd9fe
 DIST pambase-20140313.tar.bz2 3417 BLAKE2B cb18ba77b18e6bf5fc9a902370c4f6db96046f96f38131c33842c01903b683b4c7b69edd3976102fe85bb54fef00f56544a64d0402c0c1cc368ecc6ea30fbefd SHA512 76dd2a70947dac9573d47b81764ebe4f829bfd38d59c007e698a52c70757fa88525f510c14a1f474c58e3d33cb421ff61aa4ed1aae54497456004eff7494bfc8
 DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5ffffff4dc5d03091592726c8bd7775ba1573091c8616aa891298a1fe309b19885b5ec21efb45fe38900b7c959aaf5 SHA512 3b49dd3f06a0942fcced95527f62cbc4ff723c48dc896a0b57ecd19736d2892db974c782be3fe24e8e6e17294869a772ae9ee6118af96dfdc7a3a6561dc3f3e5
-EBUILD pambase-20101024-r2.ebuild 2872 BLAKE2B a91dfd6088cca6723fbf54b26ca57a3dd9384e11225ecb1eeb19019b1ce38ec28beecc46af859ec7571e96dbf693569043f385411efdd32f519b3b8641e239d8 SHA512 dae48108ff6a795c37206df6b21a1d67ff788881fc29df47e5e40bf1e2122d330e0d6a3117e87460066f28931d4ea17f54a9fbff2fb840cfa7af7f173db3ca8d
-EBUILD pambase-20120417-r3.ebuild 3493 BLAKE2B b99aebe17c021dea51820fc68eaa2a93ca24efad58cc1deb74a3c899246d1ecb7fab1b2bbc651483bec59cf2dfac32905ba7ad3c7f1d8ec248a9d395ef9c0072 SHA512 434ad0a1bbd1af08dc67a138b768c20d8ed3caae40dc206427d5e6496704ee874a85a727503ffd5319468a2adaf09247eb8872eff548231e1d3cd1df5a49eda1
-EBUILD pambase-20140313.ebuild 2727 BLAKE2B 18f5103496e3910bba1985bea7d49b46c9d4477b0901627638ecfa615ff0c178ce9ac01a30ebe2f776eecfd04d3dcc9c1948bcc1d04744c6207d153253a3cc2f SHA512 1b5185f2f8436d6c548186ca376d9f1aca1a9ea2f6adcdea4166706e9e6a2cb3ac963220d5dcd642b85b2b6b0bad1a28b9e2a095d17912becd725cf1916487bb
-EBUILD pambase-20150213-r1.ebuild 2919 BLAKE2B 72968c07ef6fded191ccacf473f64468cd359373bc9881775846da1ba269f3a74d568378e7e7eb33d593a5bd93642e8df15b2dd48b1ee68d56b6c6b6a04cfad0 SHA512 ba5e19b8fb61046211fe84610b8d842953aa79bb6ea647911683572a0ade81995739891afde8244abd63e28e8add0dbcc689c568790816c11d5c7c1191493c7b
-EBUILD pambase-20150213.ebuild 2850 BLAKE2B 475f9c8354c01dc2df8eb5c543273f869d030ba9358a9cd9307fefa376153211bb852f79103df5927af127311269ac220c6e0df65c18dabb7610252a7dce3668 SHA512 fb62cbaafba6033701462a664979c0eb1cff1e553966a21aa87d4b87a3c25ed93b8a3bd483caee23850f6528da8a82107ca0460d21ddaf920b630f6d6c213070
+EBUILD pambase-20101024-r2.ebuild 2860 BLAKE2B 19fb426e4616b3a30b15836e1bfe18043b8c1582923d7fa44ff59bf0c4e3efca2f135445a21fded999da98ef380d2c3cb6e4aaacba6279dbbca083a3504ce848 SHA512 c15842f7a09d523d7f8b72454231ed73b5004db6c6f7dfca1c4527c9eb313627d990a61bc1afd3743c1343a222b867bbbe7437c41f0d2807150a5c189a232f7c
+EBUILD pambase-20120417-r3.ebuild 3481 BLAKE2B 2da3d279cf497f0d74a0a54810facece7f7bbbdbee38345e679f93d92d1d6f51054d21913e96e64d10efd362c31de4abfb8a21e6427efd9101f1b7e5fe9e2a5d SHA512 0202a6cfdfb3b0a4a17a8b930da9287a9344a67556cbfa70b8d56e29b2adff9bc93d44ef5334cbe4ea403ee488cfbfe4d05bf0d41ce0b08c99a41791a4410429
+EBUILD pambase-20140313.ebuild 2715 BLAKE2B eb570efe39c34187f6c4daba1af49ac00ddd7e591f1104b92232b2c41ac330cb6097aa2503775c76f00a52e5254b36e42dc7a45f59a1a6dcf3fb4036b9a4637e SHA512 db18591e0312c974699c61bfd0a2921b7dee5698a5fda36dc4f8ab5dc4b3986938695a4d88dbef6ee37eb21c9c840d951f58c43dc6244af6875e1eab3a1bfe2f
+EBUILD pambase-20150213-r1.ebuild 2907 BLAKE2B 2bed6e9773bfd859f76b963d167278e773238ff79f98b99bd9ad221daf1cc9c4bd93ba962c8cfe3f76cc3cc5d7cd628326e5e32b69d4dddce24dcd03de3304a1 SHA512 d397c4bca37353cf4dda0c060f84b45a94c5064ff3e5bbfa6dec867d53ad08eb8fc83a28dc17e0ee6ee2145f84d61222dd0797416c029144b35717460f4a6d0a
+EBUILD pambase-20150213.ebuild 2838 BLAKE2B 88613a731e5bc85e9bc0c0a9729e8ebe4756850c88db600a1b01e8af1ab4443e75646b9b895c28df3a15a6741729c4b7e3542526efd4620086d86b2cd860939b SHA512 d363ae40b81787a44f889e26ae7ee82bc9acdedfd51cf56ad095b04756624a1b773e54720a71fb8d3b94d39542f931c68132dedb76f773b709d6508e1eedf965
 MISC metadata.xml 4297 BLAKE2B 53d6b14f5e6cf707666441f1bef3c975d43f33387ceb482dd7c41e97b2771466a02efb3db1c881d354bcfff42010e1da47a28579972169e3c7edac33f43f565d SHA512 d717c2916e154630a756f7925794d43d43c5881bc9df53b82b35f86104366902a76f2d9298cf5a8511431084f0103fe91234c5e4172555677bbdc00db0a73a04
diff --git a/sys-auth/pambase/pambase-20101024-r2.ebuild b/sys-auth/pambase/pambase-20101024-r2.ebuild
index 32857376c331..ee8abafc4bf7 100644
--- a/sys-auth/pambase/pambase-20101024-r2.ebuild
+++ b/sys-auth/pambase/pambase-20101024-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=4
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
 RESTRICT="binchecks"
 
diff --git a/sys-auth/pambase/pambase-20120417-r3.ebuild b/sys-auth/pambase/pambase-20120417-r3.ebuild
index 4aabe801bbaf..60ead91bfa45 100644
--- a/sys-auth/pambase/pambase-20120417-r3.ebuild
+++ b/sys-auth/pambase/pambase-20120417-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
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd"
 
 RESTRICT=binchecks
diff --git a/sys-auth/pambase/pambase-20140313.ebuild b/sys-auth/pambase/pambase-20140313.ebuild
index d9ecfd162fca..5fdee1aabdc9 100644
--- a/sys-auth/pambase/pambase-20140313.ebuild
+++ b/sys-auth/pambase/pambase-20140313.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 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd"
 
 RESTRICT=binchecks
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index 70909df20d85..103a3aba7d6f 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20150213.ebuild b/sys-auth/pambase/pambase-20150213.ebuild
index 436571bbd530..598c3a6d1d5f 100644
--- a/sys-auth/pambase/pambase-20150213.ebuild
+++ b/sys-auth/pambase/pambase-20150213.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 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT=binchecks
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index fd97ea4192d7..717f79dde2c7 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,4 +1,4 @@
 AUX passwdqc-1.3.0-build.patch 1773 BLAKE2B e954aa56f4f12c57430b9c53cac9220360b6450a747fd50305db8838638833e5f76fc893be762593f89ab02b665499fbc4063dfd7ad3019134ef81771e3dcc50 SHA512 da43381deab4c39e8c905187f17e49379e44b96c729d229a1fa5aff067b510fae5cbb107896fd83273cc8f41e916023eff5d1b1f37ad739e4de3cf3945f289b8
 DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece
-EBUILD passwdqc-1.3.0.ebuild 1759 BLAKE2B 78f37f0f97355bae529158f85fc5bf114db1fe902481da4f6013b4f053f9cbfe68e5d45e8f56a18be2dac501842b3e06f66442fde6f8c775d8e2c649d6a551f9 SHA512 45fbfbf4801be9a468f187cae927be9187d878ca74d43ddbd73aaa2c735920012a7cf6e02acce156ecfa60556ac75101ce63f5dea8cc766e4576524a519e3fba
+EBUILD passwdqc-1.3.0.ebuild 1747 BLAKE2B e41ceea3d43fa3cf190ca09d79f43eec4b9325baac25b5314d25aae5b219ed9c037d482b55fcdc55681a6cd632c9643e378a0e51e10ecd4f9b189d685c7924a5 SHA512 45ce5b8cc4284cfa71139488ac123fffda7eb1cbf86833cca143bcff55f5ab160afbfbf8c4a76ee4cdc7f05bc90f1c5ebab0565c0d829d8d51ac3bb44a0be492
 MISC metadata.xml 662 BLAKE2B b333bab0638e13f850a6d5c286a6393bb79d7fcdc200a44350d16b24e9b9f387d4af7edfc870ff250d6ceffbeca1b15a97b6d9261e393a15e4ea8c81ec797c2b SHA512 3490b4727006ed7dc497659798f36c6c2ca84855f5aa782394de05285e30440853e2ca746c3d3b2ec018609a1c1ce24d5c0a7dc866f68354e12de5a8db4f3a96
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
index c2f29505f944..51ca6354668a 100644
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.3.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"
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="pam utils"
 
 RDEPEND="
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 1649983d67ed..270c06abf9ec 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 7f583dfdf4a3..5a2cd72487ef 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,8 +1,13 @@
 AUX blktrace-1.0.1-ldflags-parallel-make.patch 2951 BLAKE2B 478ad1fb6c00c6d7813318b34842ecf779946b2267d52c1c17e21430a52cae02f0268f30146b67486805ef770c03fdb8ec426854aa2e37e37a02627a62f69334 SHA512 b384b90d86e52d8a314efa2bee2ae67ed562d56b2c2412211e28cae9dabb448378fe083e0dfe30b6462c5e5d1d85ad7fda6c7d81e3ede0da5ba4c73606b36c7b
 AUX blktrace-1.1.0-ldflags-parallel-make.patch 3043 BLAKE2B e6c3c6fd23795f18665ddc39ab55b351c1250cdb29bbbc171d8fcf4f0a0f2b2be94e7f697e2fd83d1dc56353aa98a8604fc540cb82e5c2800990dee0b9c01fbd SHA512 d119ef833ca50527a9f2705ff4a741a9d091625286253bf0d7440f695326eaa753232965bf69a6dad4ea24cf411ef2a992d4226e009d9b4fcadbec616c384fce
+AUX blktrace-1.2.0-ldflags.patch 2748 BLAKE2B 2e5bb94aeb829d6f187bb22c109f732fd442df20c1da4acc4cb31fff46d51e9dc37f0aa2c2bceac661c334c0f1727214fba4ee22455e4df2a58efb817d9eb1c3 SHA512 d0a411020f7ca01beea5c7915e1d934c93120d86111d789fd2c7719d10b116e56634b86fe5f37717e104c6493bbce2878df2abf9ddea8ba87089cb2f0a01c084
+AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70bab6f4b1c0843452cb1ec63b5d3efda549b0ff99d01170e43b9bcb8ab9ccb3206792aac7f69bc1b1fee5e39378159d4c30463bc8abc3 SHA512 b72a7f6bb03105e7e10116c70bc79d4fe131f223cf5d56649850f777c59226a8c78d7f0dc758fba97891f2f29bde903e41c7bf5e04cae710058a3e38017c02b7
+AUX blktrace-1.2.0-parallel-build.patch 2300 BLAKE2B 87ff4b31b845aee1fe8f14a8a6d35d08d386969eee05c07b2e1b3de2fa2f039d49d699228ef01793cee935ecea5517c9603956866ac3f677eafbb153f9b5382f SHA512 fbb2b217b73072e408e1bad7e3b663935cb005c4ee5cf3dbb1d02cc17b55b511f5982e108545159d0968e8b6ec759441953fd127ad0beeb8661d51fcf9ba6ca1
 DIST blktrace-1.0.3.tar.bz2 359325 BLAKE2B c776fe0445eadbb2d077435626e6ffdd330ba2f49d053bfd247ed7f421b9bd588d38acd32133ebac69e0fc63f165fe0e6b3324bf8313a14000cf02e3a5e735cf SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5
 DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
+DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
 EBUILD blktrace-1.0.3.ebuild 1341 BLAKE2B e0e7f346df9458c282dc3c5a182979ad5482564ebf179b37d3b0115d5df3d32265aa9dbf01d5569bb1ce9e57023f506c817b1fa89bd868a1b370b848864114c6 SHA512 2808c804ef3773220f218d0c8bedf43712df81be86dabafd5276e6e20067f4d42820c01661db5e81d38d312db51c3ab79f959debb87f91f9b153448401ac3215
 EBUILD blktrace-1.1.0-r1.ebuild 1257 BLAKE2B 06ba4fe01da853678b04b1906768ee1d4d2220b151ca7664538222fb90d6b8f8a4bba7ce488b93e5675b83f087df50f0295f603fa0ce9d438ce5b6dc57526947 SHA512 0468940d295b87c97cb8e81d831a3d1d83fccc3cf5e23be6035f9012a6ae51a9f7651e2af49a3ecdd8b1667fcd7a2cdf3575ab0a306f10e5bf7c00c7ee37ec77
 EBUILD blktrace-1.1.0.ebuild 1265 BLAKE2B 4a56cd81084a917894c128ed7b0ebe3049d986a50cad10d3f49124e5134ca9cbed52a1f9e6c81985fa7d57d4b76f2c4f2063ec382eac7b41643d0efb8755fc78 SHA512 f25ba23b7f908e4eb9f07df183bd61546e9f221f04de9e1fe203e55854e76ba78c77bf8cc4eda2eef1e57b30734dd3fbe2e33d6816f2d177057590ad0b00d5fb
+EBUILD blktrace-1.2.0.ebuild 1350 BLAKE2B 8ab45bfff4a8f91fac5b751913995bd42e1bebb4d070039c9a9ff7596ea173f2b00f59b4d44c6c0f9d074558070aa2f6440e517015341df7891b2f5bde86b4aa SHA512 2ac7416257f4b43d6da7aa16c10852a27329957a1e2193957260d359cb15410dde1ff9a574cdba5387779858bd201999f652593bf164d2e4d4b1e9588b14086c
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild b/sys-block/blktrace/blktrace-1.2.0.ebuild
new file mode 100644
index 000000000000..063a913b54ba
--- /dev/null
+++ b/sys-block/blktrace/blktrace-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic linux-info
+
+MY_PN="blktrace"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="show detailed info about what is happening on a block device io queue"
+HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libaio"
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		virtual/latex-base
+		|| ( >=app-text/texlive-core-2014 app-text/dvipdfm )
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="~BLK_DEV_IO_TRACE"
+WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-overlapping-io-stats.patch
+	"${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
+	"${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
+)
+
+src_compile() {
+	append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake docs
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
+	einstalldocs
+	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
new file mode 100644
index 000000000000..b8e2aebfff4f
--- /dev/null
+++ b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
@@ -0,0 +1,89 @@
+http://git.kernel.dk/?p=blktrace.git;a=commit;h=d1398e339585f6750f7158c50c98861b68dddc8b
+
+From 6d8c3d7a10f62b26514a56b25a3744c5f35219a6 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Tue, 23 Jan 2018 17:40:48 -0500
+Subject: [PATCH] respect LDFLAGS when linking programs
+
+---
+ Makefile           | 10 +++++-----
+ btreplay/Makefile  |  4 ++--
+ btt/Makefile       |  2 +-
+ iowatcher/Makefile |  2 +-
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fdbded02ee0a..68de59183a73 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,19 +26,19 @@ btreplay/btreplay:
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blktrace: blktrace.o act_mask.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ verify_blkparse: verify_blkparse.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blkrawverify: blkrawverify.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blkiomon: blkiomon.o rbtree.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
+ 
+ $(PROGS): | depend
+ 
+diff --git a/btreplay/Makefile b/btreplay/Makefile
+index 2998182401e7..f574a2976ec1 100644
+--- a/btreplay/Makefile
++++ b/btreplay/Makefile
+@@ -32,10 +32,10 @@ clean: docsclean
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
+ 
+ btrecord: btrecord.o
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ btreplay: btreplay.o
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ depend:
+ 	@$(CC) -MM $(CFLAGS) *.c 1> .depend
+diff --git a/btt/Makefile b/btt/Makefile
+index df7a3de6b3fb..32075573954c 100644
+--- a/btt/Makefile
++++ b/btt/Makefile
+@@ -38,7 +38,7 @@ clean: docsclean
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
+ 
+ btt: $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
+diff --git a/iowatcher/Makefile b/iowatcher/Makefile
+index e013556f3ae1..a224a0848cc8 100644
+--- a/iowatcher/Makefile
++++ b/iowatcher/Makefile
+@@ -19,7 +19,7 @@ all: $(ALL)
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm -lrt
+ 
+ depend:
+ 	@$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
+-- 
+2.15.1
+
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch b/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch
new file mode 100644
index 000000000000..11c495efbc0c
--- /dev/null
+++ b/sys-block/blktrace/files/blktrace-1.2.0-overlapping-io-stats.patch
@@ -0,0 +1,68 @@
+http://git.kernel.dk/?p=blktrace.git;a=commit;h=8fc451c6b0b9a7db7c376ea6865c35321e561f00
+
+From 8fc451c6b0b9a7db7c376ea6865c35321e561f00 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Fri, 18 Aug 2017 15:00:22 -0700
+Subject: [PATCH] btt: Fix overlapping IO stats.
+
+Keep scanning the tree for overlapping IO otherwise Q2G and process
+traces will be incorrect.
+
+Let assume we have 2 IOs:
+
+A                                      A+a
+|---------------------------------------|
+       B                B+b
+       |-----------------|
+
+In the red/black tree we have:
+
+                    o -> [A,A+a]
+                   / \
+                left right
+                 /    \
+           [...]o      o -> [B, B+b]
+
+In the current code, if we would not be able to find [B+b] in the tree:
+B is greater than A, so we won't go left
+B+b is smaller than A+a, so we are not going right either.
+
+When we have a [X, X+x] IO to look for:
+We need to check for right when either:
+ X+x >= A+a (for merged IO)
+and
+ X > A (for overlapping IO)
+
+TEST=Check with a trace with overlapping IO: Q2C and Q2G are expected.
+
+Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ btt/dip_rb.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/btt/dip_rb.c b/btt/dip_rb.c
+index 2aa7ffcc763b..6efef6c03b8f 100644
+--- a/btt/dip_rb.c
++++ b/btt/dip_rb.c
+@@ -57,7 +57,7 @@ struct io *rb_find_sec(struct rb_root *root, __u64 sec)
+ 		__iop = rb_entry(n, struct io, rb_node);
+ 		if (sec < BIT_START(__iop))
+ 			n = n->rb_left;
+-		else if (sec >= BIT_END(__iop))
++		else if (sec > BIT_START(__iop))
+ 			n = n->rb_right;
+ 		else
+ 			return __iop;
+@@ -82,7 +82,7 @@ void rb_foreach(struct rb_node *n, struct io *iop,
+ 		}
+ 		if (iop_s < this_s)
+ 			rb_foreach(n->rb_left, iop, fnc, head);
+-		if (this_e < iop_e)
++		if ((this_e < iop_e) || (this_s < iop_s))
+ 			rb_foreach(n->rb_right, iop, fnc, head);
+ 	}
+ }
+-- 
+2.15.1
+
diff --git a/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch b/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch
new file mode 100644
index 000000000000..129f04107fa1
--- /dev/null
+++ b/sys-block/blktrace/files/blktrace-1.2.0-parallel-build.patch
@@ -0,0 +1,71 @@
+http://git.kernel.dk/?p=blktrace.git;a=commit;h=519fd9a5d08d85f3d9cb4192d624fe8351e40232
+
+From 4569544261be495bdec0574d7729c85a62dabad7 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 3 Feb 2011 03:07:06 +0000
+Subject: [PATCH] fix parallel build failures
+
+When building in parallel, the btreplay/btrecord and btreplay/btreplay
+targets cause make to kick off two jobs for `make -C btreplay` and they
+sometimes end up clobbering each other.  We could fix this by making one
+a dependency of the other, but it's a bit cleaner to refactor things to
+be based on subdirs.  This way changes in subdirs also get noticed:
+  $ touch btreplay/*.[ch]
+  $ make
+  <btreplay is now correctly updated>
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 68de59183a73..5917814d0344 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,23 +4,19 @@ ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ PROGS	= blkparse blktrace verify_blkparse blkrawverify blkiomon
+ LIBS	= -lpthread
+ SCRIPTS	= btrace
++SUBDIRS = btreplay btt iowatcher
+ 
+-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
++ALL = $(PROGS) $(SCRIPTS)
++INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
+       btt/bno_plot.py iowatcher/iowatcher
+ 
+-all: $(ALL)
++all: $(ALL) $(SUBDIRS)
+ 
+-btt/btt:
+-	$(MAKE) -C btt
+-
+-iowatcher/iowatcher:
+-	$(MAKE) -C iowatcher
+-
+-btreplay/btrecord:
+-	$(MAKE) -C btreplay
+-
+-btreplay/btreplay:
+-	$(MAKE) -C btreplay
++# We always descend into subdirs because they contain their own dependency
++# information which we don't track in this top level Makefile.
++$(SUBDIRS):
++	$(MAKE) -C $@
++.PHONY: $(SUBDIRS)
+ 
+ %.o: %.c
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+@@ -85,7 +81,7 @@ install: all
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
+ 
+-- 
+2.15.1
+
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
index 62a385db77f7..16cbe986daf5 100644
--- a/sys-block/megactl/Manifest
+++ b/sys-block/megactl/Manifest
@@ -3,6 +3,5 @@ AUX megactl-0.4.1-gcc-fixes.patch 2074 BLAKE2B 6f18f85c4f4ade85fa4d273c741ee310a
 AUX megactl-0.4.1-tracefix.patch 6650 BLAKE2B cc35fb5a0bb7091b3fbeb9e31d2dec9a7d625a3cbc735c76856c68771e41eea3c53d846233add224d6c57133613c5d20a4b6d564ceed1a475ab1f5fc5db58c4f SHA512 c62bc15b9fe29b38415c7e632686f842fac2632ce7be5db5e3132ae6f024f43ef813133fa2c9038dba43ee70b322e27768e16054df550c871f817f827553c526
 AUX megactl-0.4.1.patch 1297 BLAKE2B ca70718318e464f0731f6de8227d6dda394b28053794aa20d4445a78c862a30e297f05a17be2b804d1abdbfde5cb1975998371e9e13617feb6012dcdffd50f55 SHA512 6992e585bc3a8528d45aea9f57de296c67323489d74b48f2365b6052e51a525ac5a118d652f1c2ed924cf92424ef16de8f08ff146930f25a3acd14941cab3faf
 DIST megactl-0.4.1.tar.gz 179173 BLAKE2B 778e0ef67226ca74aeaf47afa76c0842764bc95c05ef9fe7bfc57ae1d1e6395a3098301bc09dee8fdd0a5d29e8f2dcf511e0a8920538bb76824cea496de6a619 SHA512 65a97f03fbe1c76375d2e16016c1e57c7e4544bfd7185b13a330560819caf48ecad8e9f1feb1d448b45d4f862abf2799868bd357d120019a709088c90b58ac92
-EBUILD megactl-0.4.1-r1.ebuild 777 BLAKE2B e6601df886d1ac7ec0765bcf3c53ee0da5c2b91f7baa5281927cd0143c00054fd6c21b8ab4a9c7902b26b6416cf46d7f1f5c3780b7078e9ce567fe5bf66c8696 SHA512 bd8ec766bce7a84e8176ba143cc4e8447227ab128a4a981b23e6a7b78d7a586635e20596c9ce30aa4e409be03d81789d598d4cb11a4b134338810e076ce55c5a
 EBUILD megactl-0.4.1-r2.ebuild 810 BLAKE2B 4da2467b2d69ad11941314e354543a107dba3b99361f286ae70079e86dc43cf8f69fdd7e190021b1d61ee9c7540ba497170c814a31fba425d6379d0a60109481 SHA512 a481f82731c2ce3a860bd4939048d6e3798a6c4fa6bd7c3fd10a12813868fa60c6321fc7d50cba8079a33891bb2a8e45dec8452acd3aca40b53d7825fc7747b3
 MISC metadata.xml 611 BLAKE2B ad2c97fac2b022d2e3081c8915ae3c69d7789da9e9aa899f54f8ada84f1d638f6ceaa35ff0c0f6c99e7f4c79d5d55f9cf5d84de94ac880b3314839d98f4b1ac2 SHA512 e059a6046f58afda93e50dea7b16cbcddb65baba7555ce56ce59131fd54030edfb385f0defb715b15b0a1f1855d3886417c13df38d00cd3cff44fd0bf133937f
diff --git a/sys-block/megactl/megactl-0.4.1-r1.ebuild b/sys-block/megactl/megactl-0.4.1-r1.ebuild
deleted file mode 100644
index 1a1bfe476cf4..000000000000
--- a/sys-block/megactl/megactl-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="LSI MegaRAID control utility"
-HOMEPAGE="https://sourceforge.net/projects/megactl/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
-
-src_compile() {
-	cd src
-	use x86 && MY_MAKEOPTS="ARCH=-m32"
-	use amd64 && MY_MAKEOPTS="ARCH=-m64"
-	emake ${MY_MAKEOPTS} || die "make failed"
-}
-
-src_install() {
-	cd src
-	dosbin megactl megasasctl
-	use x86 && dosbin megatrace
-	use amd64 && ewarn "megatrace was not installed because it does not compile on amd64"
-	dodoc megarpt megasasrpt ../README
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 8cf652648abb..b877cbde0fba 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 6328518591cf..a3e63f5eddef 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -4,7 +4,9 @@ AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kube-apiserver-1.8.6.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
 EBUILD kube-apiserver-1.8.7.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
 EBUILD kube-apiserver-1.9.1.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.9.2.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.2.ebuild
new file mode 100644
index 000000000000..2cef73774731
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.9.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 user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index ff23aecd066c..d510e5ed42f0 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -4,7 +4,9 @@ AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcd
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kube-controller-manager-1.8.6.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
 EBUILD kube-controller-manager-1.8.7.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
 EBUILD kube-controller-manager-1.9.1.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.9.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.2.ebuild
new file mode 100644
index 000000000000..3a0b835d0991
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.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 user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 4c10e90bbd8d..c5b2981a721b 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -4,7 +4,9 @@ AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kube-proxy-1.8.6.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
 EBUILD kube-proxy-1.8.7.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
 EBUILD kube-proxy-1.9.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.9.2.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.2.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.9.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 763d704bb3ce..575687a6ca94 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -4,7 +4,9 @@ AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kube-scheduler-1.8.6.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
 EBUILD kube-scheduler-1.8.7.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
 EBUILD kube-scheduler-1.9.1.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
+EBUILD kube-scheduler-1.9.2.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.2.ebuild
new file mode 100644
index 000000000000..170c510184ff
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.9.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 user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 1ef09b221f8a..09a139828525 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,9 @@
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kubectl-1.8.6.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
 EBUILD kubectl-1.8.7.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
 EBUILD kubectl-1.9.1.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.9.2.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.9.2.ebuild b/sys-cluster/kubectl/kubectl-1.9.2.ebuild
new file mode 100644
index 000000000000..14674478c43c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 92be3d61542c..71aad049b4bd 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,7 +4,9 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
+DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 EBUILD kubelet-1.8.6.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
 EBUILD kubelet-1.8.7.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
 EBUILD kubelet-1.9.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.9.2.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.9.2.ebuild b/sys-cluster/kubelet/kubelet-1.9.2.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.9.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index e8ec56687db5..626a11b091d0 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,13 +1,6 @@
-AUX pacemaker-1.1.10-tinfo.patch 767 BLAKE2B 42ecf4c9fe707c2047efcf4bf8178633c8f8232a8791693af902f101a83d7b979b09de01df207fc86af74162f786cacae437d83c79f96468bd09d1c0eba00ba3 SHA512 2418cb275d69e5a589ed5e7aba707719c23bbdae83f2700b4fdabe9df03bf6f6922ef7db6f09b0c06d6d66e8cd661eed37f9c905a5781f865842517a3bd56358
-AUX pacemaker-1.1.12-glib.patch 1634 BLAKE2B be601a1da62d1d35c8d5b0e153e16099265edbfb7968ff2385ba6e66087270973de505ad0f13cffed59723777d6207efc73a0ec0f878990072a6ac2f8f4422c7 SHA512 11d95e0b85c61b845d9465d1d5dd6ebf2b33a3cba40a89a085fbe4c16eabbc9262546a62fbcdcaab22071de2bbb3967e041527965b61d8bf9a978904128cba0b
-AUX pacemaker-1.1.12-stonith.patch 690 BLAKE2B 7297941ea6aea753547c2e5ee06387051dfafa844a39d6ab0e8a8111dd895d9f5eb8a54d5a8d93af11fb56918817f8e848568aec9e5e47518cf7163ca85d060b SHA512 168811591d18aea99d260c53d4e8307a8c65e0b756f50cd939d05c37697e1c2d0018d3422065add6d126ca23e4fc2371cf8d9f24e68bac2bab74d438112d80d1
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 AUX ping 10389 BLAKE2B 7291fd63b478dd73b90f2303b4ccd4f3ecd2f561de2aad3e55ba9368af231902a81788f712b149b7be3f5d7f28f86f5dcc86fae8dcc1c4429651d6d71b96a15c SHA512 832cd68dab0844b9cee1d1b1453314d42497bc497e97a5cbb78aafbd43b696aa97786b71d1b4d175c1aa8c5f7f240432f1fd4421d16a40ceecdc008d911c0288
-DIST Pacemaker-1.1.12.tar.gz 10459675 BLAKE2B 31fe62a4a21523653e232812cb61b636adf2e5965f3d863a39f6d511950e892be126d954f0dd338bfd26a07eee2966a09ccf8d166c9c8bc1fd2ba73898a25ba8 SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1
-DIST Pacemaker-1.1.14.tar.gz 4729808 BLAKE2B 90e5fcbfcb88c65b590367c2e99f848f3fa585353308df41684c8a7a039782b3ac507cbf347faf3b68d2f866763df1b713ac8d1ce34579b6b80708277eec0e89 SHA512 81927061bcc0a0b88c472f87a2cbdb26b88a2443b06112cd8c8d58d8491da4e9ae03997108c9d40aa408e80e2998bdc0ac03691f1732d2629c4cef0adcc4b7fa
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
-EBUILD pacemaker-1.1.12-r2.ebuild 2357 BLAKE2B a4423891a7a40e11578db80f717e77d7f7757f3037657f8747ffa91ad6dc91be59c3727f7e08cb7e6f26164be1b6bfc20816127527a8db151f0cb67828bad261 SHA512 2d1eceed9491e95b2e87b37056ea8b63c1a0fc491ed88a91d4e80a0c79144714392887547f5491ec2c43c9eed272a217fc847097bd5e4dbc6517f8d5b34924f4
-EBUILD pacemaker-1.1.14.ebuild 2197 BLAKE2B 4f9f4f33b4718460a75561b73cf6c85290ae3dcb4fbb65fc2c7c5191aee95ac1f07429518b6dabcace1deeb41a415c42df0c0593bac650fb193e2ae1dfa9b20e SHA512 e39e2084d9a409df027cf3fa9f506e8b5076ac93c6217219d29e19d1b69585ce42094e4873ed8249366abb1b330dd13565a1b0363f5993946fa197ca908ff13c
 EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
 MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
deleted file mode 100644
index 1dba440c9e79..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac	2014-12-12 14:13:07.262413254 +0100
-+++ b/configure.ac	2014-12-12 14:13:14.922480835 +0100
-@@ -885,14 +885,16 @@
- CURSESLIBS=''
- if test "$ac_cv_header_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-+    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- if test "$ac_cv_header_ncurses_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-+    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- dnl Only look for non-n-library if there was no n-library.
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
deleted file mode 100644
index 8233f98a17e8..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Mon, 13 Oct 2014 13:30:58 +1100
-Subject: [PATCH] Fix: lrmd: Prevent glib assert triggered by timers being
- removed from mainloop more than once
-
----
- lib/services/services.c       | 3 +++
- lib/services/services_linux.c | 1 +
- 2 files changed, 4 insertions(+)
-
---- a/lib/services/services.c
-+++ b/lib/services/services.c
-@@ -313,6 +313,7 @@ services_action_free(svc_action_t * op)
- 
-     if (op->opaque->repeat_timer) {
-         g_source_remove(op->opaque->repeat_timer);
-+        op->opaque->repeat_timer = 0;
-     }
-     if (op->opaque->stderr_gsource) {
-         mainloop_del_fd(op->opaque->stderr_gsource);
-@@ -425,6 +426,7 @@ services_action_kick(const char *name, c
-     } else {
-         if (op->opaque->repeat_timer) {
-             g_source_remove(op->opaque->repeat_timer);
-+            op->opaque->repeat_timer = 0;
-         }
-         recurring_action_timer(op);
-         return TRUE;
-@@ -459,6 +461,7 @@ handle_duplicate_recurring(svc_action_t
-         if (dup->pid != 0) {
-             if (op->opaque->repeat_timer) {
-                 g_source_remove(op->opaque->repeat_timer);
-+                op->opaque->repeat_timer = 0;
-             }
-             recurring_action_timer(dup);
-         }
---- a/lib/services/services_linux.c
-+++ b/lib/services/services_linux.c
-@@ -226,6 +226,7 @@ recurring_action_timer(gpointer data)
-     op->stdout_data = NULL;
-     free(op->stderr_data);
-     op->stderr_data = NULL;
-+    op->opaque->repeat_timer = 0;
- 
-     services_action_async(op, NULL);
-     return FALSE;
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
deleted file mode 100644
index 31c729559f35..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix: stonith-ng: Reset mainloop source IDs after removing them
-
-Origin: upstream, commit: 0326f05c9e26f39a394fa30830e31a76306f49c7
-Author: Andrew Beekhof <andrew@beekhof.net>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1412962
-Last-Update: 2015-01-20
-
---- a/lib/fencing/st_client.c
-+++ b/lib/fencing/st_client.c
-@@ -663,9 +663,11 @@ stonith_action_async_done(mainloop_child
- 
-     if (action->timer_sigterm > 0) {
-         g_source_remove(action->timer_sigterm);
-+        action->timer_sigterm = 0;
-     }
-     if (action->timer_sigkill > 0) {
-         g_source_remove(action->timer_sigkill);
-+        action->timer_sigkill = 0;
-     }
- 
-     if (action->last_timeout_signo) {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
deleted file mode 100644
index fc65ae9855a1..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}"/pacemaker-1.1.10-tinfo.patch
-	"${FILESDIR}"/pacemaker-1.1.12-glib.patch
-	"${FILESDIR}"/pacemaker-1.1.12-stonith.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# bug #490908
-	cp "${FILESDIR}/ping" extra/resources/ping || die
-
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-
-	python_fix_shebang .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
deleted file mode 100644
index 492f531c7022..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	epatch_user
-
-	# bug #490908
-	cp "${FILESDIR}/ping" extra/resources/ping || die
-
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-
-	python_fix_shebang .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 3f5c4e1b623c..44270f1bf9cb 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 2215 BLAKE2B bc1687959df90d5136609ca3d27bfb06879d66f3cadffe1cc4290ef7f3f4835859d7bf6f113769d7210ce4983e9ec97e93939ae5d050867d55d6c2f67abb8b51 SHA512 784fbb6e3366432da9ba518c02731e80a7af3165aeef27ecc9281a5ee83b08563dafc457c45dbac7c2ccec551e774ef025f211853126224ae0dba4466c0621a9
+EBUILD vzctl-4.9.4.ebuild 2203 BLAKE2B 8cd1aac8a26a291ed5a1e3230ae1275a59b6bc3c34a42a6a0bb7cd91f148621e4f1407cf6a7f0941afc9255625e0b6d60b4359670e6149613ef039a86812dc3a SHA512 98593c659fcdd06b727afbf36cb003471119cab6f29e407ab9b4fecadbdf443a85163bb74dc90cf298641498adeacc3c655dcc42f9ffe024be8385afafcfabf0
 MISC metadata.xml 476 BLAKE2B 6036f242ec8f7fe818244fd4d01d5d89b548c66fa2834127c66dadb4fe3a9d06643fab4ccd297c780e7f470eae8bc73a5d04a03ed15fd732c79c38a841373809 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index c3aab29cb491..87cc19cf2b4c 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.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="5"
@@ -11,7 +11,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 -amd64-fbsd -sparc-fbsd -x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86 -amd64-fbsd -x86-fbsd"
 IUSE="+ploop +vzmigrate"
 
 RDEPEND="net-firewall/iptables
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9d1f047d5ded..9974aa8319cd 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 6d7ece367a4b..2860d1ab6490 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX ac-wrapper-13.sh 5044 BLAKE2B 9768e43716ce9f9e32efd8126447a135fad58b08bea919aceb76faa9374a5b2f9c736afb694e9baaaa210da6adf0ab95b615c3e888fd7ac2d8c2b62a7abe4f55 SHA512 06fa8f1a812eac11ccf4a90ceba882a1bd6f2724c7ea9f8a9ad95d6c4009d7389a06ce6ddfed928a981112309cb2c1ea4358fb17b7f81e3ac0f4be25a37bb7d9
-EBUILD autoconf-wrapper-13.ebuild 844 BLAKE2B efef2c2adc75e1483ffb7e701054295ebb00aca4fef9be7df5546b8f68019df7d21680a4ee74988cc9b2036dc3f799e0f364ffa623700ff36559a8aae9fb43aa SHA512 fab674d043971f5f813ecb357227f95f43b076d119449ca245e8c8a0ae5b117a50b7ec14e034cd35ea2379e8e08be97bad23eda4afdfff6eede879583c124c10
+EBUILD autoconf-wrapper-13.ebuild 832 BLAKE2B 621b163c9cd517d6d4fae7994fbbb4d859c73f9200a3ea92db39c132dc29cd7654562fe4da9bb044cbb10dc6a071c3cc72349a41c1dcc9bd51f661ad1f2017f4 SHA512 b8a8db90c8c64b0347fa3b1ad615b122f0adc3615551216944449125fdea7465c2c9e74eb2b1e427c2e92699480c4eb9a917b574a9249e6b1b715b9b572cf630
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
index 78f9d1d63ccf..f98d5b23afdd 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13.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 multilib
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=""
 
 S=${WORKDIR}
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index c52cab6d050b..05454f7eac8d 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -7,7 +7,7 @@ AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-2.13.ebuild 1527 BLAKE2B dec4a25a2d19aea170999fa5fe507cbb65a6fcb29e0691aa88a5d6d37b49516dffb4a193087055e6d9e49349c3c4995f783f3997851ce207bc190d304e7b5e54 SHA512 3f8e4bb7abbfce90cd9fdd8c0b434422614a68ed91dde4ca1aa757566913797b971e45f4611bfc4c61d630dd7403b3c5d1e332ee77a715cd0e738ff08d7e582a
-EBUILD autoconf-2.69-r4.ebuild 1374 BLAKE2B 19b63c9ff6691714eda0581c97264dcfd1dca90b8add8625af9591f8bf89f3b2ea595de3a103d48c3bc6dae85b326b4665e4506e33308680dd38060eaf8e0403 SHA512 085ef894de4d986e0015d3e0358394e8a7c8e7469bbbed41321e5c2da344b272baec571f9c934b50c6071fadf10a29d98894a899fa64289c2c67f724151a7cf2
-EBUILD autoconf-9999.ebuild 1202 BLAKE2B fae085e5067ebd954f846668b3b1f1df312270caf880206d3c3b6c55e4bf27e219b717f53f8115b1ebcbea0c3695b82bb1918e345c716d108ae02e62ca6a4bd6 SHA512 40ffec2e0437c2519dee11ee092866e667aec59d3b5137a6286552b9f8c6cc3d595051b1652141eb31506fedc89dbb71300129d1c99ec14325a5e9b4ddddef8a
+EBUILD autoconf-2.13.ebuild 1515 BLAKE2B a98b8cb2e30b994ed2ccdea66b8d918f7a6320666ab2d8dcd95d64da1c8fd84ad70a433c55f70f8c42392b394f81e9812239986d34681e793a54f01644e30506 SHA512 417fd57c23711c2d972a20f34490023430f98737f124eed55d64f649b6766def6fbe3381d0fd0f564d350f9a2ffccba0bbdc495f4a800ed930aace08a3d69598
+EBUILD autoconf-2.69-r4.ebuild 1362 BLAKE2B b058dea727115a2624f1706d1ed15d470c6051e98940c0f708a79039909e18227cf60568e94965a9ab9fc662dca1e8bfc1218e5d8c8eca0f13a768ae3e0bc93c SHA512 956cd3a9ad64a329f24a3036e5a1a2fdefc5ba00d44c539a0f3906049276921d773c036e327114bc35d3463f1729ea7360ca1bfbfa707063d938da2c17b6e235
+EBUILD autoconf-9999.ebuild 1190 BLAKE2B 6a6b321b0ff6706a4fd10472f867b51c73e45f66dfef841dee22fddc36382bf35c5bb5eb7041e08a178ce9b7ec93a818876b8cc5edadd9b2bebf28c7e50b47b9 SHA512 bc4e55cd7186c5f18b27f97f07ca093795670a11f0360956dae142160bb1ec83a8fc1879e1b201d005d790911429f527424b7326196dce7a2aeeda0843c226a2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 8f10539884d6..760263724fb2 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index 17b047107a63..9eb4ebed85d5 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 82ed3494918b..c0081727a4f6 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index d713e29a2e67..9e2f0b97f1a9 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60
-EBUILD automake-wrapper-10.ebuild 940 BLAKE2B 168d52967489db7ed38abb1f4f09447ff328c323a185622a6aa659f69f4e27e2fa4ad2db5e378f2776d0f03eccc6f5e5d3dfbd10eabe3d6d9be877d974412018 SHA512 8768c7681d53e6c058a9395df162d74ab38af27a04deab822272ae744f32f3f574bd0dff1c6b6effc93dc0e9bb011fdeaddcaa97c4d585b11578e20ff9d1509c
+EBUILD automake-wrapper-10.ebuild 928 BLAKE2B 2f7e20be41a1ad2b46b49e6879d796d16e7993cd7b1c5e7e759bc6382628479b10228ee3dafb0907baa9e581ece9b430f259e12cf3b83adf508c90805765d00e SHA512 93becb2a61c0099453cc085a5da5114b55fa5e67a322cc801d3887be66ba29a4fb690d3f1c582314c38bae8ec404452de6ffa3e7254d9b8ce7c68f830133154e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index bf2ec3f5301e..10c08c83906d 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.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
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 93ffa0cc5d57..24191e95ae8f 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -40,18 +40,18 @@ DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c63137
 DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r2.ebuild 2205 BLAKE2B 60c8f66ec01eaa9ddda826de66538bc91c23649b4699ea64745bdb7bb5d096e1f8f5bd10cc32b4f50e02d821cc1726453c5ff3106d2a4054b22ea828d9048730 SHA512 43ffba799f9ab5c6749a5c327a5c8b4dce0f64ed3064198288548d142c780b69db56eeaa5cf47d2ebcf2c8440708eee9c4f09e837e0f45b3d65f65976dc15b2d
-EBUILD automake-1.11.6-r2.ebuild 2376 BLAKE2B dbd71da4fd65654bd37af30a2cb105478fcb9fbb56fe0643790089657ae2fd724ca2ccfa4de33592855b17d9dec572faf01e610b354bfd2106e67bed0d08dcff SHA512 0a13925bf5f025df81e052e89db47a83081c3ceda78752763fdd9a06154e3ad973e18e77065dd4a31c2b71353b08bcd75bf2692a1f02a2feb7154f81ea34c7a9
-EBUILD automake-1.12.6-r1.ebuild 2206 BLAKE2B c7c04722fbe9879d9c770e1515788f7e53617e38331d9da55e2b6c22d40df5c9825f82dfcf2a01e334759b719d7e4fc2e42641f03f4492224963e081e58bb61f SHA512 1f98949dd5e8f90f37f14129f2c82de5af008cb6ed7a18a0e55a81039ff418b910efbec888cd151c94aa9aff1cb6c22a6259c6c97924973cac19702df6a7b0fa
-EBUILD automake-1.12.6.ebuild 2136 BLAKE2B 28a7ba299808909bc488d8d83d64b9cbed4f1bf183539fc89357793dbabb5eb9b1f3ebc3218de8e575a08172c2cc69c7bee85a308f06a23d99fa9316bcf7d66a SHA512 93f0abd1cfcb93328a3473cd4300563fe05d0de1c9e6a700a39e69a5d531566065c9477920cccbd63b0435308bb98109d7f93f345e2ff6eea5f1aeba524df535
-EBUILD automake-1.13.4-r1.ebuild 2433 BLAKE2B a52a44d9257dedf75f2e70c4807056feb3ae42410738d30a4c9b87ab579ac8765c7844415be141e5a6d6ce0eee5467241c8ffdbf9fb33057ab533e11bee6caa5 SHA512 7819b9a8cb190a2dccfc1ed25d8a7afb52e79e5584035164133436603faa8e108cc30169ac7aeee8a54da21f9beef6a31e8eb4de85eb7b2586c1c2a7c00c3dc4
-EBUILD automake-1.14.1-r1.ebuild 2745 BLAKE2B 38575acbb0fee6557c192e8f2c523220a296d305d67cde01bc86e512124f48dde1bc7a16439df88205a0b59afd90ff57aeb4d7f94d130c27907e1cc70879502f SHA512 6fad77ae5acbbabfce37555d2f46739012708b135e7f4e8ad9ed326b087bd9ffe6f3878a1f6abd3253a49a24dfc849ef3d43ab20d413fab63f65391f93c3b3f3
-EBUILD automake-1.15.1-r1.ebuild 2922 BLAKE2B 888f95f905b6c0541d9c5d00f0329d5265c5d5c76c7ca8663c039d915a56a7c668a0902f03f97489f22c86db62b7834788de72131a63dfed81f5a1d0a4b04580 SHA512 554c2dfccad576f79fccba21948a9e015577404a402e103fc78a53e74aeec2b38bfc608efcede564ac48b6d45816bef6a41cb377643545a8e6013654966f27d5
-EBUILD automake-1.4_p6-r2.ebuild 2493 BLAKE2B 8b23e17f23f54dc17a91e54260d28a667ea2f12653d0b5eee320b5058a36019c00ac55c246d36951e437bae5b6faecd31002d74035ee5890425d02b35e95ae02 SHA512 7077f282076cb741cd54080654ab2098f6a4fe55536147c5c4c7a807e0e1b63179cac9aadb4220f92ae601455a4f231c045b6b85faa4c044408d4b0ba0563407
-EBUILD automake-1.5-r2.ebuild 2311 BLAKE2B 2138e2aeee91fee2f7a1ff7b35ea57e128117ffcddaac5b8b36309243aec0d116695a4df6463bdd4b6eade1fa460aa1a3d2a047d453de96d919b67ca5a94917f SHA512 68c46578ba7f8c7b81ab0bb723115f8f336cba2b7af6d7a5dc3726de34fe4dfbd810cb976363983b0737716ec46514b92c83666cbae0e0bb34590950c9bb9060
-EBUILD automake-1.6.3-r2.ebuild 2059 BLAKE2B d377b1b11491b20b208f1afde99309c80c3e892518b3b30ad8ba20e66a0ec3bd4ea8880376b651c9171e9e7e95f93f5e5368eb199e98b3742fdadb2709858987 SHA512 588753996cf13aa49b251fb55cfe9bacd9015474ff4824a988bbe38ea0826e05cb3e6079264d47bc64460e1cd44bcfc5a233af7cd769a6476fce29f4bdc2d4f0
-EBUILD automake-1.7.9-r3.ebuild 2214 BLAKE2B 0607c37ba39261edcc927af639cf7aab4053d5f0b260495678d338b5675ddc0188d936cca558b030bfdff6b1b081f95805752f2d28d7b864070723ed636ec9b1 SHA512 8b8e70fd88fcea71139cf84f2b6cabac8d90b0cfa7e7d4b034b986c1b75581c9a04ccfcb30d4b0588ca336fb1cdead04db231955e432b9cb3adca510bd84bf26
-EBUILD automake-1.8.5-r5.ebuild 2241 BLAKE2B 725e299cf41269187e483a9a265428d6956ba59869703b9532cfc6d536125c39643bc6ca32b5871a8c0175d64fb01b835dadc7dcbe1e8d9fde87b51a39af71af SHA512 2989fe6f57f9f2b723aecff5573a713f71d6245284f965862fc3d084ab2a90c462f60d1636a031735895a383d6141889447844c7f161b17a5a0f3ff316c63fa6
-EBUILD automake-1.9.6-r4.ebuild 2456 BLAKE2B 5eb6b4bbd1fb2466d0bd0d18dce8b4a8224f78fa09a714c5c12c0497970734c46efede77ae573ae0dfd3b7e9b6a6a30ea366f4226cb69f80720207b41ea1ab1b SHA512 de1e1594b2b5bbb9560536481fa12d4b4aac66cb3a6bbdc43f52d12a3465c643d6afebdc59ab5fce33d4adbe19f82f1d172a2ed9affb39f2b88aa47b8b6e486b
-EBUILD automake-9999.ebuild 2935 BLAKE2B d6650d13df37755285d689ba7c3b33a40786e3564dd284df211e27a21ad420a00de536318c410aadb5122d8d3c3182eb5c36e5ef6105a7e83c1f021d7211063b SHA512 b78724ce11602e6025a5e22f23bb8d40234c5e4abf34bb2704e2634796e2fd6570abe76454191648e93b3e686502f77f0df2bd54c98bf0983452ac6ac2287699
+EBUILD automake-1.10.3-r2.ebuild 2193 BLAKE2B ad0b6db8051ba050182e0635d2907dc24bfdd9b03748ebd18a213f241d80972439151121ab0774a33746d0cbf48c9b313a198d409a131bfa941f44baa4594e7a SHA512 6b92b5d94e7d46c3ae233ae7102faf0e2b27f51d11878acce9e991a196e45dcd5ce09c4ca92331b8b5887d9cc1dc10ae6a5a8262cb3d5498f9a28cf3b73373b3
+EBUILD automake-1.11.6-r2.ebuild 2364 BLAKE2B 33a33b8b8b3852fb77bbe7b31d45fd172ab09a787c330ce5221c6e5dba141a2e3b1940b4f0b8064f661cf011d5adb1cc65eea18ad81cf388da083f54bc6a58a3 SHA512 fad55a76b4307f12623b956306dc8b5671a90e393ab357600a0327a9af9b272497567bd7ff24ffeaac3eb68ec884a62af66f40c2dcd80297a5be926de701a4ff
+EBUILD automake-1.12.6-r1.ebuild 2194 BLAKE2B 28f5632ee81fd266afe21d9862c043c5e852c073550a1f8e005ebecd59f4fc42066284792fc30ac5b80b6a5022cdc616ac6f00816d9806463932dc28cff4e746 SHA512 197da1ebc2d08199bdee702360c54a5d52a175f23761da25a1ce8e72cc70a2c7aec044544c8a310ed1333c67869e220ec499fae84b2df3f3c68c1606c29f3b2f
+EBUILD automake-1.12.6.ebuild 2124 BLAKE2B 138882c17f0191b598f1d0979b36e6bfeb219a8fea92d7d3840aea594f62fc36a949da6d927cf16a4e3c73e00c7300a5795eebd0510b6061e3e0eb2fa264d3b1 SHA512 0e7dbf281831b7e94655a1ad505472845cfd9eab52d02a78b67b3b90f2dc0514e5006e55cf501606486e1fe720be2ba8378358a9c73980312c91840ebed42846
+EBUILD automake-1.13.4-r1.ebuild 2421 BLAKE2B 9c858d89626d8c75f089baf6261e69d127db735337e2b572916589dc85a52ce907a800d560bad2813f464c1941f2602bff2df0fc3788cb53c98ad11efc1c1ff8 SHA512 98cdd9b84eb42477f7fb3411d7ce77a21e25a122f9b5141c8c7c8b874d8771709aa5513856a6fa24c6d8175a9dbaea2a0370f223587bd6f33a050b9bd8ad4afb
+EBUILD automake-1.14.1-r1.ebuild 2733 BLAKE2B 149f5f1a99b9b569f457304bc07ce359b6622ad21e05bf3d3cd058f199abedee71a55531a624190516e9c6dfb00ec01e5d390501fed241fcd23986eb5a12bae3 SHA512 df61f8c6c0cc1e4dd93cfd2432b1a4ab1dc4f695947455627fd96c0d203c484b7ee1ff3d45db861f5553d122267d0ba6c889c9d513d047a3ce8820f65d18c0bf
+EBUILD automake-1.15.1-r1.ebuild 2910 BLAKE2B 4f2efb028801ae608a8e2cdd5e23fa81f19b3a20dcc6fb61c450db6ccbfcbdf1d3663c63a2e49cddc780d093115be713b715388e03f7890c797125d929ad61a8 SHA512 0ea6f2b3149c347d6c60b58ccc1c7f503c4849c6fb8e1f6012a57029d309831a251ffa74bb8bffa97fc46d09081ea366bc28255a8545ebbe65bb6d420a8837af
+EBUILD automake-1.4_p6-r2.ebuild 2481 BLAKE2B 6247d6b13d0b5902ffc48b15936e69a45300bda12b236a80a99ba31562e7e1706201a1ff56c8cf0a6539c50a2e2b44972018f5e882e42b4801b6b1e7ce1b1e53 SHA512 db4daa874be88149d6eef10a8babe82bdaba6125c7cb5413a1c6b01a28cc7d0933adca8c1b6eb2aa31cb1e708cb6ec0404138f1c2661b4c008ce0c2a80d5c0fc
+EBUILD automake-1.5-r2.ebuild 2299 BLAKE2B 4d2c160631fb5dd5f3803a37168c90941f1d60890e0ec707a1e27a6dafd4dc960f54aa71c1beb0d646948dbc6a317aec7e2fa7805d587cef417d0e5227ea7984 SHA512 13f0e0ffb4b322743bb7e7922f380f77faf5fb9106055a540a66cce0663bca3bfb670d6d22d5dfa0e3c9678b4b20e7cbd17bd6719497d99e334adf592cf1d9fa
+EBUILD automake-1.6.3-r2.ebuild 2047 BLAKE2B 92a42f972d1d976370774166e25a13c399b9b720a228f2c7cfbdfde9ca005bbb33c6fbc53a3b40db8984b0682f512510dc0ec3f0476edec7785224fe6f8da9f0 SHA512 22e21b1a05187f1535f082b16a3607bc9f88270f2cfdf2b720491ab9615c226b2229ffb7b38dadb8a20b32fbea1d54cc7737d72b5c1aaed7b488dc88450f8a7f
+EBUILD automake-1.7.9-r3.ebuild 2202 BLAKE2B 53799091072558b9f99744cedf87aafb8a7970cf45bfb3a73875ebac250ed89b4304d1a0591ab8fd721936e4a9ee449722ad0d2f20a6abe5bceb800f6709ab48 SHA512 61897ab690599c4b653b847aa668a1ef22f477237fe57bc69acb8024c326157b85d49527a1555aa6799d682475052a8cc88a6de0682bcba59f8618b473489e86
+EBUILD automake-1.8.5-r5.ebuild 2229 BLAKE2B 057da2c27f531aa821021a9decf048452a7f5733d36e417cd707bc9a23ed2c91201f0bcd6fd9d9eec179f21531019e71cf682daad40efa06df6e510a37c3f892 SHA512 16264cc047c6e0df06ec3d921c778852fe27a63902a26acb1edfe2ff9bd74bfb316237edd618f38fd77a40d3a3af140d24ecacc6fa78ed5e026a37e4c75a96af
+EBUILD automake-1.9.6-r4.ebuild 2444 BLAKE2B 315aeb35b63d282beb7c715aa093426451817c41d2a4899d90db0adb0d8fadfa86a8a710990f901619eecf4a86c3e4985efd6d6a207dd469703a7499327f2076 SHA512 458b186f09016902160bbf8c2df786a2315fa7676551aca0d35f765f9126beeda938577defb859e58ed18af3049dd3e98960ba9ca7399083471b661c8b51a549
+EBUILD automake-9999.ebuild 2923 BLAKE2B 8581c4de9f67a3e17593060fb8f0b20aa47c4b815e6ed159a7b39f0bbc69fac519d7eea1f1e58a47f22932a2d54d4173ea8c29fa99d14c9968fcedda3acbe2b1 SHA512 0c06826092a68b70db2520aa1273979a43f981ee131aeffcae3492db40f9a98178239ad38e3a54fe7d9c1907665430924024f8cc880d2e86e8299fbaecca4cc8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.10.3-r2.ebuild b/sys-devel/automake/automake-1.10.3-r2.ebuild
index 77390638fffe..d9b4d259f360 100644
--- a/sys-devel/automake/automake-1.10.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild
index 2698b384df79..8602a0c63920 100644
--- a/sys-devel/automake/automake-1.11.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild
index f857f0a20325..a391b4c3a2f9 100644
--- a/sys-devel/automake/automake-1.12.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild
index a8a5b90eb223..d28b8940444b 100644
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ b/sys-devel/automake/automake-1.12.6.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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild
index 72eb656cb894..73d9d4d61e25 100644
--- a/sys-devel/automake/automake-1.13.4-r1.ebuild
+++ b/sys-devel/automake/automake-1.13.4-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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild
index 8b135df90180..a7ac066e9479 100644
--- a/sys-devel/automake/automake-1.14.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.14.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="5"
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.15.1-r1.ebuild b/sys-devel/automake/automake-1.15.1-r1.ebuild
index 0e92910b4dda..e4df14aef565 100644
--- a/sys-devel/automake/automake-1.15.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.15.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"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 637e8be4da37..80d58e97e825 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.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="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index 21db18c0952d..8edbe1ad198b 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index a33fbb545cd7..8df177642d48 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index 6f3ecd066b03..5a1cc2feec8d 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index 0ddbc4afc438..ed3291d3499c 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.9.6-r4.ebuild b/sys-devel/automake/automake-1.9.6-r4.ebuild
index d8a415946d40..3da890f1dd37 100644
--- a/sys-devel/automake/automake-1.9.6-r4.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r4.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="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 5051ee0ba2c4..ee87a2b2eb15 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-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
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 2653901ba3ee..219ee446fe5e 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -2,6 +2,6 @@ AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb
 AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
-EBUILD bc-1.06.95-r2.ebuild 1625 BLAKE2B efa5f764217c5bece03572407a604c8e8170f1f68e4def86f20dea4b98b6fbf9d50a78af7c4e21d95fbb17d466c4b4b668bd044a17369b51a6b5688c0a7edf08 SHA512 85cfbb839eb36d364388e35252dd03f7b4c19ef7a6d91c3ae73c2562aeedc1dfb84f9fd77dc8b4bddeecadaf1d098b3734aa197016b066bcf87fb796b07a6fa5
-EBUILD bc-1.07.1-r1.ebuild 1273 BLAKE2B afc42976eb7c32847e0979a9d551c4504e3fc702781c7dea59efafb21937d8a824bfa6bfa67880aead8c3fb129e5bf2a4c065d28108f64bb0cda33ce730dadf3 SHA512 16bd0dc631c798e1ff3a1a42b887a149204bb48ec9efdd097a6ebfe8d31a1fa163530dbc7fa77b9ab174cacc96cb31ae1f9dac298cf51a13aff89d0c127fc964
+EBUILD bc-1.06.95-r2.ebuild 1613 BLAKE2B e1d2fd5f1773de65df554e46c801c52ebc2d808e1b297c8cb04faadf95d19322b87a3407f3a7c3481025f2eb8f6c5a5f25a67f7c0c773ad97d8114a2eaf624ec SHA512 4627d647763feea0c67664f448879765fb563870ee3b174788ad0f7fb7ee3ec4ff4240655efd56fdba34d3b45c4269f0b6679200696a3a80ce2a25baf83ab647
+EBUILD bc-1.07.1-r1.ebuild 1261 BLAKE2B 40e70d8c9b164a934634cd7bf9b6da91bf996e6e20c8425ca7842a28baf13fa8734cf488b8dd403ea11984fab8dae743bfa517d34d640c3ba4da3b3e51553f07 SHA512 07c5f45dbf604a8c55c7d40da6b560f343deef9e97ca14c0749e894ba783e4952cb70a34ccbe627a6acaf9f9d96106f9105385ee8a5d3f9b948d17885deea857
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 1c570e29145a..502df269eb60 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
index 7efced6d3eb0..4421c82a810d 100644
--- a/sys-devel/bc/bc-1.07.1-r1.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index a234415cd6e0..c43792013a31 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -2,6 +2,6 @@ AUX binutils-config-5 12171 BLAKE2B df24e3f7629642b71ad1e97560919a0daf58b4c1066a
 AUX binutils-config-5.1 11974 BLAKE2B 7cf382cbca13af78fd7581327e4c33a8a3c0ab2a77594de2a5b41219b7477e5e773a30d7caa731c3091d9274bc32378346db498e9a6ebd45c14e91e94dc26e5f SHA512 19cb807f663661e8c0437880bb1f330a2b5996b92d419cdc24fd95924f9c66ac76673354de879ce6f2a32721b1dab208250ae205fbcfa1d7aaa249fd15ee03e1
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1128 BLAKE2B 4ef1d4aa6cb85479909bd0c1c77847bec279de43629e468b9ba903e7972ff25039c69621f7d9f2947fb595ced20cdd7af4b1c3f3a56af2c75edeee1c365cecff SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528
-EBUILD binutils-config-5.1-r1.ebuild 1169 BLAKE2B dbe4fc38f02aadf96849ba02b35d3adb37e022c6db05d41906c28521c7e9586a1982178ce9f8fd7288fea8fb551adba306ce7e120d83382079e8cc5acab25a3d SHA512 df024b6d226a76ae5322970aa739c1113de4d563c3a82e79e7ebefdcbda4767e6b0e551e4be0025f485b49484bb01d10875e114a95611dc907dbe1ac4d633673
+EBUILD binutils-config-5-r4.ebuild 1116 BLAKE2B 43903ecf891d48aaa1a55aa76a0c3f786af3938305fce38074bc829f8201b6ba41760c31b956257a37dc39362330de90167f64134f381eb106b5749dc06067a9 SHA512 32586f809e5ec53b9d08204264711048c1fbf6e41ec1daf8f68a4573cc42e4b5c4698b9dd8cd333195f9548897eeb0edbc2fbc27b60b22302283d04b77c0a4b6
+EBUILD binutils-config-5.1-r1.ebuild 1157 BLAKE2B 49768c8153cbb252002683613e092c5f89bc568cbbee1104133a2ca80c097205115bb71314b8cef7d823d206571a50ead7eaff3636c5a843fc94d681b0ae23c0 SHA512 00052b682af413d74130a72571e4d0d111981bdda9a267f485fb56d7bd68de1393017c6b76beb99363c916da211d8cb25d65c605a3df9a917ca38ab1d942df2b
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/binutils-config-5-r4.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
index 6a486bdebf46..39263f45c287 100644
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-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="5"
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index ef7b1bd5c11d..116cb5abf0d0 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.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
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 20f1a285b08e..41b27f041b49 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -10,10 +10,10 @@ DIST binutils-2.28.1-patches-1.0.tar.xz 19772 BLAKE2B 146b393b49ba868c7c064c5827
 DIST binutils-2.28.1.tar.bz2 28120394 BLAKE2B 3a0ed2bcf0c859638546b7460d9e6f0a55518402ff0c65c90ce462a318f5ae6690961616d188ce6cf0271c9f2fb8b7902782d32cf0e711068c53d3d06956d89e SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb
 DIST binutils-2.29.1-patches-3.tar.xz 20904 BLAKE2B 5549cb2412123e4ad3a13935762cc0dca46215950dbf38a149caf4c6416da382a0fd7ecffe97b10bce4dfdcef5edc2673d49bb21e9d37be37e33b454a8c2bc1a SHA512 ba54efaf9e9f668d2922972acd2cdf5c3e6f174cfcc73d29953ab4ba6e157ce0cb500c583568a4e3baaaa92c9d30c394a327f29b51292acc66f8d3f20f5eae2a
 DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878 SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
-EBUILD binutils-2.25.1-r1.ebuild 292 BLAKE2B 58cca7cd2e70891e48c8584f22a565fa7cbe0e21572b4576d7caa564949b1de0cc080c7797d0dae5e8d6dc48240b81b857eb7c0445147b0a9605c64423cd9cb3 SHA512 1cfad3df5fee60fcf6276ce37d9c5fb5dce649af43491ef02f258f277d8daa64d7937dafc972336b20e945c16b0a356d97adc85e8eb1c74ab535362170dab8ba
-EBUILD binutils-2.26.1.ebuild 292 BLAKE2B c7f4d10819d40799f39b2b8425f061d995b25c76d6f3744139432a18765981438b09a0f6be06b483eeb96cbc3f8f8f8d79056806b7d2df1038531e3a40182208 SHA512 0b27ea4b0f4653b80502f0d3519be3f0cfd8644e18eb52b5a1aa8bf5ebfae3b7a8dfd8242800185cb20611be9014d625c93658f24b4561432c39a3b9e3c2d564
-EBUILD binutils-2.27-r1.ebuild 305 BLAKE2B 8df34ec1e3550bf81b69cce2b0520b206d02d3d77d652ab787cb1fef32d910ddded25b8c6098e6406586cace96d70d9d77198ffd13ca167c39a25953dac09ec8 SHA512 a8f2a1594d97092195cb9d59b3ab7783eb777df6a175fa4361b92b4d8d415920b2e383174732f26a780dc1d4844eae1412654fb07eeeea6fb01399ad9e8ca17a
-EBUILD binutils-2.28.1.ebuild 292 BLAKE2B c7f4d10819d40799f39b2b8425f061d995b25c76d6f3744139432a18765981438b09a0f6be06b483eeb96cbc3f8f8f8d79056806b7d2df1038531e3a40182208 SHA512 0b27ea4b0f4653b80502f0d3519be3f0cfd8644e18eb52b5a1aa8bf5ebfae3b7a8dfd8242800185cb20611be9014d625c93658f24b4561432c39a3b9e3c2d564
-EBUILD binutils-2.29.1-r1.ebuild 340 BLAKE2B c04237983a1e515e1f0e3c1ec2c379bd79ffc36bd8ff6d128ab24b6a255dc6c968137dcfa0e44e11c9a9dee4201aac62e0b22b750b162c1cc1ede9c4af426e9f SHA512 0412eaf0614c6bf9f3888cf5a04fc6c0c869d3f3d3e239d04354735851be564ba1ed347dc4db1a7e881b401d9974ee3320dbaf88668abdfdca813619415247d9
+EBUILD binutils-2.25.1-r1.ebuild 280 BLAKE2B 6c3abc3c6b80becab91ec1f2c88c1f5dba11e862035355a9ce2c029b865865ca58c359f25496c50aa63cadb3ca08de77eb2a86c2d2286441870f65a7a943b42a SHA512 4cc55460454f6ae62fb900bdbce4896279dd27dfc5b09126d8942675970776cafccdd6d7adfdfba74862ee2e84ad7d2be9b7ddc79319a6dfc09b745e16b18a54
+EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
+EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
+EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
+EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-9999.ebuild 10747 BLAKE2B 4a45c17c7462dc5ff6898df8b4422d12d9c522fbf00dd77f023790d9be9c33d9aed4f171ac1952c993b3d27d14801fec962d024684580ae88d34afc57e09d2f4 SHA512 647674e10ffd4482e9baf0e7cee69db1210b66b9da0bdafabc61e4541bcc7b833de4aa4e78b4aff44747c0926d2ab7a24acd18598fb6573de0d9b1b3053c1b2b
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.25.1-r1.ebuild b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
index dff9b0c9a2ef..93b6d4acd39f 100644
--- a/sys-devel/binutils/binutils-2.25.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,4 +7,4 @@ PATCHVER="1.1"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/sys-devel/binutils/binutils-2.26.1.ebuild b/sys-devel/binutils/binutils-2.26.1.ebuild
index 63894d4eb470..3ed6372c313b 100644
--- a/sys-devel/binutils/binutils-2.26.1.ebuild
+++ b/sys-devel/binutils/binutils-2.26.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="5"
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/sys-devel/binutils/binutils-2.27-r1.ebuild b/sys-devel/binutils/binutils-2.27-r1.ebuild
index 441d4d8408e6..f969f492cdda 100644
--- a/sys-devel/binutils/binutils-2.27-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.27-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"
@@ -7,4 +7,4 @@ PATCHVER="1.1"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/sys-devel/binutils/binutils-2.28.1.ebuild b/sys-devel/binutils/binutils-2.28.1.ebuild
index 63894d4eb470..3ed6372c313b 100644
--- a/sys-devel/binutils/binutils-2.28.1.ebuild
+++ b/sys-devel/binutils/binutils-2.28.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="5"
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/sys-devel/binutils/binutils-2.29.1-r1.ebuild b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
index 0dd92fdbd6ee..5345e72a888b 100644
--- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.29.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="5"
@@ -7,6 +7,6 @@ PATCHVER="3"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" )
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 1da242d5c0c0..e00d6b20ac93 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -6,7 +6,7 @@ DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f9
 DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
 EBUILD bison-1.875d.ebuild 1750 BLAKE2B a5ffd48b64d81d0c64ad403a34228a6d8e2a269f8234f4fc6e9d52d6edb619cfa3f1fb2a382701c52a063f86c3a2961f316b228f74a6b11293a2e3a742343743 SHA512 0a836ccca259f9825325b26d6fe8cae2a83cb4111d0228f4657a2ad048816571abce84bb40c46c734f07a2eb830cb9070d1508976420d2f8352702b6ec7de222
-EBUILD bison-2.4.3.ebuild 1217 BLAKE2B 6b1816221134bf356151e971a34d18af2573c31f9d84f57065224f4bb23b4e0abafa948039d5236a6a4156c60399b3c62784fac3488f560a1d4208ddd386872e SHA512 244afc9c8781c3351fe701400bf5df9531209167dc3525f0b7b47a69c863fdd8b954ceb29ac4c8058d778f292b80e1da21f010ed4d78ef5c1ebaa51cebd1fdd4
-EBUILD bison-2.7.1.ebuild 1653 BLAKE2B 8c0072136a86ab5501826d826b59168a5348161db76a8b872428881c59ae62c5b2b5505775fa29167b8f7145e8bb36d1ec900b19adede4ad44339409c4b2fd62 SHA512 44a30f63ea6f1fb40eea64932c1aa1abf1dc84523fb3e9cdba9d57ee47f3ca986a45684f5849e471964096e1454ba431fdddc06509a5a4db34f95afc9c9c65b6
-EBUILD bison-3.0.4-r1.ebuild 2354 BLAKE2B 66c7ae8e9783204e03cfda61661c2a57dbfe92245f157d89b8c5739326b3882d7e6101084f63268c3805fd81659fb608a8da5c4af35e6b462e7742bd332acedb SHA512 66cf976a1a6128f952dce2bc3996171551f847945868e22e2eae6e9cb7a77005517193b57c94d219ee1d6b48ef493f8093121e89ba61bdf469de3fa6878ec71a
+EBUILD bison-2.4.3.ebuild 1205 BLAKE2B 0bfef6eb3a5b94b8ce4c15deb81f5b9578313c1c87f884b59bf2859df90b53290eb22d8fda516fea8eb9b724ca0a59ba2a74f53c7427dc45b334d7548e1f5c1d SHA512 6c19788ee798a42b2e8e42311e0961c145306bce5abf70d3b9e044752e20a7f14f1666e8746a29cf453ddc0c4cf372d8dc51ad75cb9924df7d94395a25610e99
+EBUILD bison-2.7.1.ebuild 1641 BLAKE2B 41dbe1a40e5ffef3a9d259350cf40c66c17ac4a3f21049e858840a3571b682145d4545a7179fcf4d6c3b3c57db1212669690822ed8d5a510c290dd67bce82a0d SHA512 61b9c0ddf1ffc34bc1d1c849b242a02d9892315eaa14fc465c75349306476bcb93c65efe9223df3f503a7ba48c3e043422d626f955dbeab9f1ea59f95c012b25
+EBUILD bison-3.0.4-r1.ebuild 2342 BLAKE2B ce70f532b64911da1bcd8e73676056c20c42887bff23d24a1c436b381aa75bf7459da61912c6d1ea9325e0ebd7970b86324a43af1731db549a58ed2a7c64af0c SHA512 b0f148604203e0739767c703f6efd461ba8201e95cbffce7293ea1354be2cf7a16683ae79f60686a15e25b9c1ae90f701d331de66eb51e831875e01643f59cbd
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
index faed48df0515..680885c49ff7 100644
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ b/sys-devel/bison/bison-2.4.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="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/bison/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="sys-devel/m4"
diff --git a/sys-devel/bison/bison-2.7.1.ebuild b/sys-devel/bison/bison-2.7.1.ebuild
index ab38be965319..d220d72438a9 100644
--- a/sys-devel/bison/bison-2.7.1.ebuild
+++ b/sys-devel/bison/bison-2.7.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 46bac9ecda73..615f9869e38c 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 3df724c344e3..d14287ad957d 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -20,7 +20,7 @@ AUX distccd.service 244 BLAKE2B db5796f93fe36b2ed09cf84e54bacdb3483917438feb823b
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.1.tar.bz2 588820 BLAKE2B fbd00a9cf8af0b2a0c901a60086901e505d9859827a8249ed7937cb8298fc946f6f72470e40dba17e143dbf1525cb0aef4deec3d083268d608f24f1447301df0 SHA512 0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd
 DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
-EBUILD distcc-3.1-r10.ebuild 4511 BLAKE2B 3a18ba478fe5469ce65bb93ded3ef79431f06a662d952b57b205b07a3646044137c1cd8ee76325fbde4db4577365b161fc64c62ee5f439a985596f291dfd0132 SHA512 bc389f2d3c521c59fcfe951ac67a0bfe951da01acf15c01ebf8923fe2c9b3d44876d19f3620c50740616ffa9c36c0b6e483652d19b94870fa3c89af5b5cd1b52
-EBUILD distcc-3.2_rc1-r4.ebuild 5741 BLAKE2B 0b996aedac15df8e3f33d377bb5b5c32899ea18aa3d64dbca15f57be70bd2af058ccd4d07a0ec14c3f93eceb9f35d137cee6c8451935143d57faad724167ee78 SHA512 e835571ceecf9653848b85112d983e73358aa5fb6121c099335967155e9bbee50c685bb1b14f046547b99e0a992387fab80869716136cea51aa377a69f79373b
+EBUILD distcc-3.1-r10.ebuild 4499 BLAKE2B 8cf796bdbc315f8db8b0c52bc8108f0f2785b40e8dc14669a5675e00ee3dd9145b03f6c901137d7b726e78d372ef73206189f280831de11f3daa6f811356ee70 SHA512 22f383d20c3f6a028ad60b77692e680537dc4838aed70f9e17e05ea1aa52b137903a02f855651b5f381708e6ebe19edd201c11ac4269627866232c05752b067d
+EBUILD distcc-3.2_rc1-r4.ebuild 5729 BLAKE2B 65c9309335e2479328f34ef428e308d77687306d158ba52cd7946d8128bdc221014845f5035614357b7bba934332bf69e9cb870e01dff2a8c319b66ea8d032e0 SHA512 34eafd30725c82f9f576d383a4a0886296fc992a9bc36c38bf103b42029a06e473515ff62f9ce8236448a89a6bbb4fef77bbb3d72582d1dc5da7da77701c4e8a
 EBUILD distcc-3.2_rc1-r5.ebuild 5433 BLAKE2B d38e2aae8e43f9a96ff4ed559af77e96b175822b17c5e25e4dad961bc6390bc188397bb9080153f825a48fae23f2e8d47f2ade4dec14602c273000e6584a9f14 SHA512 2539d27b8a0fca760d89a8d304394c7a7fb175a0bf6114d9b883b115b2bda0ddc57f7a8ce52c59cf54efbabcfe5e37539753949568b1e96431abde87f67e1126
 MISC metadata.xml 578 BLAKE2B c49d0c85a80028a82eb3e1729709515c9a2161a506a9883f0e50b1cfe27f21b98b5ee9728f297e3e5b5a35d8ae3aad6e55424d9da9ef3018a71299aa1139988b SHA512 a1fd5bdea076ed862339dda2a21f5c0c4c56aa625927f0157889aa5310e9e86df2c957b587d56b276c3d0b3cc2d0eb69f15e40493cc36d44de97917659dba1a2
diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild
index 0aea024a0e79..49ff6bd82421 100644
--- a/sys-devel/distcc/distcc-3.1-r10.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://distcc.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="avahi gtk hardened ipv6 selinux xinetd"
 
 RESTRICT="test"
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
index 94a42143b8a8..d7ff5a79c40d 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-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=5
@@ -14,7 +14,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="crossdev gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 0b77c5e7aba7..31ef7a03c600 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -4,9 +4,9 @@ AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81
 DIST flex-2.6.1.tar.xz 835048 BLAKE2B 5b0b67774d1ba2d4b2ad8a8cba1f0b8fed9aecdae387e54e6cb8fd1c0c9ef78559bc1a6fe6b97f984f16b438d350de4dccda7e3427d71fead9073ab6616b0ecc SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 DIST flex-2.6.3.tar.gz 1405560 BLAKE2B 2aa9ca18f2ab124db9567e2d2ee512881a71755342bdcbd05ef536653396d1e4ed47dafc1227531bf9e9a610d9c5aa2d924bf864b18c5a618b2ccb61db7fef4e SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
-EBUILD flex-2.6.1.ebuild 1913 BLAKE2B 5850a58a18f3488d9aec79eaadcb9166310837de02277ad75fbacd1c81e17435173c2e378d5b82ff8284d697e22d7df8c57a6124e4f3e2ea9b2d9220da25a3e3 SHA512 c0c4baca0a0e4373599be51d6490b46b25ef39d3fbf251a2bd531f438800e1f9dfaec839e9f8c72a66c1928896cfdb69fe52049ab1e1843d9c151ff21be0542e
-EBUILD flex-2.6.3-r1.ebuild 2061 BLAKE2B e1e2e9f1cbf40a46ee43ffa21b6c45bce735b78995ea77116dacf3ca89bc8f355d70185a9f30c81c52178a1c57e0ed1567f3b732c8760051e1c0907e88feaca2 SHA512 d798c09ce136155b5e67b144d6eb3ac0e394caf0445678fa1e3e887f2c766fa6975fe2288b843a3f7ef6631193986621dcc2f4d46142ca73e693384d2f8b61e5
-EBUILD flex-2.6.3.ebuild 1987 BLAKE2B ac5bd55338b704a3d2a580f27efec08f492e47d41a6d64b27c8e896ba006ac602bee1bd6cf2031c32831b40040e5cafc83fa06bda955c455f43efc1aa51c7311 SHA512 54737594a12c82faf520ac12a3fe9d17b8b2658d9d6736ad25db58686250e2e97ef27c5341df96fa28ca78376f607d139ca6bea85f00ec5e8d52360b94df336f
-EBUILD flex-2.6.4-r1.ebuild 2102 BLAKE2B 87fb73403835dad394512c1658a229c4aeb185ba24ccf1072401f89b8378f46fd06d8bfd5f45bd8a7e83b03eae0703b97b6bb8206728637e215e59489ebfb0fe SHA512 45548e73c9034bcc1928ed626812b2bc8cdbf7e02c3ab53c46f374899102ca2782f5f63d50b905300ae6101333719b32b464da03b76f2e18e8031f9a432f7612
-EBUILD flex-2.6.4.ebuild 2026 BLAKE2B 665a19e2a90ec93dad0396b93100ce0993fe8eef429e9dbe1aad5442a886aebef657a88c48118b2be2fecafd59adcea39fd5ee3121688dd20de1e63b7f178a7b SHA512 4070f280ecf38f09cfd9210b41b5e42d12e2f4da06cf5db775c6738624016a3f58b9b2367b47f6b8a5b1d1b78730922b2c56582d5e93988dfd1edcb6b2e088cc
+EBUILD flex-2.6.1.ebuild 1901 BLAKE2B f9973b6c613199a7fbbbea33aea948c360fe0244199ad4d5e6e8c5124acba4bdaf10caf042daa0c1573801189206756ab8934550f7bfb572eac4efd7e50c6659 SHA512 43bbaaac4f517bdbd787d1261468510e8bb376e738ad49937be25494881ec64ca77b7348e260101cb0f0595207a0d3597b264f1cfd1c37bd542909d256fb71b3
+EBUILD flex-2.6.3-r1.ebuild 2049 BLAKE2B 4bc442c47e3290134e7c7106408c25d0f1eaf57b891d1b6716076edca500fbf05f174144949c044423de30e9916de31f9c6f914a4f307a414a8ab22fa8321067 SHA512 5cec6f8e2e02eb0b05d8a9862da421d636622af74ee7a58adf65af233137d36c02d2fd6e28f1e8ac0fd23e86cb85a56a2b6d71f05b098a103af1bcaaefddd1f2
+EBUILD flex-2.6.3.ebuild 1975 BLAKE2B 40c91378bb5d57110c1ad55c86fbe44ed4045a053b7e1a0d03534e0bcb4554462da3021c5a917139d23c9879175e5eb4358817dde7d78c0b2ee0b026367a73f1 SHA512 c9e928f1e2ca3ddd8d90fcfca26fdb866a64664bf5caaa20bcd364c9a893bf501f4cb90a34eb7f1587e1f675e4187459411ab573870253d1d23fe9d1b1ef8c5a
+EBUILD flex-2.6.4-r1.ebuild 2090 BLAKE2B 8e0af74c214ef070b68ffd5e781f97feb512d0db5d7dc61fe02adf1ac3dbb51071c0379ee0f434d1ddbe5618adfa9b4e98f26e671688a0f64e15e310cb9412e6 SHA512 39f90e366b714c83623c860f0d0067c70d2858014bb1f52865c96c332666170eb1ef1f3bd21ea6d1c628176c2baff8f83f91ec4f9f75faa1ce3d67505e1ddfd9
+EBUILD flex-2.6.4.ebuild 2014 BLAKE2B 66af4162f68ecf647547bd54847ff181feb3c0c9bc3e884769d5439ccb14fa9f685a017ce62a332c3257c66f3f63e2ce4d86d636f397bf5438985e6f3e1d3429 SHA512 bf43f649fb35e5c8f5c405c75d0c583a5bf27052a6b335d87c24be3793d40930b0136bbdfe43440063066200339beafe53eb8215ec22896cb48509273b9abb27
 MISC metadata.xml 382 BLAKE2B 646b83d59e7560578fda79014272359cc99b041469d05189e17a53359aa08182372b27a180b67580ade4e4df42e4deacbcebda555d727dea57e43ecd99f8a90f SHA512 074161b6d11f46cb704846d60cbc0fe44672a5feacd39107968516d292d12cfbf5975290f23d45abf9a74fdd4bbcf5aad77d48c924d3f57a71b3887b23ec2047
diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index ad53e2d86e8c..68b9eac0446b 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild
index 2cd53fc6b2fe..dd936208c1c2 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index c5b8bc754212..4e3a26470076 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 631409799bd2..2e90d8e4c30b 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index c2d32936d7ca..c43446d89891 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index f0ce366fec86..cd94214f4de9 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -2,8 +2,8 @@ AUX gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 1427 BLAKE2B 7b
 DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
 DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734 SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
 DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee SHA512 6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
-EBUILD gcc-config-1.8-r1.ebuild 1173 BLAKE2B 28e6aff88a2d226e3b3ca590e6d96cd35bad57ea4194709652c13c5b7074588513ae4180ccd976c02ac20afec67df2be5195cc028cad231a3c58d165b75c83c3 SHA512 c3abe5e7c37d51c04f40462d3a7fc22b217655cec8d445c31f3ac2f4fb803851fad53eedcb30e17bfeba19eb8911a01324ba0595b3ae50e19ec9d60abc7bcc0c
-EBUILD gcc-config-1.9.0-r1.ebuild 1124 BLAKE2B 51ab9edd92f0408094a195dbfc289b13f3e81faa2b33731b7686a115f9a69b1680b62ec36b8e742c7312b089be0c1771919b8dc4cc9bcde244465e30b7768991 SHA512 9a53fc5a2fd3cd87d9231ebd686b4cc0215714952820ac0857358d69e694bc0482fd10fa951e8e787fdb2a2a2b1b61eb39baec9a6b70979a3a772a6751adb1e2
-EBUILD gcc-config-1.9.1.ebuild 1232 BLAKE2B cb6a7e074c3a96e08efc4215532daa923144903bee6074d0e6b2fb3c7c407284336af4725a8ac58f9e46f48488645d5044671cef0cd449361f55be3725ec1f9a SHA512 57b7be7ee7d74eea7d49a0676b34957067c7572949391092265614804f302b945ab766780286537e7697ba772a8bd72c114c383745152004f7253a42e40fe0fc
-EBUILD gcc-config-9999.ebuild 1232 BLAKE2B cb6a7e074c3a96e08efc4215532daa923144903bee6074d0e6b2fb3c7c407284336af4725a8ac58f9e46f48488645d5044671cef0cd449361f55be3725ec1f9a SHA512 57b7be7ee7d74eea7d49a0676b34957067c7572949391092265614804f302b945ab766780286537e7697ba772a8bd72c114c383745152004f7253a42e40fe0fc
+EBUILD gcc-config-1.8-r1.ebuild 1161 BLAKE2B db1db6716e17f201f125a9a758056cc14ce95eb90acb26805304525222022982ad2e67a47e879ea627a662063da899a07ed274dc2b22af8043ef0d36a11436c2 SHA512 57bab539041f364492082412524b643aaabb8fe1c40ec553429950a33b7578048a2b1395c1f586a9157c26eb87e528c53eba44de583f9232135a5a9cb4c47d69
+EBUILD gcc-config-1.9.0-r1.ebuild 1112 BLAKE2B 287025d72d30838127ee77f7d072e2bc8847c766c665544a41d23dd8e3a36beb24eb108052735b95dc881fc837ad184d4be15a84f81eaf9bce6fb1d7fbeb4489 SHA512 a7deecbd421587d539e89029abecba739a72e45174df8bcab09ae8afc966694a78ee8fea62b6a162446ff5d31a593caf0af73a88fb1e6f41270e6cc46e82f48a
+EBUILD gcc-config-1.9.1.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
+EBUILD gcc-config-9999.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
index b227c4731030..49c4dd558445 100644
--- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
diff --git a/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
index b27cc3b5c419..157d0feb2e03 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
index 1600a0782041..de2993cbb378 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.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
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index 1600a0782041..de2993cbb378 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-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
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e58236975647..89295acecc24 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -71,13 +71,15 @@ DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa20103
 DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
 DIST gcc-7.2.0-patches-1.1.tar.bz2 9246 BLAKE2B f6eec8459e5ac1f177d9a417c59616ad53e4ba6da8744cf55922d3a401717bd5bfdf79296a1c0b856cfa03349e73b8034ab6024b83d3f5ef909534811ba470f2 SHA512 d08b31d1279cc4c6ba46b2dca6ebed4e5c8e4997f0859acab86c974209ce4aacd0df09632e70c3fb8ee7108ecb8208c8b8605e66a7e8d2568e45644bfeee4fbe
 DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
+DIST gcc-7.3.0-patches-1.0.tar.bz2 6757 BLAKE2B ffe6a69e61dc4379fc77b0bf21971ff6fe482edd315ae1243e55b147ad5794320816fbfc3f85ccebe34de080e2c5b718b60b59064aaf095e905c1b41d7c08168 SHA512 a86ffc03940afa12c44b919f861b9459a3cd460cd4680dce8316755021789530640977e90c4cff89be768fc62e0e24d9bee0a1ee76c537ad88c8f4ed07f1a73a
+DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-2.95.3-r10.ebuild 752 BLAKE2B 45764d63636c0fa25a7b7538a814f8e3088e5b584f0ccdfd290064bf2d2282ec0804d5c525736e7d1d97bbdf4798710fd79a71ce8216c9665e3388efb1f34a0b SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82
 EBUILD gcc-3.3.6-r1.ebuild 1249 BLAKE2B 4fd694cda071603038aec136b37d6722b135e7db317c210aa484f68f47eaf0489c126ceb13309f84e7a96e034761835d1ca1f3baf88ba373f391bd44ace2b074 SHA512 a18cabe5c02f3ba85b28292ce6fd0e3973ef15f5ffa847fc67d57ed2d04d96e1a6910f36a9ec08a4833eac3e247df5a7893bfc19ca6354233352d38651809092
 EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
 EBUILD gcc-4.0.4.ebuild 247 BLAKE2B 3fed6acdd82f733a2aea4251d568466e4177b530d1af839366dbdd534490849b0e438cec31c2c972101ed6e56f4826d4f5a6324d143fb2018cffbc5b2b451459 SHA512 6f988f06da4516223bc9862eaf9bd082f26713a8aba4564d809d9daba6ffffd97e623804982062f421e733434b95ef02c76b230e0cc2322eeccaef616b6e98d1
-EBUILD gcc-4.1.2.ebuild 661 BLAKE2B 2108be29b833680be94b2e192e1da65a400e0a46456a84f84aa63ea6f13f0ccb2056a25e77cc79b526d541d7244f3d82436db65ad796cfcb60507ea04747e43d SHA512 370ca5af2b116c464b0a949f643b5152b543e04a4ce7b793b8059ea6c74768ad8d8d8441de600d98b81e7cd4b8f2407152c09a532b3f96cd224e4473f2865757
-EBUILD gcc-4.2.4-r1.ebuild 406 BLAKE2B 7d9e5d16ec2d81e2ed39c326c093456fcc825a322462cbc3c18c90db566c595f42fa3a9338293e799d75d12fd607074aaadca407cda6dc1c5743b0ba60d30118 SHA512 2df1a4a124f89a7f3112e6966b0fa8fd3d25e1d9567b064c3327d5e6496ea012e032342ce48ce25d6cdc0168c182981210b546b5dc6f0ea814b46661dc70dd7e
+EBUILD gcc-4.1.2.ebuild 649 BLAKE2B 70c041237a0852fd3ae427244b7ce6eab2773e61c9c9deacaa0f6a6d2d3ea3c3035179bf2d2595b8949b6397c93b258f9bde69f9831ced1c95c87acbca485f08 SHA512 894bc80ed2b4a72f53f059962a4985e27c5e809744bcf83d9d27a5ef1bbf999099a5d36d35da2b2cbb5f511d26c1b756a76074024e4866a5983bdf7e0a28740d
+EBUILD gcc-4.2.4-r1.ebuild 394 BLAKE2B 0798e2523d59723a892cea76ad338357b1a83c6d61b3cd1be9d6926c00740f99b8e0466b9740bf2db44655dcbdeff488c9351411a691fa844f3a77ddbbeb9f3a SHA512 ea93dbe7d8e21ff9b60c9fd67b70fad4b90f4ecea98a0359d0a1d477dce866c78979c2a535fd4638d19b9ad990cb2985a3a64e179aed6e301cfc7fa8c7cca00c
 EBUILD gcc-4.3.6-r1.ebuild 630 BLAKE2B a0f9f25d48a7b3abe6e377c12ee3ff35c585b6c5619679d465dd67cf7107d8fabef98c40c2f62a3f27029b43095055440bf6340c534906e31403041e334bd2bb SHA512 d381b460bd995fa8e5f8ee7464f04030510f21d569ab539a0bb6afbe2f5f4266af25ea8df052004bfb56155fd3f6cdb82fed7431c36da0f658549a26449d1e55
 EBUILD gcc-4.4.7.ebuild 674 BLAKE2B 9f2b3b4d27620cdbf5f141f38709cc37f04d3e822f58b02bc3f784e37f1b9bf550a5ec9d80e646a37f2cd17f315b5e51b008257f9e5d81977e8985f88b328667 SHA512 72e2eb8e125e1dd8ff095a989a739978562e77432a949839eb012bf915af4e989c79759230583b80580d25b2659cee937359f05f96cd7dbe5084d4f7bd3f96d5
 EBUILD gcc-4.5.4.ebuild 687 BLAKE2B 0cb42fa794ab8b1e4dc8075bddc288f888e6f79ee6d93aa8b95faf1b3befb9049397b8e9583b10053a2e7f1fe1af2e81104cb7aa85327da9a72e0cdd7d43b02b SHA512 2f4ac3fdea111450adbbde5b3021b97db273baa1d2ae9188ab95baa772a696843c2685ce51adb8dc408ebf0924670eaf7b17c42bf1f798bb23d3037ff951e456
@@ -90,4 +92,5 @@ EBUILD gcc-6.4.0-r1.ebuild 527 BLAKE2B eaf3faad99c6d490834ff16f60afaf12f0b15e7be
 EBUILD gcc-6.4.0.ebuild 527 BLAKE2B 4d663fbea8169b0583374c0ec493b672aa8710641f5bf67fc5495861cfbd424b7cf32e7a3ab94cc9a790d5b8c93790a8835d8d2230c9ce8743683ff15d487a6f SHA512 5f0b4c8adf0e8a0c7a8d99ccad3dc3773ed9a07308d3def3c915b1328b8526d4097777ac3e3098c919a4f1779bb2d0d5335d6dd9a501a6c30357e58f094bcae7
 EBUILD gcc-7.2.0-r1.ebuild 536 BLAKE2B c49fc3fc2d74e828ede929ad94484371cc1a7ccb6e3198ff6127aa755f2af20ef56d1319d3ecdd4dc00c2d318c8b5406a5476eb2519c9358f99683db4f9b5896 SHA512 307cfe3c63d2b4238b8493d7047e7266430fafc48625f07ac1d850fa696a95411b5dd8f335a0f7e51fa17396f1ec3c644e240bfd5e086fff2a7b0eb2e68a3697
 EBUILD gcc-7.2.0.ebuild 558 BLAKE2B 64f93aa345b418bd324c5962a0edee943d0d07499702a3468021a15b63915ff1486a0f2d07ea7f1ba0899556d4fec4fc0b51abea662d8e5299fc7b5989a9fbd5 SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b
+EBUILD gcc-7.3.0.ebuild 549 BLAKE2B eceb8b3ab33589a6846370bc7fc28cb40a9caa3f54a176e0b755df2dd94352fbc4cd1c8baf5f7fbf4dd6bbbf29eea62a8403462d9445cc88230b3e80b5b235fc SHA512 c67caba85f1a17f70e2e3551c52d1f78a6fcf670e8d2555f06908fdd3f9a82b1d1df8076a739fdf86a80e89cf6dffcfe87110d4c25f630f6919aae2ee0bc6148
 MISC metadata.xml 2520 BLAKE2B a0b5788500fdb6eb7c6d88def963dba88b67e4f0cb4a5ca0def3a25600601d9f5b339a2f48759ee7e2cdb7d46269d0b5d9a9f468e15f5977c6c0a2214f89226c SHA512 ffb6644c39848805fdc8571747be210a3057a6189e9007c6a0371d5448fc37d45615d4293fff0ddcf599c6369146b5a54bbbb091d250548a486456ed89806128
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 2477f3ecf961..1bd5531ab99a 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.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 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 1065be0dc077..10a790a9fa05 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-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="5"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.3.0.ebuild b/sys-devel/gcc/gcc-7.3.0.ebuild
new file mode 100644
index 000000000000..8fb66c458cec
--- /dev/null
+++ b/sys-devel/gcc/gcc-7.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.0"
+#UCLIBC_VER="1.0"
+
+inherit toolchain
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
+
+src_prepare() {
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 2466180f769c..320e4121325b 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,5 +1,5 @@
 AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227
 AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD gettext-0.19.8.1.ebuild 3923 BLAKE2B ee1b4362e74423d056736ffcb31372829447b4b799e5e16e7d0035eb0dd905f1fc4e6c0802c4c7d13432cb96bea9670f7c17c6fb4b301c2bd5392c100468887a SHA512 0b3740ada8c6cfc03b9a6be84afab6d7d519d852f2d812f2f77dac666a475f6943e2bffac481816e66f066536b68b3e880030ee3ff928be2af2586b6dec51f53
+EBUILD gettext-0.19.8.1.ebuild 3911 BLAKE2B 99130d03785b560e1743c17eb43b0d01aa64d2b4abf9f0572021b015c64710cfb8f5b56deea35a26816056a097723fa33adf9b4e81085e6245d85508bda6d84f SHA512 f0ef8c9c90911e420b715cb98acf9fe64297d544e0ba7aab2bdc37b02c641bb93cf288414cda17683e534e9b238ecf9fe7dfef4d606c37951998fa03009e16a3
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index a17779b2d0f2..6c205b4c9d2e 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.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
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 9408eb391c69..fed2ee23e5ff 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -3,8 +3,8 @@ AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1690 BLAKE2B 53d43da59ed0b
 DIST gnuconfig-20161104.tar.bz2 49977 BLAKE2B 4d7d838c153abf2624bf53ceaefa43cee3f7321a36fc4bc64bfe8a22f93430faa43c28cb5c56a30d4818f7dc84fdcca7b866adc0cb557d8a67e7ca3e3a2f1daf SHA512 976b29363aaeaddf4d0520e1458b7fd3f91adf4e4f54c732acba984b9fd59a67c72488a439cc848deae32de8e6884b372ff5e5bb2972ea1e8eb9ddb222816f56
 DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440
 DIST gnuconfig-20180101.tar.bz2 51438 BLAKE2B c09ceb107bc446b04feb6fda500a1d869c8e0841bb72b7116c7bdadaa737cc25db2715ab3ce20429a9a7d4e0a5c0b054b63b21fc49da2f65e277169c34b5e2ed SHA512 3af359088e8e93c81ec49bfae90839266596c2566a663839b0e91c4d4319d2bfb91738af9d5fa19b9d53703979fbddd81294bcc032b46c33b94f1961ff9f2178
-EBUILD gnuconfig-20161104.ebuild 1554 BLAKE2B 63af6c3059565ec7b59bbce4542078e1e26f10291e2776c585eade100b331a40fe78808e800149083ee6ed7a0b63f811513494065deb0c58e0cd71567d0331df SHA512 c13efb975ace56230c3fb84430a3ea8651c9d29764bbd02a1b01a15c8b2785d58189d96ed3fb3ced0b461f02a9b9c7a6b0f87f241f86ef6e1ec0f67effca7cc0
-EBUILD gnuconfig-20170101.ebuild 1566 BLAKE2B c4adcdb5b6037a999ba9ba8eb0b73df921ce9976b3d455fa0d8c1c1a344a1c00314b61cadc906c2fa10404cc8049c81ca778c06234561118a3e6c55aa26fa955 SHA512 e3769cf8b82d5a6fbec1429562f4177c364db011134654fa06353c5eda4da33ac46540f088fe06abc4bd5a35146b6d7d057676094c831c07dc771ac669499143
-EBUILD gnuconfig-20180101.ebuild 1579 BLAKE2B de1e8b40ee1a5e824e5132615653d605c54d9fba42d5d0e5527806f7784a8345fb174bf3a3f068d094cd48a5f38b8faebf3dfa8685156f7deae82508c67cd352 SHA512 c8e5f2b572fc359637142ffd0fb43199a5902f6d4c8de52ad10313ed150c0c09410bb1388f4f27b884f6b86dd8eb56816e7e8d312e698b648e5cedce792b1c74
-EBUILD gnuconfig-99999999.ebuild 1579 BLAKE2B de1e8b40ee1a5e824e5132615653d605c54d9fba42d5d0e5527806f7784a8345fb174bf3a3f068d094cd48a5f38b8faebf3dfa8685156f7deae82508c67cd352 SHA512 c8e5f2b572fc359637142ffd0fb43199a5902f6d4c8de52ad10313ed150c0c09410bb1388f4f27b884f6b86dd8eb56816e7e8d312e698b648e5cedce792b1c74
+EBUILD gnuconfig-20161104.ebuild 1542 BLAKE2B fceb2bb00e44023d5d70ef589b93595e2fd7b191920373762bcbb431208b99c20009fb33da41a69d9d828e4903cf04fe38bebf408bad28b677670dcb744c653f SHA512 f9ab7bc629530ff6db87488d3e8d1c847843d9f9120029ace48187542b73eef3d3b85af7072b7fae8dc6d46e63ae77b3db4f71503c49ae92548ca8b34501400e
+EBUILD gnuconfig-20170101.ebuild 1554 BLAKE2B 8fa35b982436951e323773dbe70f86802238f07522f9d4d1178de03f026dfd091a825b78edcc52dcdc919aa21e4a845505a3f4e7a5e9c39c41936a12ea07fc0d SHA512 0b38335d9bf9782144647b9cb7c28e87b4769acbe67f812ea102134567d40814f411a676bf4f7cda5b7b939dda87f234b78ef83aaf094b8dc4d85d718aeb0892
+EBUILD gnuconfig-20180101.ebuild 1578 BLAKE2B 24eea49a9e182a4264b5479f4ce09358414cec16aea4bf48fb486d0aa19b16b6f5b23f20791d33a40aec50181d99dc3ea01ae3d70471f0d7c43d0192162a2015 SHA512 540fc032dda79504d8031753256cabe4351a3e4ecdbf1f6d8ac193b4f68a9455b18c383248041a915c538e7045ddea2adb5f4911b6ee2f5d6d90351868e801bf
+EBUILD gnuconfig-99999999.ebuild 1578 BLAKE2B 24eea49a9e182a4264b5479f4ce09358414cec16aea4bf48fb486d0aa19b16b6f5b23f20791d33a40aec50181d99dc3ea01ae3d70471f0d7c43d0192162a2015 SHA512 540fc032dda79504d8031753256cabe4351a3e4ecdbf1f6d8ac193b4f68a9455b18c383248041a915c538e7045ddea2adb5f4911b6ee2f5d6d90351868e801bf
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
index d001992debaf..60b5697dc481 100644
--- a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20161104.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"
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
index c85f19fbd4f0..92d06ef82ca8 100644
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20170101.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"
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index efb04d6f5b94..2629a1d763f8 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index efb04d6f5b94..2629a1d763f8 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index aabe7e997c8e..a837b654886e 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -11,8 +11,8 @@ AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3
 AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178
 AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r2.ebuild 2547 BLAKE2B 3a5762c308aae0ad2295d4d015729086ca6efe9f4d2034dffd6b97d74299f1171040bd938cccec8d7eae2b9f3a48823905cddaefed358dab93e41a73be11ef10 SHA512 3546833302cd1130c2d4a49be47642a8466f5352e2ce4ff09b01048668487fe24c808d58fd9ded3ef9fc9348431a13c45f1e6544b514709db9354a00a175156e
-EBUILD libtool-2.4.6-r3.ebuild 2596 BLAKE2B 3efb75d7882bbeb5fdb69ae356e062b5454a9674e630a9d972eac4a12ad8542770c19c65a752294c27d8353e0baac9625f95c4efe9396a4b406da1739ef728fc SHA512 d76207dd0ba94025cd24abb69a39c46fb40c5cb0ebdf953f833bce351311b1fdce05735dc125dd3a6cc79543da2e3777d3c101ffdfc4814a4d864ffdbf705192
-EBUILD libtool-2.4.6-r4.ebuild 3556 BLAKE2B 8d98d53cb8545726d34712e9cc6366e287af7b960f5bc8c98d8ec4443504c77786364aa92e58e4b324c2e1071ae796b3d521877cf884633a2d8960dfde1fe0e2 SHA512 7995965f86aec4b0c70bb457d876d8ccbd8cda160dd5b29596b755d1a9fc2a04e1dd2d26b68ee40e7013979c1671c50d999ab83c7fc3e27e5e7e9366f314fe58
-EBUILD libtool-9999.ebuild 3198 BLAKE2B 7608ed5bda41e86c5b7db939b699837d1c175650bdb359a263b44d1eca696ce7dd6507f8d01f1e35bc1bcc8b41c53c768dbccabc1d7f30c7e66278274ad8abf8 SHA512 bd7c6cd58d53d61afbf65ff9b086a7ab0fedacaa11bd2bfd3705c677217aad2c820cf31c22ebd50b08062a7df753bc063c5e79daeb62201bcab5a109655dfdba
+EBUILD libtool-2.4.6-r2.ebuild 2535 BLAKE2B 2eb8c6af51a7cd877c551cd043270093d72d3cbc3c49400b04fe207d71277ad55d297a5aa4ae59c2c5551b9816a0ca7bade9423546415be3f6dcc6367c305748 SHA512 b442d24c09ecd6d1784f216fdb40b973aa1e909e82436d92a451623ef3d4f30d6ca3d5c2b62b3ed39eedf1d7bc2713a574163cc783189f5d754b020a6edbd036
+EBUILD libtool-2.4.6-r3.ebuild 2584 BLAKE2B e646f26bcff36576129496e8a16f5e9d7ca2ed4f6b65c20a194fe479d9808d838851baf5c3ec376eae28bb65336d97d5afaf20bdcc993115259e1957fcdefbb7 SHA512 f5f1e55abcab7a7620e945d1cf2b4dc1e21b773c1ca63dc6ac63bd16e811e2dcd17ac794b984cc32f7ee2b7ead849673bc3aeb52e93a171ecd886a437c65e0e1
+EBUILD libtool-2.4.6-r4.ebuild 3544 BLAKE2B 93e11375702db5b7a64d739ba4ee720692e72a0067975dc5b811d78aaf8d94d45eacd7acbb60abed3a66ce75a47fb5395d585c0ea28288fab0ae5a354c84ce78 SHA512 31b78fdc2d1ac2a845ec8d3aaf318d048c74a28a6d6727f93e3c2cf96304102ecd9528cc21c4f39a0da3c30dbed8f325fc8d3d0528cfb004c5591663296f701f
+EBUILD libtool-9999.ebuild 3186 BLAKE2B bb0a808f342687208196b3e4bfff28031723baaf8cc95ef9060d2260ad52b546d583e7d09cf2c6fe72f87eb2e2960875e17b82128135d2bbc78b47f11e10e511 SHA512 a71dfbd53e4fe1de1ab5e502f020e571007ce92d99fc2f367d4fc801bc11c6effd26c7b63449614496dbecba1217e85a753bec1455c1637c7771155afda47a0c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/libtool/libtool-2.4.6-r2.ebuild b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
index dc45b7e1ae89..162264fa654c 100644
--- a/sys-devel/libtool/libtool-2.4.6-r2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
index a6668aefc4e3..2fb5d7bc99ca 100644
--- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
index 8267c48dec7d..55c2dc0ce40f 100644
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 75a255eea336..13af7fa0f519 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 477e0b42c6c9..cc1caaa1f0b6 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -2,6 +2,6 @@ AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da63
 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf
 DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
-EBUILD m4-1.4.17.ebuild 1643 BLAKE2B e4765ba78b36a5473448c9a9781ec5b39ed0541316b27093aa827762965cf33d478bd3ed0052b5bc503120dc09238fa71b433478d68c6adf239d6c98f1824778 SHA512 223ec6c3666c28c0e96457ad7589733266d97022049d43e9b55066061b518b36701e90d4dd24b8e1b1b5cbc386e788e1f0596361587fc34faf3e7d7679378db4
-EBUILD m4-1.4.18.ebuild 1425 BLAKE2B ccd468b4359070cbe388b7c31d7a08c23f6bf73496ee0b7a512593e3ca095500bac4656483602cf5495ef90f552c2a855181020a3786607ade859b61f5b16b79 SHA512 18be33c49542353bb56aee2522288d5ba3b9c0702b72fa25bdf7ff05bee3781655e9267e43d364370ef41a0dfefec8ec7c83cfc12067539d77f68d205798226f
+EBUILD m4-1.4.17.ebuild 1631 BLAKE2B 31ad1805e4ea0fdc1ad1d958efe5825447b4f4336c1fc21af7f07f9cf806bdc585eb35779f38bd8f6a7abaea98e5ee3e5505569208f020b83a8514d699dfddd1 SHA512 f4765e8b754c263d445007ac503250b157e6d28754dffc857a954a9c8fea20ec6fd73485887453a7892a738b49b8cc70e6dd994ec3671d742281565a419ca0b5
+EBUILD m4-1.4.18.ebuild 1413 BLAKE2B 015038e8cf29b0da0151c09d6b47d685c1a8b167a744cee2e85a9e0ab5c0613a676e1585f62dc001d54083390ed1bbd233d0d2d475b3c6d4441cac10112025f7 SHA512 b2c59652d069aca19c63b3ed6791327be94ee798b4c231e0d102392e20d2388220e9c14905b320d5496535ce9de7860a1998d2675f394df5a4169fc115710825
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
index adfd4d6afac5..15724cb8c2ec 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/m4/m4-1.4.18.ebuild b/sys-devel/m4/m4-1.4.18.ebuild
index f249374d1d2b..0d8cb1647bf7 100644
--- a/sys-devel/m4/m4-1.4.18.ebuild
+++ b/sys-devel/m4/m4-1.4.18.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"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 56c3934b763a..70a3dae89240 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -26,10 +26,10 @@ DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a
 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 EBUILD make-3.80-r4.ebuild 1024 BLAKE2B 5687ada5487bb28ec589a7391efab1b7b1a09bcb8d96d0d2169d148b45ace5d352e484ef271dd44aa010463b132e1d3bbbe398cf00019f9624bec4323e2387c0 SHA512 072bb62e7b41a1b1b7904f2bb4da50daa5d1355d7bccbac1ed58aad82dfe8e1fee5b963e2640566019617a9196880f93d1c3ea9a3ddfcd33d6e7e7af5aebee2b
-EBUILD make-3.81-r2.ebuild 1198 BLAKE2B 4bc9edb45e3ee73e04bddd5dd3b9e70850fd756ce876edb8c582fae6984ceda9ba9a9707694f33d4b88ebbffff5c744cc1acf7d57ea8c4d3c3bddd7ae6b293e6 SHA512 d2348b81a5fbfb9406d8b2d178ce46dc9f91e6c492a10953f39a87fc977fed5a4a1644f76447c08ea45da97c01481f02b6e97ec0605d69313a54feb191bf4c1d
-EBUILD make-3.82-r4.ebuild 1698 BLAKE2B f115c1da58be6aa69b9ccbe1bbccd1c108cae53b0ae4e1224f9446a9745265e4797a2a1b43c09ee1a055c7f95babf7cd21dc155ce9a64c0284d8e4d34286be72 SHA512 efe00112524c6dacac99d5c60b8cbddfa4942631450106ef35e822c854bf1fd32d56a487f6a96def9870b04e8a1a914e7055649ec9c295a920031629f902f3ea
-EBUILD make-4.0-r1.ebuild 1296 BLAKE2B 0a4578081dd48abcb43ed0c59c25b3d9a566d6a799d9897634fdaf5f3adfc64a3a0c096e95450d7b753e5e0d1e8c0cb56ae1fd244f545d5eac8190120fece6dc SHA512 dae5616eedd77c83eb4b2cb9d54a02740df9f82f7d4333a9aad382f9137c039cf897a6758eb314afd9bc2ffac454fc9ae975b3d8a9d0b7761ae4d0d9afe2367d
-EBUILD make-4.1-r1.ebuild 1306 BLAKE2B f2ee4b2e73b51486fa35576933c59b8b9e3518e03e31da41832b2e23be38ecc117937429a381ff2267696c600d9554886dbd832403daac6629a53694d2d45b48 SHA512 42ba99cd73a1af23b15cca67afa469fa048c77a7a1e0870f94e8f6eb81b825ca2a379e49a1c4093d45771db8b625545cb5f362c815c1012474c4b5bbf6c73809
-EBUILD make-4.2.1-r1.ebuild 1343 BLAKE2B 74c454fe686b55982c90509a30091b341b13bb6241045b7fe0eaa942d20878899290da1a35239a2ba6908a6df72e65709bd9dab271f5ee37ca70c214b08c8ca1 SHA512 3c990f6788274012a5db9f18c04901b6761c7729bd78fc583f629f8a6e7f3e3c9a696afe8e9483fbff8fd685acd2c03bab256b2aad11331efc493120d3e863f3
-EBUILD make-4.2.1.ebuild 1291 BLAKE2B da4ae25454f0a37218b9d8d99f218b01f3e980a84438fe4124e9b59ab943bced0fa1143e54fdcd21953db36330990a033f0e988b1c6566ba13dee3df9e77c9ed SHA512 ef759245fedebf4ee4f83686b10ecc50d53dc80c99c5fe9933f1738b04ea641685ce74583f04bfbbe8bfc84257f82511a7eafc010b5f05cf755599205fa200f1
+EBUILD make-3.81-r2.ebuild 1186 BLAKE2B e27d82e5d5974998c576d22d31657c30dc0435baa6b8bbf9a99bd2ea017d73109764d2bb1f593e04ec8d70dbad64112c8bd79d3d76082d044261989e0914fedf SHA512 a1161dc8233caf53faae46e2098890aabf4015e9939db82d280784cc0fa6488e0ec90698bedbc336bc754062d9f68145d10c43767a4574105164409eb6df494f
+EBUILD make-3.82-r4.ebuild 1686 BLAKE2B 297e3f87d00d308f6560a20e4b9d262721840379eb128f2e8d5a858285123d12c482630aea7954ea7d6d4e52618c32f844e1741b8948b14e4b23964c60b7271c SHA512 2894a438c9f2949b7b72e9a6fcb6421ddf6b906029e265ced98b504b7e1e42d1036f611a1ba703c3200e4d39c3d22caca5f0c97698b425f2a333d6dc4f79caa1
+EBUILD make-4.0-r1.ebuild 1284 BLAKE2B 124d6a7ba1e715ce7f584991c209b53e803fcdb2e9b423481a0e46f8e868a48a19db282554d21a7a75603a72865d25986f746647ceadfe2b833bf4f0b8875598 SHA512 5c2d8ff215eca2f4179c05646a3d5bb67d2aee689e0dae23b964feacada4c166096af46ebaf5b1af20f4cf74c4b3f5275df4a1d7571643079a09de407b64a38f
+EBUILD make-4.1-r1.ebuild 1294 BLAKE2B 79312e1a1af06a8a44aa014226e5c1dbdb16ffdeeb65053181552257f62231f0f5b0e88287a97c4c6eb721d76e02f4a07ea5f7523329ee5497f3f180034e9de5 SHA512 87afba6be03d935e44f94547d12f1bc265774481a065834694b42f083675fb7b01ad00233321c096e1e93e23436cdacb20933b164687b4713d821daecaaff0d1
+EBUILD make-4.2.1-r1.ebuild 1331 BLAKE2B 9568096a47d804c498a8d0565f6ba9a2fc286c7670b45223f99d5749353cd00e66521098c19a9475bdea11502719c756984ac860fa1bffcad37f02618460055e SHA512 495f0066f844d734a2d6b3f88fa61ea9a42a3206fe602c3e56955bbe05913215a4d71561f9e9361daec0af35eb654e2b2c1528afa1ab7299a139694ecfa104fe
+EBUILD make-4.2.1.ebuild 1279 BLAKE2B b66f41084e582559c27b35ab949de5882d6ee70482d65bf59a852ca25f082783ce8e87105d82cccb3b1ee097016767fff76b82a7e587a6b53a8c607eb4ac8b90 SHA512 9ea46005da11e9cd5093a57be8ea395ae619df2e9593a5ce3da5c2750289b6e2a5901fe15bb49ed55bd75cc4cb029d1632a49196dd100feb301012bc353bb60f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/make-3.81-r2.ebuild b/sys-devel/make/make-3.81-r2.ebuild
index cd996376ff85..591e437df37c 100644
--- a/sys-devel/make/make-3.81-r2.ebuild
+++ b/sys-devel/make/make-3.81-r2.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
 
 inherit flag-o-matic eutils
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls static"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-devel/make/make-3.82-r4.ebuild b/sys-devel/make/make-3.82-r4.ebuild
index 49dece74fb9e..29a60321b85d 100644
--- a/sys-devel/make/make-3.82-r4.ebuild
+++ b/sys-devel/make/make-3.82-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="2"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild
index 43b8b2760cdf..57aea69cf2cc 100644
--- a/sys-devel/make/make-4.0-r1.ebuild
+++ b/sys-devel/make/make-4.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
diff --git a/sys-devel/make/make-4.1-r1.ebuild b/sys-devel/make/make-4.1-r1.ebuild
index f531d4104c13..b893857aa79d 100644
--- a/sys-devel/make/make-4.1-r1.ebuild
+++ b/sys-devel/make/make-4.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild
index 2b944c675fad..6a81c5417ba5 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild
index 70e90b6bf623..7433acf56961 100644
--- a/sys-devel/make/make-4.2.1.ebuild
+++ b/sys-devel/make/make-4.2.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index efead5bbf64a..0105200b55d6 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -1,3 +1,3 @@
 DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f
-EBUILD patch-2.7.5.ebuild 922 BLAKE2B 7487ca345b4a884f8ecc54866644fecfb703ddcd3f4a00b8e34ab4fcbb432886ad003cded932d0b70fd6a8207f63548d8c5d5c4b0472ed9a457fa7e5a25351f7 SHA512 52ed38cd7c035b371617a1e2bfbbeaa7221d2e8f5f8832c66c0f51706802b61c86fc0ee05ebfab9efecd10e3d684f8839c6a80baa30abf1be12eeb06d19edd5c
+EBUILD patch-2.7.5.ebuild 910 BLAKE2B 08bf1c4632e99c913fa5134ceb366c60191e770a26eb4351d413b28616654233671925332f0fc78e66d97ed86cfa9d6e1e0267890eb52847a339423e3b5da94c SHA512 103a71c3bc37159dc12a21f60c3d3709c3bb6b18a6b18d255c89ed00ad4a28305afd4e58ce98b7109c364ca884d6247464e006e9bdccab299bebd7f0b7664fd8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild
index 92310e30ad67..04f387d863c2 100644
--- a/sys-devel/patch/patch-2.7.5.ebuild
+++ b/sys-devel/patch/patch-2.7.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index acd32f776d00..a4962ab97ec6 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index b4572d84c46a..f589e18cea3e 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,13 +1,10 @@
 AUX boot0-11.0-gcc46.patch 481 BLAKE2B 32b905518fbb8c4016afe4296715369b344ab0397d4df7c3255d5b64d2600d1b1715a071ff720de74f44bb89bd623b850f0e11d7f7acd587c550b30d4dfe704c SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01
-AUX boot0-8.2-zfsboot-makefile.patch 436 BLAKE2B 20ebd3be758778b24c56e23c8dbb70dc354ef9cbb9265e2c6359162db3e5a79836dbc82b9dc1d76e4fa329190b51ca832858a5f0cc5d8b4312bca916bdcdfe49 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2
 AUX boot0-9.2-gcc46.patch 2119 BLAKE2B bbe757cddd6808b0df4769a63e78ef4e83364a7bbe9b2c738e80bff50bc7e90d5203fdadf8aa1ad96411564ce229818c286606d2cb1eed87e7dd577e626c3474 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9
 AUX boot0-add-nossp-cflags.patch 341 BLAKE2B 71eecc9af36e07b331ef842d1cd52688d5c8e152b54a44c7598253bc7078ab8f84a5b8aaa54a796ae88aae9d262546a65a86a35445f41ea1772b4434bf194e0d SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-EBUILD boot0-11.1.ebuild 1940 BLAKE2B a3f1b3c8a6f2cacdc8b333ff5481653628f40ea1201bc680d0e3f61935839093dfec7888dda058f4db890a50d42442d8bfc25e4e408fe68fcd895cbf40448025 SHA512 8d8890bac720309a9ee5e56e950139ec0a3862d64643b73f92bb7783da8ac56db1d271fdd09bb7aa19f062ef6b9ffbac3b98d952d982911b3392fc59a4fd94eb
-EBUILD boot0-8.2.ebuild 1181 BLAKE2B 30c73d35331a20e505f2a912144734c8d4c0df42e41d65c1a90cc07ac1f0fbd40b971696f85d3ea7a78aee2f3deea486b76e9b563f2c0e9839117023653960ef SHA512 955c8d97b4ca370a9e8941ccec006d113c89baa25188abfb0e5e9d14ab1c9723ab3c2e32ccf58adbe2f3730c69f782abf645dd6931e1e6a689cba72b3651fb32
-EBUILD boot0-9.1.ebuild 1477 BLAKE2B 20b29953677e513427bd3a332902cdbc2d1f5c4d0c57de96a878ac1750863b7fc68ad8ad9cfe6af50bf0564ddcc0d8d6e233b2a5d9949969d40f311a09f4f51c SHA512 fe21b5d7105aecf6419be9339f989f85112b7f4ef1c061c069a60789af202d49bec44123aaf5f69d8ea732d63d87d041272540ba988b054ff51fc08c0b43bf06
+EBUILD boot0-11.1.ebuild 1928 BLAKE2B bcec8c212cbf66cb521010b5a91e6f5c3189c69821ba98139f90aba64efde512e9890803ad6ce9798a754bb39ca1b08e37154d1e520758183cdb6fc745c0ce72 SHA512 d68766eaeae64385bbc4d241704f8099b7a81bd38c56f63b2b9302666874f3876f4958d23b43d3046fedbfbb126e1aed7f09af13f05c346045c58f952ce7a135
+EBUILD boot0-9.1.ebuild 1465 BLAKE2B f1cc0b6d2207a102005e1022315d9f0254e02683a936e8f81ae1d269535589c8d08fa6d76ab235f83976852adeb896068bdcf0c740799c0c2b53fe1ecd870726 SHA512 bab0d5a99eaeeb5ed3a47903f9a28c277bd8047cdbe5d8affb4e32a22c0af3360f073a4d4f41d7a893263b724b1fe46ab4df978f210118db00523d25d73644a5
 MISC metadata.xml 385 BLAKE2B d91b401fe4cbcbe6eeb2e0621e7dc26f0c5a26e11219828fd0df652231d7ccf809b2824eb995463cac8e14056e3065a189667f2351d24510fe0980ca6b2a77f8 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808
diff --git a/sys-freebsd/boot0/boot0-11.1.ebuild b/sys-freebsd/boot0/boot0-11.1.ebuild
index 2f95e76f3e23..6b33a6891f7a 100644
--- a/sys-freebsd/boot0/boot0-11.1.ebuild
+++ b/sys-freebsd/boot0/boot0-11.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=5
@@ -14,7 +14,7 @@ IUSE="bzip2 ieee1394 tftp zfs"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/boot0/boot0-8.2.ebuild b/sys-freebsd/boot0/boot0-8.2.ebuild
deleted file mode 100644
index 1cf02f669187..000000000000
--- a/sys-freebsd/boot0/boot0-8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}"/${P}-zfsboot-makefile.patch )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-I/usr/include/libstand/"
-	append-flags "-fno-strict-aliasing"
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/boot0/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild
index df9341b45fd2..54793cef68a1 100644
--- a/sys-freebsd/boot0/boot0-9.1.ebuild
+++ b/sys-freebsd/boot0/boot0-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD's bootloader"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="bzip2 ieee1394 tftp zfs"
 
diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
deleted file mode 100644
index a3a33d5d7c5b..000000000000
--- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index bb16ea3..7dedb49 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out
- zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
- 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
- 
-+drv.o: drv.c xreadorg.h
-+
- zfsboot.o: zfsboot.s
- 
- SRCS=	zfsboot.c xreadorg.h
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 252bc32e0c03..bca585898143 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,12 +1,8 @@
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-EBUILD freebsd-bin-11.1.ebuild 793 BLAKE2B 6cd1a92c1428396b0e0db005783643dc60224d9337175074470fa7592cc1773babbdf1e0a3eec42bd0f706cb32daacc2f5b5641b21f9621fff8aff09923f95a2 SHA512 bd94a54161944bf37c9cbd3e45d00d01328340952e379d168f47ff0b951f77b96f47606b8fec03d31e29b6086a8d3822b065873fccb793114dbc5beaa1b697bb
-EBUILD freebsd-bin-8.2.ebuild 763 BLAKE2B 4a5ecc79225e09ddd3dc487f3ada444aef4beacdb95b42247ef33c06e70a430f47abf9599cb4360b9618a3d0fa155597ecfc8b23e12c39ee4244b1635cf1d66b SHA512 90cd9abe75073f7b8af399637cb7e0f022200b91a83dfe5623c0d9e7def4d62f5b45128bda87b47f4a28fec3fce3c0bff8ea25640106edbab0635388537afe28
-EBUILD freebsd-bin-9.1.ebuild 827 BLAKE2B 32f5ddca5528cee8438a0ccc7551526b1219d2cde5dfeda0a094adce82b164c1a47f2b48d8287e5746aa5327d71b5cc3913b07decaadcb8142ef2a01a6c75366 SHA512 fc658efd1a1c38bb07af1b47a194cc4b6a8cf78eb5f8c8119aa8a2ef07c84b16b498acf676119752928aa919f1e8e181b4908395f7b10c88b7540ae785c47fff
+EBUILD freebsd-bin-11.1.ebuild 781 BLAKE2B b64305d2287a2c6bf2068b7d593ae23689f3ecd6b0398c72ba13c216f94d4259ca61613017bb061168c35d932ba3dcc739fd507fefb5f2852f21dc3dda119e3e SHA512 66d2e50f2573749f76886ff09622cad56d2ecd6ca442ba20b587fedadbbf2a88ce0e57e2ed18f493f8288fb1b10222a90771c1c8292e762e45ac3cae2c3c1c3f
+EBUILD freebsd-bin-9.1.ebuild 815 BLAKE2B ea0c0dcd6ed2b27cc006805845d14a23637bc32abfded442123f0eac38404e35c9a09a1a2f1cfed82775304d7df2c1ad55062731b2f21d493ad7957e408e4a5e SHA512 7fbe3d65912506b9a791fcba255c4b6eb658048c0f12d717bcc0a659ce51f5425bc09bc1ae5c6f8f43cd0965d66455ef3476db4773de1a0b62c13ccf553bbf76
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild
index 37b3ce22d25e..6451fb41815c 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-11.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=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE=""
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild
deleted file mode 100644
index c23585e5b02b..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	dev-libs/libedit
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
index ff05ef637a63..fdda872991a2 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd
 
 DESCRIPTION="FreeBSD /bin tools"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE=""
 
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index b7bc9acffb6a..437111bde674 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,29 +1,18 @@
 AUX freebsd-cddl-11.0-add-libs.patch 3401 BLAKE2B b0928c729f7a95d7cb7e33718917d5b021e2ae782a43b6ab68e5de61781f9f5292d48da7850f9a2188c28f271fea74344d6bfa10e7655b79435ed3db569fa9b4 SHA512 7a3da3a57bde26a79784dcb023961ed0a292da4945c49e07c4a69035fe6cd0773e09cec25eab638a64c6ccc54bb775c169b1553743f7a9b4af60ce49f1fee54c
 AUX freebsd-cddl-11.0-workaround.patch 576 BLAKE2B e1b7fa79a82812ba5543245c1051f7ef287dfd68fdd99a8808e5def821c640f258f0a9405641b853e874a4ee31ec2e1caf948bbd6de36327678ce4c28ef2629a SHA512 0a2280caeb23622454351657d61e8e465c597b82bf49cb534a924758844cd7da2df330434ba6282e159d9bc2e6ade27c2a9db41980ada6370bcab59c6a57da22
-AUX freebsd-cddl-8.0-libpaths.patch 4418 BLAKE2B 0c105003ec860565fa8f11b484db1d203eaa423c16f373eb3414a444639496a6d10407af51112cbeb8435cdd462650a4815abd9bccbeb9564a74a470bd342f7e SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5
-AUX freebsd-cddl-8.2-libpaths.patch 822 BLAKE2B 26d0a5d5446fe6f380f99fc1caad1d9cfe7bc3f1e2cd7779a0daa51fd1aaaec2edc2a5c2510ebbfe75d437886ed6dc3e74de23b03363e26239fb8e3350540471 SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567
 AUX freebsd-cddl-9.0-bsdxml.patch 1419 BLAKE2B 435e028205fbbdc0aa46763cb4de491aebab62459f485a9a5fe6d4e12319a5674453bf37fa33aef5a04194402fee9ec78e9eccd255fdd55f833309265b784853 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5
 AUX freebsd-cddl-9.0-libpaths.patch 7621 BLAKE2B 1d743118005f6e92d960a782e633e1d8095fa1cc38c5c9dba9176b07ec188653140e2ec4e7ace83c80968e35109f77e588e2042273ea81d8ce12008f3b349911 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278
 AUX freebsd-cddl-9.0-underlink.patch 755 BLAKE2B 6d9987c6a0f491ad0afc47d169e10fe9fbe088bcb287bbc40d1707763856ae9ff936ffe54ddd5fb2f1304d3d46c4d93832b628802ead75a663b80f7cbda74225 SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9
 AUX zfs.initd 368 BLAKE2B 932c990c341246aadc23702d107591195ebd5bbcbda9001c36fb16d7a354f33f4afbae2f54660f6fc0a621ab7c97447532009a3d9a8080639c181ec216960b4c SHA512 6b1c0342cbd4dd7e84df58240be3ef8bdc9924a32abe9258d76c87b187be5cb5776125c5989b9dc9bd1210f46216b8f478d2ecb8cc9d165a960157fadc9b5ff8
-AUX zvol.initd 838 BLAKE2B f02ce3583f3f1da7cda7db40d79dc5da4e293b4ed3e3df7fd94aa35fefa2e0e263e25527279b8219250ad6212a9131690b5d17830bc755de08b36f5f9a614437 SHA512 7a535e3f698bdde4e181ae420d88d76d11f308b0e38d8acfcae41281e05ec05166a2df9df0b3a57844991d166429229ba725561799dc26cbb2e7585094f9783e
 AUX zvol.initd-9.0 812 BLAKE2B c7aaa3d415cd59f403ed520831b10433f2ec2ddce420642b84bca33566244360b641f87760ea0276ccd281b2b946200cd7c9a592e3c67615d00a5a7fdc7c085b SHA512 dbd113cb8f072b001e5f696ddb142df063f12b29a5b16af99f3b00b8c511af87a6094bd210f384ad03a300c2afd7af249cdf278a6179a3f53edc439c3a80f566
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
 EBUILD freebsd-cddl-11.1.ebuild 1664 BLAKE2B a42b0759c09de7d2ef1acbd2bc40efddb1ded8c2dc5f0e42b81fb47ba9ef3cc795d06f907b165bd0df3ff42e90b5988cc2cf5ddf89b784ee9e7b1d2fc17294a3 SHA512 9540e2ab16ffc95451d3439eef6382484a80ea4a06ee1c65b77e9892159a1ddec1ef74bee79222db6e94e17953e65dec6142caae1a6054d10882ddf832dfa3d1
-EBUILD freebsd-cddl-8.2.ebuild 1176 BLAKE2B c16a5e6b5edb7f540640ace3462307573dceee029fb95c0319390fa84055ee17e74494d7bc8ca8623eaf1ca02ed644865bfec75e19a890905f6299dc1cc574b8 SHA512 d3c56ea3410338b56db20132f6f4485e60116bb9d959eca263bda5372e007a650dc23c308dc63e10ef53618531ed7d4f7924dfe2326dc2e9093941f749908a60
 EBUILD freebsd-cddl-9.1.ebuild 1477 BLAKE2B 9ef8e2fd85bc542efa623a5d222f7d33fc1b058edea4d78de0845aaa5740a6fc785089359d8b5aff79335047cfbd06a44bc25c294e5d195d9ceb1fc016feac43 SHA512 22724b107c8fe47f3148eb32982e7e46deb9c18fa9f54af2be7cf2733db83cdc1213fd873b62dd425232fa3dbc08f569fcd1edbdd89bc7b86d283327bd1e8883
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
deleted file mode 100644
index ad5c83eca3de..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
---- cddl.orig/lib/libctf/Makefile	2009-01-24 03:36:33 -0200
-+++ cddl/lib/libctf/Makefile	2009-01-24 03:55:10 -0200
-@@ -4,6 +4,7 @@
- 
- LIB=		ctf
- SHLIB_MAJOR=	2
-+LDADD+=-lz
- 
- SRCS=		ctf_create.c \
- 		ctf_decl.c \
-diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
---- cddl.orig/lib/libdtrace/Makefile	2009-01-24 00:18:47 -0200
-+++ cddl/lib/libdtrace/Makefile	2009-01-24 03:31:06 -0200
-@@ -74,7 +74,7 @@
- .endif
- 
- LFLAGS+=-l
--
-+LDADD+=-lz -lproc
- YFLAGS+=-d
- 
- CLEANFILES=	dt_errtags.c dt_names.c
-diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.orig/lib/libzfs/Makefile	2008-06-22 10:26:18 -0300
-+++ cddl/lib/libzfs/Makefile	2008-06-22 10:26:26 -0300
-@@ -7,7 +7,8 @@
-
- LIB=	zfs
- DPADD=	${LIBUTIL}
--LDADD=	-lutil
-+LDADD=	-lutil -lgeom -lm -luutil -lumem
-+LDFLAGS+=      -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem
-
- SRCS=	deviceid.c \
- 	mnttab.c \
-diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.orig/lib/libzpool/Makefile	2008-06-22 10:35:15 -0300
-+++ cddl/lib/libzpool/Makefile	2008-06-22 10:37:06 -0300
-@@ -42,7 +42,8 @@
- CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
- 
- DPADD=		${LIBPTHREAD} ${LIBZ}
--LDADD=		-lpthread -lz
-+LDADD=		-lpthread -lz -lavl -lumem
-+LDFLAGS+=	-L${.CURDIR}/../libavl -L${.CURDIR}/../libumem
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=
-diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.orig/sbin/zfs/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zfs/Makefile	2008-06-22 10:14:23 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
-+	-L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.orig/sbin/zpool/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zpool/Makefile	2008-06-22 10:14:47 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl  -L/lib -L/usr/lib \
-+	-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
---- cddl.orig/usr.bin/ztest/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/usr.bin/ztest/Makefile	2008-06-22 10:12:40 -0300
-@@ -18,5 +18,7 @@
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
---- cddl.orig/usr.bin/Makefile.inc   2009-01-10 07:21:10 +0000
-+++ cddl/usr.bin/Makefile.inc        2009-01-10 07:18:55 +0000
-@@ -1,5 +1,6 @@
- # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
- 
- BINDIR?=	/usr/bin
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
- 
- .include "../Makefile.inc"
---- cddl.orig/usr.sbin/zdb/Makefile	2010-03-11 13:19:48 +0100
-+++ cddl/usr.sbin/zdb/Makefile	2010-03-11 13:20:08 +0100
-@@ -22,6 +22,8 @@
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs
- 
- CSTD=	c99
- 
---- cddl.orig/usr.bin/zinject/Makefile	2010-03-11 13:30:32 +0100
-+++ cddl/usr.bin/zinject/Makefile	2010-03-11 13:33:27 +0100
-@@ -21,5 +21,8 @@
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \
-+	-L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \
-+	-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
deleted file mode 100644
index a0e567790473..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cddl/usr.sbin/dtrace/Makefile.old	2011-07-06 00:09:01.000000000 +0000
-+++ cddl/usr.sbin/dtrace/Makefile	2011-07-06 00:09:48.000000000 +0000
-@@ -24,6 +24,8 @@
- #CFLAGS+=	-DNEED_ERRLOC
- #YFLAGS+=	-d
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
---- cddl/usr.sbin/lockstat/Makefile.old	2011-07-06 00:10:33.000000000 +0000
-+++ cddl/usr.sbin/lockstat/Makefile	2011-07-06 00:10:57.000000000 +0000
-@@ -23,6 +23,8 @@
- 
- CFLAGS+=	-DNEED_ERRLOC -g
- 
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+=	-d
- 
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
deleted file mode 100644
index 28eba8e8c687..000000000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need hostid
-	before fsck
-}
-
-start() {
-	einfo "Starting zfs volumes..."
-	zfs volinit
-	eend $?
-	# Enable swap on ZVOLs that have org.freebsd:swap=on.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Enabling swap on zvol ${name}"
-			swapon /dev/zvol/${name} 
-			eend $?
-			;;
-		esac
-	done
-}
-
-stop() {
-	# Disable what we had enabled before.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Disabling swap on zvol ${name}"
-			swapoff /dev/zvol/${name}
-			eend $?
-			;;
-		esac
-	done
-	einfo "Stopping zfs volumes..."
-	zfs volfini
-	eend $?
-}
-
-restart() {
-	:
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
deleted file mode 100644
index 32d09d66b25d..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libedit
-	dev-libs/libelf"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" "${FILESDIR}/${PN}-8.2-libpaths.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-	# Link in include headers.
-	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
-	freebsd_src_install
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd zvol
-}
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 7f4986d9248e..47a92c9b3a04 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,7 +1,4 @@
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-EBUILD freebsd-contrib-8.2.ebuild 1372 BLAKE2B 18990d23b562a13f67d2dae0877253110f83c166354a32e4ef00382e33b52757fbef2b1c24b74adaf134e2e1e43efdc9f04022d7ad043875b021e6cd8cb9a1f5 SHA512 68fc03d8548e7fcc7689b9a80213dcfe4ee804b42fbee1cab8e1d5cf7659f0f68b6922c5134fc09d8ba01e5b2285383cb3222503ec1fe45f0ae2dfa9f3cd265c
-EBUILD freebsd-contrib-9.1.ebuild 1398 BLAKE2B cf228727c77311daab74e338f7c72c042caba9a99573092b7e5fa574ea42afa0e01e35ca0c4ef1dcea69c4f14ce05ad404ef5789ed5cdfd4a51835e04ecff0b2 SHA512 96875155a5ce72b8b96215eb8145b20b67069dc06c0daa0d9d6ec6ceeb227e35a5db112ea4397e2cc810f208bc7e99bdcbbfddcb662365b6d782654f79aebb97
+EBUILD freebsd-contrib-9.1.ebuild 1386 BLAKE2B 10dd9af7dff56f73df7d83206a2afc9967e47ef6ec19772752bd22be3a0532cfc41ed24e06b2892e764ed46c7ce2f7a9afd38c7c58418e70a8cac8b74a241851 SHA512 871e5ec4719be7adc64d9200e9506da4dd5fda49f98ad87a95044655f92ae58b354aa6fa054f5a4d43b21480eee40e4801a618c16dca17b7eb8655e39dcc869a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
deleted file mode 100644
index dbb13edb4b59..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="Contributed sources for FreeBSD"
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!dev-util/dialog"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
-	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
-	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-}
-
-src_compile() {
-	cd "${S}/lib/libdialog"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/sort"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/patch"
-	freebsd_src_compile
-}
-
-src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
-	cd "${S}/lib/libdialog"
-	mkinstall || die "libdialog install failed"
-
-	cd "${S}/usr.bin/sort"
-	mkinstall BINDIR="/bin/" || die "libdialog install failed"
-
-	cd "${S}/usr.bin/patch"
-	mkinstall BINDIR="/usr/bin/" || die "libdialog install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
index 0a810660b414..7b6b9ee87f45 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.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
 
 inherit bsdmk freebsd flag-o-matic multilib
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${GNU}.tar.bz2
 
 LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index ba027d6da7fc..25c5bd931da8 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -5,16 +5,10 @@ AUX freebsd-lib-11.0-libproc-libcxx.patch 350 BLAKE2B 0b0a9886567b9c81c8159266eb
 AUX freebsd-lib-11.0-workaround.patch 295 BLAKE2B 3e0fa9e7c981caeb11c75e5c7ccfef597a6129c0ea098f2d6945aac4439cfc9f937463b989078f4148e995efeee28cfc81de77e8a1acd7da9a3d913c5dfe82e5 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a
 AUX freebsd-lib-11.1-liblink.patch 4233 BLAKE2B e088abc8f738475e09793cf59cb41257e2143a8daf7dbbdeb81190aec95e6d15b800862033353e556d87f757be43693e6b0895a6900fd58fff580ef8e6f1279a SHA512 23a875fa84685c7a98ddb08b1bcf831613239a6079c1711362bbbd19f27b67e61eb203bafc48c9ad06b9344258005e4d04756d4f8caba7c9545f3f86dcb52830
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 BLAKE2B df851549b6978ab7b59585fbaec7c3bcea19f8eb6b1a2882343618c21ef2533fb8a56f9c8a362b7c188c97e5d0091b02288a457fe114b8e2e6dbe4b69bfad62d SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec
-AUX freebsd-lib-6.0-gccfloat.patch 542 BLAKE2B f2674a83c2ce30769d3d1270ccc19d3f63a77ed8bbe1271b9009e10f085f50b0495db6d8857b574093df9e77852fd9f15bb9902e989fab495d985c2aec878489 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495
 AUX freebsd-lib-6.0-pmc.patch 338 BLAKE2B 8c587f716fba0237e114af0c1860493c2aff046447f4469ba813a67e44779caa58f5b45108dc12634b7303401725006bed3b254459993972894a242737bb08bf SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327
 AUX freebsd-lib-6.1-csu.patch 655 BLAKE2B acd7ed7144a59494d656c66e823c884f4cf5c112ac1ec55add9c25745ce737ed1c6e56c82e8a0718c8c1ac3b8ab7b2e8edd51a1aedaa5f6684d6ba4e30771722 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4
-AUX freebsd-lib-6.2-bluetooth.patch 243 BLAKE2B be8f5a3df5bb0e057e1b915132adac68d45f774a9d21bc894d34ee7568bca6ae59d9aeb9b140c76159208b3a5a00c8e7bb0a9ce3ba60cb1aa8717bad6c1c4d53 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc
 AUX freebsd-lib-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f
 AUX freebsd-lib-8.0-gcc45.patch 1264 BLAKE2B ad0884780b17fd02a6347e85654feadc0a496f4463ce2e8e796c74213f5554c0d61e595dc1e9b1bfb30a431f3fda5863ff0a2dda046bfb0f01e7bfce7ad991e8 SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57
-AUX freebsd-lib-8.0-log2.patch 667 BLAKE2B e86abb07093ef9d1b969fa6ebb36421ea6794b3391952e739b28f6fbaca9941d71e1f206d3d673ed3cb2f7b68c84492a043989885514a1b77dcbf3f9cf264528 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 BLAKE2B 6b55c568735d7d04f2482d6cad3f3c7db0c8d05dd04ae64e021aa8ef8dda58d23c587b74a722c469809ee09b86ee5ced416c663cf4a43e616b174b28d44de438 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702
-AUX freebsd-lib-8.2-liblink.patch 510 BLAKE2B 012b5fad0ccbbbda289f33cade8246b5be62683f2cdbf2b33cfb610961bc4912dd27067d79d2f93a63d2c8b85fe731d3ebbb584ebaff3b698688ec24dc2c634c SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 BLAKE2B 2660947da1058ade5c9c88d4960876d8a535883fe3af00083a9fa2c448c0e80e8fc2e9fbb21ee3583856f73078a768efdfe3a8dd217ec8d1c3d6f96502676065 SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd
 AUX freebsd-lib-9.0-bluetooth.patch 318 BLAKE2B d86b2c48ca86bd3415073f03c311444eb3adc32f7990754396fb6383c63ccd66b3aa562d75c1817941c59497fcb709f59df1e49186f6a59a437416f8bbbcbc41 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488
 AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 BLAKE2B c8e49014e253306abac9752cc3e308da48f76ac02d96888848645d98bc2e9aa8159e56710f7e6df1d6722d25463aa8c3827151565f30e33d31a8fde1abb46f44 SHA512 bb7090a0acbf8ab431334245b1e767da60dcf8f2d23de97a4690e879ae5d528065f5462e2ad3647313662a906f139cfff04f15bce80efede2d2174f74792a07b
 AUX freebsd-lib-9.0-liblink.patch 627 BLAKE2B cbd14d69fc854e60d32882050ef5e035e51688a3f5b426488d2d3c58e45f956cbc62a4d76345d99e9857370094d969cd6f50a9a0c1ae8e04711de5d6f68bcb80 SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616
@@ -36,26 +30,16 @@ AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e17
 AUX sprayd.xinetd 216 BLAKE2B 8e154d0eb67616b6245a002d95b260c32243c8f230861b31a51f67b84d6b56627f2328b58db5cc6d6df85c8831d0c1996ea707ff0058a059b7b5b77a81b6e59d SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
 AUX walld.xinetd 215 BLAKE2B dbf0093f41762c8e493e34bd52e52f61961fcd2dfeeae981c275c983f3ce4f85283c6e81ca379f827088b1274dff9a1f9dd9dffd714a33021b34c12ca07ccfe1 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-crypto-8.2.tar.bz2 5561428 BLAKE2B e51cea35b2ae0abba7ed62051e19774075029a92c7067539f9719a6d41abc6787bf432934244d50c674b0c81cb541ce1ee1017fa047f4ac088f1bde84553d462 SHA512 3c8ed329f6ed67d6db622e2713e9a7b65f54f4d99191e00b133c0afb3dec94c5426542719002e9bd2d83a9a1856a5cb29f2117f1db250f3794e1b2234a1e8e08
 DIST freebsd-crypto-9.1.tar.bz2 5682828 BLAKE2B f6b14f5319932b8680a79abab41ff6b447045464992ad8a22ebc0a6bf89f60559881ed34a26639d5d09af7b66972d2105181186c4cb42c5d6fdbf65b342ae38a SHA512 40c7a8150fb3ddd93488502a976ce03e992e6f4fb28aa3e5e102d4915f8ff49fe9085995ccfecacefc3b665e23c85cc3a0cdeec20a32c79e04458f7cc88630d9
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-lib-11.1.ebuild 21724 BLAKE2B 3e72cbe3bba53705ce2f75e7afafb53c48f0a622c66e94f6fcf688bdceae85ce617afeceef476f1a9a463ec605c848a5d3d2cf1bbba6c6e9d8e34fa68b75c3dd SHA512 4bd0dac346bee94e24f21576a037f618fc6650f8f13e3e34c04d5f439d198e81ec087ca1030dcdc7b85d077d0de1ff9e50cfee039c2895236be17148bd7b2242
-EBUILD freebsd-lib-8.2-r1.ebuild 15621 BLAKE2B 9183ce3844d78576c1794a724e8d312b05c5cabb804d566112bf87ea663a1925337dedf50efffc90ae288885892e0ddd0ae0ec79eea2130f668d2e64864204d4 SHA512 84dd546872d08ac0aecd86a491875b04c827be7181c88f5db6fb4fa670e49d80d1825b6f51932c47c6c61b326b25f3e8bc0477baac079d77c9d93674533907dc
-EBUILD freebsd-lib-9.1-r11.ebuild 18777 BLAKE2B 7b67ffebfd1281107551ef1f7e836b0974abf33fd489addce7bbcc382ffd1c2a24618afe9d0b78efa255a1f26a9a79acc0f789b838597e5acbc30c4c5e29b430 SHA512 815b60887a33b3c5cd1cf48357ba579dfcb9f52950534ef4db9eb1d7514f31d29b7cb55069c241f22472b94f9ebcf87bbc91dbeb237d4d4caf20000a5d58637a
+EBUILD freebsd-lib-11.1.ebuild 21712 BLAKE2B e9d77514b6c9e1460dbf2f2c57a595c3d1c1b0a5617293e59b7d9a05b8b07a82b1514711915a9ffd49c6512421fc09c4b1c7516709cfb09f3cc1724cd9c4c8a2 SHA512 6906d49aa12d36ef13e713929d21d7d77b91c4c2ef0e0a1e9096514e6400566471f67e90d70a16c0e490755ff742cb449daa20052e57af767fcaf23c30fc757f
+EBUILD freebsd-lib-9.1-r11.ebuild 18765 BLAKE2B 87d24b46d75ebc562cfabbb86011dbeba01c5a0cdbf60b1b0211b8baa11b34194cb8798873faee80b790d508c02df6bec0717d11be10d53e607eb03f79f5d030 SHA512 612088ffd0f9c166fcc85fb13a04dbb92a9d08bb427417844f9f731f405660ac153c15a92888a20af466fbdcd38355362e9710089a29937eb6539ac8c4e23e62
 MISC metadata.xml 500 BLAKE2B b1e29ff9a6046d5f757c2eba85d20a8941d1f295be8dc9d3c02515193bc879020cd7760830b8a5cbaebbd9e691623dee6413f50dd321b09b28e108ca5ad99e9f SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e1b63c..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
deleted file mode 100644
index a9b8435eff66..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
-+++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	2
- 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
deleted file mode 100644
index a9fd18998287..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-log2 and log2f are required by C99 and are not implemented.
-Workaround the deficiency.
-
---- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
-+++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
-@@ -203,6 +203,7 @@
- double	frexp(double, int *);	/* fundamentally !__pure2 */
- double	ldexp(double, int);
- double	log(double);
-+#define log2(x) log(x)/log(2.0)
- double	log10(double);
- double	modf(double, double *);	/* fundamentally !__pure2 */
- 
-@@ -319,6 +320,7 @@
- float	log10f(float);
- float	log1pf(float);
- float	logf(float);
-+#define log2f(x) logf(x)/logf(2.0)
- float	modff(float, float *);	/* fundamentally !__pure2 */
- 
- float	powf(float, float);
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index a7de06fadf56..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.OBJDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
deleted file mode 100644
index c8be7f48472e..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
-+++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
-@@ -18,5 +18,6 @@
- WARNS?=	6
- 
- WITHOUT_MAN=	yes
-+LDADD=-lelf
- 
- .include <bsd.lib.mk>
---- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
deleted file mode 100644
index 556ade50b033..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/unistd.h	2010/12/20 20:39:49	216602
-+++ include/unistd.h	2010/12/20 21:12:18	216603
-@@ -529,6 +529,7 @@
- #define	_MKTEMP_DECLARED
- #endif
- int	 nfssvc(int, void *);
-+int	 nlm_syscall(int, int, int, char **);
- int	 profil(char *, size_t, vm_offset_t, int);
- int	 rcmd(char **, int, const char *, const char *, const char *, int *);
- int	 rcmd_af(char **, int, const char *,
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
index db383d629470..61bfeb3924f8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2 zfs? ( CDDL )"
 # sys is needed for libalias, probably we can just extract that instead of
 # extracting the whole tarball
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 			$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
deleted file mode 100644
index 8af19aedf5f0..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
-		userland_GNU? ( sys-apps/mtree )
-		>=dev-libs/expat-2.0.1
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap headers-only"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL="
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-6.2-bluetooth.patch"
-	"${FILESDIR}/${PN}-8.0-log2.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-8.2-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libedit libelf"
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-8.2-nlm_syscall.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		# Preinstall includes so we don't use the system's ones.
-		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-		install_includes "/include_proper"
-		return 0
-	fi
-
-	if [ "${CTARGET}" = "${CHOST}" ]; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Preinstall includes so we don't use the system's ones.
-	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-	install_includes "/include_proper"
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	strip-flags
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
-
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir
-		if [ -d "${S}/csu/${machine}-elf" ]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
-
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-isystem ${WORKDIR}/lib/libutil"
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
-
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
-		append-ldflags "-L${WORKDIR}/lib/libc"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
-	else
-		# Forces to use the local copy of headers as they might be outdated in
-		# the system
-		append-flags "-isystem '${WORKDIR}/include_proper'"
-
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes freebsd_src_compile
-		# Hack libssp_nonshared.a into libc & others since we don't have
-		# the linker script in place yet.
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-		einfo "Compiling libc."
-		cd "${S}"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-	fi
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	# Install math.h when crosscompiling, at this point
-	if [ "${CHOST}" != "${CTARGET}" ]; then
-		insinto "/usr/${CTARGET}/usr/include"
-		doins "${S}/msun/src/math.h"
-	fi
-
-	use headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		local csudir
-		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"
-
-		cd "${WORKDIR}/gnu/lib/libssp/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
-
-		cd "${WORKDIR}/lib/libthr/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		# Set SHLIBDIR and LIBDIR for multilib
-		cd "${WORKDIR}/gnu/lib/libssp"
-		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
-		cd "${S}"
-		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if [ "${CTARGET}" != "${CHOST}" ] ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		export CHOST=${CTARGET}
-		return 0
-	fi
-
-	# Symlink libbsdxml to libexpat as we use expat in favor of the renaming done
-	# on FreeBSD.
-	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
-
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins "${S}"/libstand/*.h
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts, otherwise bad thigs are supposed to happen
-	gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \
-		libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \
-		libalias_smedia.so libssp.so
-	# These show on QA warnings too, however they're pretty much bsd only,
-	# aka, no autotools for them.
-	#	libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \
-	#	libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \
-	#	libutil.so
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-	# Clear the symlink.
-	rm -f "${D}/usr/${mylibdir}/libc.so"
-	cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
-END_LDSCRIPT
-
-	dodir /etc/sandbox.d
-	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
-# /dev/crypto is used mostly by OpenSSL on *BSD platforms
-# leave it available as packages might use OpenSSL commands
-# during compile or install phase.
-SANDBOX_PREDICT="/dev/crypto"
-EOF
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# This is for ssp/ssp.h.
-	einfo "Building ssp.h"
-	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
-	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	einfo "Installing ssp includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	cd "${WORKDIR}/gnu/lib/libssp"
-	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "problem installing ssp includes."
-	einfo "ssp includes installed ok."
-	einfo "Installing librtld_db includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	cd "${S}/librtld_db" || die "missing librtld_db"
-	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "problem installing librtld_db includes."
-	einfo "librtld_db includes installed ok."
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index 92881fadfbc3..59b3798a45f0 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild mu
 
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 4767583a3bb5..2b45079a62a3 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -1,27 +1,16 @@
 AUX bootpd.confd 183 BLAKE2B 76fb1b41204f2b3d07cc974ec996ff9127945dc638796b176cd8809ca46fb69fa307f3fa313d48d79a7deb532d393ab58839ed7ae53927280f0178c20c4df3c4 SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f
 AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10559912f30effb189f55e7f34ef37b496d8f9f8eb8726ab6af2ca179cb215809d76d1293ffb338 SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66
-AUX freebsd-libexec-7.2-pic.patch 348 BLAKE2B 38c8f2be3aafa6ff92055bd61c3d1a9691fa6137322adf966971b72bc78f50e25dfdbb9598fae94974b4a2788babf250dee50916b9bcc9a8684005107d1b6214 SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5
-AUX freebsd-libexec-8.2-rtld.patch 1332 BLAKE2B c34d2e3a3f96ff619b86443b820b43d2d11c6ead43d5fa573b6541aed9dca116fbd92e94dff7504910dbbe7ee8447a8e398e56cdd3b0931abd1d41d3445e2350 SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6
 AUX rquotad.xinetd 162 BLAKE2B 87633efa7d9732c498de807976fdc65e3ec15eaef596f7f3f52e3a065fd0b6a9d592c3823a3c84cb9d363df5870f81f00d4a140a6df6e54cbfe239157af05c6b SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f
 AUX rstatd.xinetd 218 BLAKE2B a998b50e4f3a49582529d0d1751a4111b0705f03e53e677395043db38b743a5d017799d4dbfa26eeb107d5d657d82af88198d6477452976b59458ce5f7912417 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011
 AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e1791dee53a08b2ada06d2f740246bcf4e5c2a9665f612e7b613e5f437576df468ec6fd29712cb0d0f SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd
 AUX sprayd.xinetd 216 BLAKE2B 8e154d0eb67616b6245a002d95b260c32243c8f230861b31a51f67b84d6b56627f2328b58db5cc6d6df85c8831d0c1996ea707ff0058a059b7b5b77a81b6e59d SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
 AUX walld.xinetd 215 BLAKE2B dbf0093f41762c8e493e34bd52e52f61961fcd2dfeeae981c275c983f3ce4f85283c6e81ca379f827088b1274dff9a1f9dd9dffd714a33021b34c12ca07ccfe1 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-libexec-8.2-r1.ebuild 1762 BLAKE2B bdfd5c674d09618b3337d0a5922edbc8e962e442d3f943311c3f2106179e204d5dd64aae37ad85b6057041e5e21d3e0a2b3c3c471d21dcacc9bdcce10e2f4a1f SHA512 b5ff14afff032ebe2fc43fb4045d7705d6d0cf4b2853ef788ad0cc47dab343a19a655d881dd2965e4743d4c4212dc6ef7e5b3929885851fc2041ec97fc641cb8
-EBUILD freebsd-libexec-8.2.ebuild 1726 BLAKE2B 81734a0958b6d0a44d0257a9e77534d15170404f01821fc97ff8fb2ecfe506fc6c3717b81df02f9f667231036fff70e0d81698a0e64872922627a91387ee96cf SHA512 3b825ac1c7d44a3f288483b5b7a212a60800a36c326a29dca90cbfe1898735fc4a43c13866bc95b4cbbfdf3eaaf845e9bd191933ec63f807a3bf6b43887dd8f4
-EBUILD freebsd-libexec-9.1-r2.ebuild 2296 BLAKE2B ff662e3bbee7969539bf48139f6e921bef036dc003d2b4b5b16ba94c6d6de0291a54daccb81dc0856100f452202a2eb430b0d15fdedffb479365af18f545f0ac SHA512 e099494395ac06088175df3717f7936b2b41c4b98d176cecd6f345ce31c42e02401e60642f9919418fb0ef3f4944bebb7935432c920a080b503ef9fc2fef92c7
+EBUILD freebsd-libexec-9.1-r2.ebuild 2284 BLAKE2B 239c52de3c17872b465dacaffbf4962ab25905deca80b32aec70ebee1239efd24e45ba5841a14cf1450f092bd9161c9f0477983fb084165b3c8aa217ac59d945 SHA512 ac17fd62e1d0bd470f4420c12783bb187dfe1a9ca48af5b87494d5a0de6aa4dc2537640a4e1bf386adf3433bbfcf95081bf005d4ff097a0a2fd54bd81cc582b3
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
deleted file mode 100644
index 22d5658394dd..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fails to build on sparc without using -fPIC
-
---- libexec/rtld-elf/Makefile.old	2010-01-09 17:17:21 +0100
-+++ libexec/rtld-elf/Makefile	2010-01-09 17:17:33 +0100
-@@ -19,7 +19,7 @@
- MLINKS=		rtld.1 ld-elf.so.1.1 \
- 		rtld.1 ld.so.1
- 
--CFLAGS+=	-fpic -DPIC
-+CFLAGS+=	-fPIC -DPIC
- LDFLAGS+=	-shared -Wl,-Bsymbolic
- DPADD=		${LIBC_PIC}
- LDADD=		-lc_pic
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
deleted file mode 100644
index c60b2fec102c..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- head/libexec/rtld-elf/rtld.c	2011/09/15 11:50:09	225582
-+++ head/libexec/rtld-elf/rtld.c	2011/10/08 12:39:47	226155
-@@ -495,8 +495,12 @@
-        exit (0);
-     }
- 
--    /* setup TLS for main thread */
--    dbg("initializing initial thread local storage");
-+    /*
-+     * Processing tls relocations requires having the tls offsets
-+     * initialized.  Prepare offsets before starting initial
-+     * relocation processing.
-+     */
-+    dbg("initializing initial thread local storage offsets");
-     STAILQ_FOREACH(entry, &list_main, link) {
- 	/*
- 	 * Allocate all the initial objects out of the static TLS
-@@ -504,7 +508,6 @@
- 	 */
- 	allocate_tls_offset(entry->obj);
-     }
--    allocate_initial_tls(obj_list);
- 
-     if (relocate_objects(obj_main,
-       ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1)
-@@ -519,6 +522,14 @@
-        exit (0);
-     }
- 
-+    /*
-+     * Setup TLS for main thread.  This must be done after the
-+     * relocations are processed, since tls initialization section
-+     * might be the subject for relocations.
-+     */
-+    dbg("initializing initial thread local storage");
-+    allocate_initial_tls(obj_list);
-+
-     dbg("initializing key program variables");
-     set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
-     set_program_var("environ", env);
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
deleted file mode 100644
index 0bf7ac9e4631..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-PATCHES=( "${FILESDIR}/${PN}-7.2-pic.patch"
-	"${FILESDIR}/${PN}-8.2-rtld.patch" )
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild
deleted file mode 100644
index 59841db7cba0..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-PATCHES=( "${FILESDIR}/${PN}-7.2-pic.patch" )
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
index a1331fb143ff..ff73fbf563b9 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit bsdmk freebsd pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
 	mirror://gentoo/${UBIN}.tar.bz2
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 33e53a06d3d7..6edc7a555567 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,6 +3,11 @@ AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af4
 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545
 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2
 AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339
+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 1148 BLAKE2B 5e0cfc31dbd47afb392c69125e3a29c251216436f6724dad42aabcc55f87f27fb0c687c325a284b18d3ef7ce470cf15356e05a057bad439485682ead320d7980 SHA512 d3bf63b18797b3eb4193859f3c61e5ed810f2fbd9d491b82b072655cf7f9a42d0b69c634b9877635455ef38ecc2e29fc6fdb9179a5a62cd31570d8469fd294bb
+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/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
new file mode 100644
index 000000000000..598d0b9145b4
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
@@ -0,0 +1,326 @@
+diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
+--- share.orig/mk/bsd.doc.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.doc.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -135,10 +135,12 @@
+ realinstall:
+ .for _dev in ${PRINTERDEVICE:Mhtml}
+ 	cd ${SRCDIR}; \
++	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
+ .endfor
+ .for _dev in ${PRINTERDEVICE:Nhtml}
++	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
+ .endfor
+diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
+--- share.orig/mk/bsd.files.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.files.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -39,6 +39,7 @@
+ .endif
+ installfiles: _${group}INS_${file:T}
+ _${group}INS_${file:T}: ${file}
++	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
+ 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+@@ -51,10 +52,12 @@
+ installfiles: _${group}INS
+ _${group}INS: ${_${group}FILES}
+ .if defined(${group}NAME)
++	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
+ 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ 	    -m ${${group}MODE} ${.ALLSRC} \
+ 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
+ .else
++	${INSTALL} -d ${DESTDIR}${${group}DIR}
+ 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ .endif
+diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
+--- share.orig/mk/bsd.incs.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.incs.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -41,6 +41,9 @@
+ .endif
+ installincludes: _${group}INS_${header:T}
+ _${group}INS_${header:T}: ${header}
++	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
++		 -g ${${group}GRP_${.ALLSRC:T}} \
++		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+@@ -53,9 +56,13 @@
+ installincludes: _${group}INS
+ _${group}INS: ${_${group}INCS}
+ .if defined(${group}NAME)
++	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++		${DESTDIR}${${group}DIR}
+ 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
+ .else
++	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++		${DESTDIR}${${group}DIR}
+ 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ .endif
+diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
+--- share.orig/mk/bsd.info.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.info.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -83,6 +83,7 @@
+ TEX?=		tex
+ DVIPS?=		dvips
+ DVIPS2ASCII?=	dvips2ascii
++INSTALL?=	install
+ 
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
+ 
+@@ -144,15 +145,17 @@
+ INSTALLINFODIRS+= ${x:S/$/-install/}
+ ${x:S/$/-install/}:
+ .if !empty(.MAKEFLAGS:M-j)
++	${INSTALL} -d ${DESTDIR}${INFODIR}
+ 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+-	    --defsection=${INFOSECTION} \
+-	    --defentry=${INFOENTRY_${x}} \
++	    --section=${INFOSECTION} \
++	    --entry=${INFOENTRY_${x}} \
+ 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+ .else
++	${INSTALL} -d ${DESTDIR}${INFODIR}
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+-	    --defsection=${INFOSECTION} \
+-	    --defentry=${INFOENTRY_${x}} \
++	    --section=${INFOSECTION} \
++	    --entry=${INFOENTRY_${x}} \
+ 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+ .endif
+ .endfor
+diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
+--- share.orig/mk/bsd.lib.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.lib.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -46,10 +46,6 @@
+ .endif
+ .endif
+ 
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
+-.endif
+-
+ .include <bsd.libnames.mk>
+ 
+ # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
+@@ -284,14 +280,17 @@
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ .endif
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
+ .endif
+ .if defined(SHLIB_NAME)
++	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
+ 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
+ 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
+@@ -329,10 +328,12 @@
+ .endif # SHLIB_LINK
+ .endif # SHIB_NAME
+ .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
+ .endif
+ .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
++	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
+ .endif
+diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
+--- share.orig/mk/bsd.libnames.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.libnames.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -48,7 +48,7 @@
+ LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
+ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
+ LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
+-LIBFL?=		"don't use LIBFL, use LIBL"
++LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
+ LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
+ LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
+ LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
+@@ -79,7 +79,7 @@
+ LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
+ LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
+ LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
+-LIBL?=		${DESTDIR}${LIBDIR}/libl.a
++LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
+ LIBLN?=		"don't use LIBLN, use LIBL"
+ .if ${MK_BIND} != "no"
+ LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
+diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
+--- share.orig/mk/bsd.links.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.links.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -15,6 +15,8 @@
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		ln -f $$l $$t; \
+ 	done; true
+ .endif
+@@ -26,6 +28,8 @@
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		ln -fs $$l $$t; \
+ 	done; true
+ .endif
+diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
+--- share.orig/mk/bsd.man.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.man.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -165,9 +165,11 @@
+ .if defined(NO_MANCOMPRESS)
+ .if defined(MANFILTER)
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
+ 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
+ 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
+ .endif
+@@ -181,11 +183,14 @@
+ 		esac; \
+ 		page=$$1; shift; sect=$$1; shift; \
+ 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
++		${ECHO} ${INSTALL} -d $${d}; \
++		${INSTALL} -d $${d}; \
+ 		${ECHO} ${MINSTALL} $${page} $${d}; \
+ 		${MINSTALL} $${page} $${d}; \
+ 	done
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
+ .endfor
+@@ -193,9 +198,11 @@
+ .endif
+ .else
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
+ 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
+ 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
+ .endif
+diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
+--- share.orig/mk/bsd.nls.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.nls.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -62,7 +62,8 @@
+ # installation rules
+ #
+ .for file in ${NLS}
+-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
++NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
++NLSNAME_${file:T}= ${NLSNAME}.cat
+ .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
+ NLSLINKS+=	${file:R}
+ .endif
+diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
+--- share.orig/mk/bsd.own.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.own.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -182,9 +182,6 @@
+ INCLUDEDIR?=	/usr/include
+ 
+ # Common variables
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=		-s
+-.endif
+ 
+ COMPRESS_CMD?=	gzip -cn
+ COMPRESS_EXT?=	.gz
+diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
+--- share.orig/mk/bsd.prog.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.prog.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -33,10 +33,6 @@
+ CFLAGS+=${CRUNCH_CFLAGS}
+ .endif
+ 
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
+-.endif
+-
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
+ LDFLAGS+= -static
+ .endif
+@@ -155,6 +151,7 @@
+ .ORDER: beforeinstall _proginstall
+ _proginstall:
+ .if defined(PROG)
++	${INSTALL} -d ${DESTDIR}${BINDIR}
+ .if defined(PROGNAME)
+ 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
+@@ -186,6 +183,7 @@
+ SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
+ _scriptsinstall: _SCRIPTSINS_${script:T}
+ _SCRIPTSINS_${script:T}: ${script}
++	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
+ 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
+ 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
+--- share.orig/mk/bsd.sys.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.sys.mk	2012-07-16 00:04:14.000000000 +0900
+@@ -28,10 +28,6 @@
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+ CWARNFLAGS+=	-Wsystem-headers
+-.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+-    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+-CWARNFLAGS+=	-Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WARNS >= 1
+ .if ${WARNS} >= 2
+ CWARNFLAGS+=	-Wall -Wno-format-y2k
+@@ -95,10 +91,6 @@
+ CWARNFLAGS+=	-Wno-format-nonliteral
+ .endif # WARNS <= 3
+ .endif # CLANG
+-.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+-    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+-CWARNFLAGS+=	-Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WFORMAT > 0
+ .endif # WFORMAT
+ .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
+diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
+--- share.orig/mk/sys.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/sys.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -349,12 +349,6 @@
+ 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
+ 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+ 
+-# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
+-__MAKE_CONF?=/etc/make.conf
+-.if exists(${__MAKE_CONF})
+-.include "${__MAKE_CONF}"
+-.endif
+-
+ .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
+ SHELL=	${__MAKE_SHELL}
+ .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
new file mode 100644
index 000000000000..f986ed9c3e11
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
@@ -0,0 +1,77 @@
+diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
+--- share.orig/mk/bsd.lib.mk	2012-07-16 02:40:07.000000000 +0900
++++ share/mk/bsd.lib.mk	2012-07-16 02:41:40.000000000 +0900
+@@ -155,11 +155,7 @@
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ 	@${ECHO} building static ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -172,11 +168,7 @@
+ lib${LIB}_p.a: ${POBJS}
+ 	@${ECHO} building profiled ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -203,15 +195,9 @@
+ .if defined(SHLIB_LINK)
+ 	@ln -fs ${.TARGET} ${SHLIB_LINK}
+ .endif
+-.if !defined(NM)
+ 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `lorder ${SOBJS} | tsort -q` ${LDADD}
+-.else
+-	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+-	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+-.endif
++	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
+ 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+ 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
+ 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
+@@ -259,13 +245,6 @@
+ 
+ .if !target(install)
+ 
+-.if defined(PRECIOUSLIB)
+-.if !defined(NO_FSCHG)
+-SHLINSTALLFLAGS+= -fschg
+-.endif
+-SHLINSTALLFLAGS+= -S
+-.endif
+-
+ _INSTALLFLAGS:=	${INSTALLFLAGS}
+ .for ie in ${INSTALLFLAGS_EDIT}
+ _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
+diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
+--- share.orig/mk/bsd.prog.mk	2012-07-16 02:40:07.000000000 +0900
++++ share/mk/bsd.prog.mk	2012-07-16 02:40:24.000000000 +0900
+@@ -134,13 +134,6 @@
+ 
+ .if !target(install)
+ 
+-.if defined(PRECIOUSPROG)
+-.if !defined(NO_FSCHG)
+-INSTALLFLAGS+= -fschg
+-.endif
+-INSTALLFLAGS+= -S
+-.endif
+-
+ _INSTALLFLAGS:=	${INSTALLFLAGS}
+ .for ie in ${INSTALLFLAGS_EDIT}
+ _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
new file mode 100644
index 000000000000..8eb80c38cc7a
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/show_bug.cgi?id=511698
+
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index e438633..de4a05b 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
+ CFLAGS+=	 -Qunused-arguments
+ .endif # CLANG
+ 
+-.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+-    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
++.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
++    && ${MACHINE_CPUARCH} != "mips"
++.if ${MK_SSP} != "no"
+ # Don't use -Wstack-protector as it breaks world with -Werror.
+ SSP_CFLAGS?=	-fstack-protector
++.else
++# gcc-4.9, -fstack-protector-strong is enabled by default.
++# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
++SSP_CFLAGS=	-fno-stack-protector
++.endif #SSP
+ CFLAGS+=	${SSP_CFLAGS}
+-.endif # SSP && !IA64 && !ARM && !MIPS
++.endif # !IA64 && !ARM && !MIPS
+ 
+ # Allow user-specified additional warning flags
+ CFLAGS+=	${CWARNFLAGS}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
index 1d5d46f51932..46502242b6f5 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
@@ -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
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="userland_GNU"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="share/"
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-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 20ec95d71ac5..eef5f851d1a8 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,10 +1,7 @@
 AUX README.pamd 2840 BLAKE2B 06d8f86b6db63a0b401627a8e2cff0dcb7daa2b567b2d7f97f196db263956b95516495b3acc806cfaca448509638235a874845c088b898033e858e835c46fcba SHA512 7188bbb741bacbd2c826976f7f3b3150036f0855514ead679f56f0a4ab70fd6657fd38a33215cd883264ca2e801b7b2f3d7b73c40e04adc685e5fa6385c49357
-AUX freebsd-pam-modules-6.0-gentoo.patch 701 BLAKE2B dc275160427933eb9d84faef0665f56b6f3f934aa7fa7a31e4a7b94a985f88a92b85d025eb9cb7aa8f044fb373f39bbcb2c05357eeb70481e0a1dea26e865bd6 SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 BLAKE2B 10d9b14b96d777d8b9e6294b74a42f579a894053047391db79beab6aa9e413059c5f6ad217cc8c80573ac6bc836329aefd17bdd0a8f22b06422b78d0d3e815f4 SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-EBUILD freebsd-pam-modules-11.1.ebuild 1035 BLAKE2B 6dfe4a5fc5b8dd5e982db7fd5e5da872e2d4df83e1eb0c0b454d2e80b5d216d77dd094d1472eca7cf9244db9d50a93dad30a8c1d6eb9da86093473218a0526a1 SHA512 150ba570785b63e2fea121de424a7a8a5c0e6a74c4d498f743d4b7377d55f3eef7db10cfb5b0ded06f39913d32eb68565f17043863d16097ec9ce9f4cc5a04e2
-EBUILD freebsd-pam-modules-8.2.ebuild 1123 BLAKE2B cf201d16028e3ee682279b33fbb22a92bdf567b28ad907478d6c533322116f7d32bb9bf58c144c2cf7f39e9201fd93e8dc0237ac558a926bcbe4898e4e2f1b62 SHA512 134d96116953ec37a82d8ca96673c9a83191c8cb6d5564800292f311fdd3d2f7c5b827bb7727855e6cad764850573345d88764a0b985704c2987cb58caa680f1
-EBUILD freebsd-pam-modules-9.1-r1.ebuild 1072 BLAKE2B e050425fd980a9ae6aeb1f6513a66e4ad2bf96e05c728a490ab5e00cf2ba89c8716726ff676b4e8f2c93e4b795a841fd828dc8763923177e85ee1d43afcd73d0 SHA512 d5a4f80a980481f368e99c319b81a548fbfa20ea72b3044755a1065b09dbf63519f412328e4eaac8752de593a9e01b07eca0f0187e98e588cf5f38c04d528273
+EBUILD freebsd-pam-modules-11.1.ebuild 1023 BLAKE2B 0f3e81814eff77c96b6ffb6d6469fb3bb63ca97b5d31125ca14cbca595809bd4015213bde430be10b41d7995f91f3ff35f1218be7bc43ff87b5669444abb4d6c SHA512 f2fdb23d324125a06535dab07d753878ebbeb561e3e6a0f9d5ea0cc94664199675a7c1b2410d21adad627440920813cff68fd4c09f043fcf6b09a4798f0b3710
+EBUILD freebsd-pam-modules-9.1-r1.ebuild 1060 BLAKE2B 63dd7114a3d63459d8760d496bc58c396989cbb2c3e8ddb6d1cad972ac931861ae9edc873fc5e5800cec2e4d3aa1a805950276d4f9abd13326c3d8c87c2fe2cf SHA512 a8dadd3c595ce8303592dfa81c7cbfe524a1b75183d66229b7c0948e5d7b49e5f7b82bad004e6478c94a67c2bcb998ad273b9ab7cf183276f6eb016cf45feb5a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
deleted file mode 100644
index ce1a7fbff8c6..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fbsd-6.0/lib/libpam/modules/Makefile.inc
-===================================================================
---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc
-+++ fbsd-6.0/lib/libpam/modules/Makefile.inc
-@@ -5,18 +5,10 @@ PAMDIR=		${.CURDIR}/../../../../contrib/
- NO_INSTALLLIB=
- NO_PROFILE=
- 
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-+CFLAGS+= -I${.CURDIR}/../../libpam
- WARNS?=	4
- 
--# This is nasty.
--# For the static case, libpam.a depends on the modules.
--# For the dynamic case, the modules depend on libpam.so.N
--.if defined(_NO_LIBPAM_SO_YET)
--NO_PIC=
--.else
- SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
--DPADD+=		${LIBPAM}
- LDADD+=		-lpam
--.endif
- 
- .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
index 4c29c927a781..058bd4a6a812 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.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=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="kerberos nis"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="lib/"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
deleted file mode 100644
index a04f7b0eb72d..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd ~sparc-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch "${FILESDIR}"/${PN}-6.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
index 0d4662e54e14..ec99d87c211d 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd multilib pam
 
 DESCRIPTION="FreeBSD's PAM authentication modules"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="kerberos nis"
 
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index f28f901eeedc..6b89b12e0eea 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -1,7 +1,5 @@
 AUX freebsd-pf-11.1-libevent.patch 305 BLAKE2B cce2abce33431885196c5bc44c7e38582b2c7db273ddd3b7d4c8b58dbd9902cbc6e2a5031f5cddd28db9361eafd75c98fc0ca8d14e822305ead12aa035990c5f SHA512 a75ff98e8d87ec5182bb1a7226b34d6223500c0a5659727392d97d69d1a66af6d439d4c23a6817740c25306654468e82e52ddfa591d4509001e407e099c83b44
 AUX freebsd-pf-11.1-pflogd.patch 363 BLAKE2B fac873813332149adc13e5b1a77cd8532c12bae7ee1c93644af31e517e7697cdd8e7c59412e7dbb616c97baabb6308049bd7c995b5e803627f6cc3049056380e SHA512 bceaf0f234948acf30aab4391d73c7545bd860dc5b2bba8eb8da1a9791de905654450592674c75419a8dc0646215ba5bcdd885d61cac336d34c017a7c57039fd
-AUX freebsd-pf-7.0-libevent.patch 331 BLAKE2B 3bf0b950ad0669ac399a220e9411d7137243810f4b203a55a803421783ef200d2b0c435bbda499f8fa48d2011fb51db3c29769eae9adfcc991dfbfe50884481a SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61
-AUX freebsd-pf-7.0-pcap_pollution.patch 437 BLAKE2B a3449aa3bdbce190c823d1a3386c1b44f759cb7fd0e0274584587a6e1d2834333f34ea6a1b3cc58c39dae35901d196384d9628fe1c324a2acb8d62389318885f SHA512 e08df63ac57747cbd42e32b6e61e08e92b0f7af333508e32717194e9c0d0a1b0f23bf4ed9f0b745f804c164b2c950bf92d2abc22ece58113b7ccaee5e86ea3d9
 AUX freebsd-pf-9.0-bpf.patch 309 BLAKE2B 38d4382e437301da49388333b18541699299f033df83e88decd9ba41a62a2b349facd00af806f2c414cfc5e2d356ff6025dadce40abe5767257391b741d1e62f SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039
 AUX freebsd-pf-9.0-getline.patch 1159 BLAKE2B a9920741120762771581510c8d97e2ddf33c6c9757891cb697a7452bd56ea410dca573cb0b312994f675c89430c882f0a51f1070b4086133e8101f5227377f82 SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb
 AUX freebsd-pf-9.0-libevent.patch 384 BLAKE2B 381a15deccbe2ecaf7baa9310866b784f4a734707e5460c8cbdf4b473d65d59de22013e3da540c506a7a483a7ff56517b25791bd28bde5b7bae6d079b17b85c6 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8
@@ -9,16 +7,11 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 BLAKE2B daf9a836b6c8243e8b452c0e68bc
 AUX freebsd-pf-9.0-pflogd.patch 332 BLAKE2B 99686ab51741c4b7fd0d72b56743c0306319402cc01b038f9dce8165853fce80b0e7d9c9c34e9e25656b17974a63c8a039b8aa1c98ec7cd429b2e5991e0a0f7a SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073
 AUX pf.confd 274 BLAKE2B ed3466c836e7c4958d371d7858cf15e532140c1d3afe7e3b2155275f24ec245628d2936d8ac26eba13bbb88b9d86ad13e5f662f0f37ae813a98e92428e160fae SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5
 AUX pf.initd 803 BLAKE2B 8f3d10adae448a429b2e08954b5a3d3025d9cdde90073fed0b50f900de47c8e4611fd406409047fe8ad1f25c69465fe7954e8b3c937ad507b45fdd8096a9a4de SHA512 b447683fb3abd11a6c5158b452ac9a72858c0a57bb424a1ec3a4cc8dce09336228d6e43ce0c58a63d63ee3917211227a6c5f1d4ac4bde42ce7fc5aa6d188f28d
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
 EBUILD freebsd-pf-11.1.ebuild 1491 BLAKE2B 01e49509dc7f3528e0f14a01eebb2a8b5f0c9fa927844b98f8a9f4c89bbc1b103f01b972efa4a370b9765dd1cb6620d51de0c012a1b58b108434d7e247562f57 SHA512 2ace1ad0f89365b9b707a2b9b29f04dff926ad3a3340abd156862aa0c50396ce078d4f997d1298b498df1c52745b5216f2c112424254ae12abbb554783c276a8
-EBUILD freebsd-pf-8.2.ebuild 1493 BLAKE2B 86a9eea616866fb9ed315fdf68ac314358599eb39ecb5257d684ceab0195bda67e6bc63b86e6689ba95c0f13de546339367c2f30a175c67e514705af681ac239 SHA512 cc1d221ffa6a763641c64802ae6d8a1f1a5598c48ce07e3bc7f1b1a70454c1ba7730a30c6881de7dc493bccf49dcfb7a64998162dda4d47165b088dc0a63bdff
 EBUILD freebsd-pf-9.1.ebuild 1614 BLAKE2B a22189ed6a16455b6f95dae6f7cfa064efa355c89d97a2b1e0e5947589979da059cc6fc3df609d702b188b6c85ebec031df4c35f6850e79b09fe6eb045d532be SHA512 db5c7a663f784b6fb73515312a91e7971da959b1b67fd40fd479b6f2b272f5fbf2eebee1a29c4dfd63bbdfddaedb51ffca9b2297004ffc03851e1127fa3e890c
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
deleted file mode 100644
index 1425db24d975..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.orig	2008-06-14 00:01:52 -0300
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile	2008-06-14 00:03:19 -0300
-@@ -10,8 +10,7 @@
- CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
- 
--DPADD=	${LIBEVENT}
--LDADD=	${LIBEVENT}
-+LDADD=	-levent
- 
- WARNS?=	2
- 
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
deleted file mode 100644
index 4a7c2e9a0e46..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- contrib/pf/pflogd/privsep.c.orig	2007-07-03 09:30:02 -0300
-+++ contrib/pf/pflogd/privsep.c	2008-06-13 23:55:39 -0300
-@@ -31,13 +31,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <stdio.h>
-+#define HAVE_SNPRINTF
- #ifndef __FreeBSD__
- #include <pcap.h>
- #include <pcap-int.h>
- #endif
- #include <pwd.h>
- #include <signal.h>
--#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef __FreeBSD__
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild
deleted file mode 100644
index b21039807877..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	sys-freebsd/freebsd-mk-defs
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_unpack() {
-	freebsd_src_unpack
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-7.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-7.0-libevent.patch"
-	# Link in kernel sources
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	newdoc pf.conf pf.conf.example
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index edb3c7a5a04d..292af8c8dff9 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -2,35 +2,22 @@ AUX freebsd-rescue-10.0-zlib.patch 861 BLAKE2B 6eb6f4dad43fbb66c6947b0c5aead4207
 AUX freebsd-rescue-11.0-rename-libs.patch 874 BLAKE2B 104c74d323a40c228df812c31f9fa6799ee26f0069f54c087b9c6b6ec1e1bac440a98cdabb4b090ab9e5267121d1c8a22abbd4d7a53a785dc11c452dd75754d7 SHA512 8ac692342e0ce3cd39286c08523bc89d56f15964242c08ec2065e70fbf3cec24c00608d50ab5b94ab4a7781a4175acc40c2bcc0e4a2cfaf3afcd89fa06dd77c9
 AUX freebsd-rescue-7.1-zlib.patch 800 BLAKE2B 6bfdd272ec9ff98b78eb2ecf827ef5b714af3b2c8003145e0d59de9087eae407eadd6dbe1ca5ccf392405c739b13df25e654e8ba29ff58b8fb2a5e66b3ad66fa SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c
 AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 BLAKE2B d07e1485606eddfd5046e1121fd8aed4185321c37c2596ea955a4ae34d572ea7dc51b7e59dab925a5175aea157a4276ed4c3cdd442155c7fb083ee8b499293f2 SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5
-AUX freebsd-rescue-8.2-libzcleverlink.patch 789 BLAKE2B 806f9497ec031267695e49da5012002f5a18f961a44bb020c88af97f9857ed6a9c3020f8d6a541d0417e2cfa0b431ca4b498e6eb1e51500f4600547289037f2e SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f
 AUX freebsd-rescue-9.1-bsdtar.patch 404 BLAKE2B fde2d3b1d4bf5ab3a60201b862eb3653c3c440e073423bb5c2119269165461371f8a8be26ea614eb22dec3ae11a4bbb4901935c8f268a188531e95d12b358f6d SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4
 AUX freebsd-rescue-9.1-libcleverlink.patch 801 BLAKE2B d9e1d2afacbde9d4ce6eebeb9225e4aead2fddd042c83c3aff80228af65959f97ac6b1af4f93792e1f1b51a90e7e432c8819013a81cd603e091a9a551508241f SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3
 AUX freebsd-sbin-bsdxml2expat.patch 424 BLAKE2B 4ea522446bf755f07184f0779454a6d2a4aea715a0bac4f7b85dc362ad3f9fb4fa783fc7145e3acfb85782039eb5f575d4340e47775dba678f49bdb51376055f SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522
 AUX freebsd-ubin-10.2-bsdxml.patch 367 BLAKE2B 0a2dfc1b2646aa2c42bfa8b9a6cbd3d22d8b83b8bd252bb7faa3753390a376e8898d5155b16bba52378df304848f99a0cf3fcd141b013670f5dff8355ac0a062 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-rescue-8.2.tar.bz2 5041 BLAKE2B bb75f3e71db9e81397d230f1bb604f20704ac2bdc757b11e6ee01a1f30a9f03523b26a2caec09d78ded50ab4503f5e1421cc543d9013354aa9e32288fb7cc9e2 SHA512 3311e1ee1d2fc1de0ecc9c5351bfbe007a4651e89a3f3f86ce6cf0fea83a65692fc7a709ccf3a4e9a3179ce51a87b36256481d91819a7621db4045394aa51c29
 DIST freebsd-rescue-9.1.tar.bz2 3939 BLAKE2B f2756276c6018ded0e9b0f73bff25a606193c9da3e5348aefda3866308c3fb2ce046e35de6020dd0b28e0457b61a4864600ae40fa51042a64d93c712f9d85858 SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
 EBUILD freebsd-rescue-11.1.ebuild 1863 BLAKE2B 192ee47076a02df932500c4441ce38fc6f8a03c05d177d6964b8ec8df9dcc13117d408ed5a890533ea14f04eb4d3345f8a64669565b791ba0398508279740aee SHA512 38821a85f4e5f2efb6746b096b64c02b6534ce98ad743c44e45f65d8a6cafc3fba6cc452d3d465df1021fa2bf02063d3a5fa5be89ce7c667a9912626a7317591
-EBUILD freebsd-rescue-8.2.ebuild 1488 BLAKE2B d0816a163bb298f10ed4826019312122f04ee2af04bf8fc52c316c4016e830d395e2b22a66807af5e3bce83f85b4130f6f8c133bb29b0ee82b25ce0061aba49e SHA512 6cf49d8ef4f62affa527d0339c56087d49576da2c27bce2ed25d72755ce8852ff43448e51382553d5605f8d8cdd5e124cd2ca00228b542ee9b85790152f6dba2
 EBUILD freebsd-rescue-9.1.ebuild 1780 BLAKE2B 0a50df4fa297fbe54c7b68843a607f4eebc49af2bd60782f05b30cd6fffd88f9c32802d0dd81852ea61b7302a4f901acdb19396eddfe315a1277d6ddf6654f9f SHA512 0d463b226f9520d5d752a5de402e2d01bc6a7f778fb0747725f976053746685549c70ee59c78f2a53768ff1e0850f0c4fc479f8ecb611008af2b1e881e8c84a3
 MISC metadata.xml 402 BLAKE2B f24c7363fc3c6749311732e4b1722f301ad6a680e6d25450657645b3295611202f65ceb7386a6827cfd4448584584584c67b3f3d03089b8948709282b5cae0fa SHA512 247e4e4c80cd64a81f698fc7fbeab529a02f8b2c6b0040628936ab7d83a09c7242df0b10d7cb4e4e8d7d78806c303cd82903adc4a38b649e911337a832c35834
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
deleted file mode 100644
index 3d444575515f..000000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rescue/rescue/Makefile.old	2011-07-06 01:35:13.000000000 +0000
-+++ rescue/rescue/Makefile	2011-07-06 01:35:54.000000000 +0000
-@@ -143,7 +143,7 @@
- .if ${MK_ZFS} != "no"
- CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
- .endif
--CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs
- 
- .if ${MACHINE_ARCH} == "i386"
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
-@@ -234,7 +234,7 @@
- CRUNCH_PROGS_usr.sbin+= chown
- CRUNCH_ALIAS_chown= chgrp
- ##################################################################
--CRUNCH_LIBS+= -lm
-+CRUNCH_LIBS+= -lz -lm
- 
- ##################################################################
- #  The following is pretty nearly a generic crunchgen-handling makefile
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild
deleted file mode 100644
index a63b59c79f4b..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${RESCUE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	>=app-arch/libarchive-2.7.1[static-libs]
-	dev-libs/libedit[static-libs]
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	virtual/pkgconfig
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
-	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-	epatch "${FILESDIR}/${PN}"-8.2-libzcleverlink.patch
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index b6c281a2f8a0..f8ff63f7da53 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -6,22 +6,14 @@ AUX freebsd-sbin-7.1-zlib.patch 800 BLAKE2B 6bfdd272ec9ff98b78eb2ecf827ef5b714af
 AUX freebsd-sbin-bsdxml2expat.patch 424 BLAKE2B 4ea522446bf755f07184f0779454a6d2a4aea715a0bac4f7b85dc362ad3f9fb4fa783fc7145e3acfb85782039eb5f575d4340e47775dba678f49bdb51376055f SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522
 AUX freebsd-sbin-setXid.patch 541 BLAKE2B 0e1e7ede0385d8f6ecbf905e4366712b7707aaf918780a93712afcbefa2741585e14be7536d2f6a823808f97756bebc6e0374882a04cc2743b9649ae777875db SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e
 AUX idmapd.initd 441 BLAKE2B 6b16dec71b9d0fdacbb2b46811a70677069c9d1c8ae67607aa50c8152a0c0031f758b0056ead97d3ce8f86fa87724125b388663e93878892ee78bbb0c25427be SHA512 69e548dd863c12dd9d525d9dd77ed06fd0418b6744c97899766d73aca26b60d12f27c791720b195c46b244fd2f3effd47d43b4fa277f795f402494f991837714
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-sbin-11.1.ebuild 2658 BLAKE2B 574dc52cdf48536c62a2928baed35d427385d2606264cd86d5317598fcec2b814c63169debec63aab4e9b500bc902866ef685405e191b0941c3019601ecb0890 SHA512 9f04e9c38c4040fc95075368e6a6133f8c98e48647249634fce0962372f032c48e82f76d7fe164efc4ff96ff73038875ee8d75445d33564b63df4229f7dfe0a4
-EBUILD freebsd-sbin-8.2-r1.ebuild 2554 BLAKE2B 8fc7a5a50b8fc67b1d592697ba261ce7aa368f93e9481e512188249487ad4e4c4e6fd2da06324930bd256e9608e99e460cd9aa1b7dac85c403db8ea4ec3892ea SHA512 f8e7eb0416726aa824ab309b298f8d16a43694deecd8740fe9abe071f6bac40d5b2827bf74e0e89701684718a686a05a8586b093fe10d2a1b3b3138b9c3341d5
-EBUILD freebsd-sbin-9.1.ebuild 2668 BLAKE2B df80b380b340455f88e0bc474aee32402ab26fe793e7df4c689b8b1b493d97c5396efadd69536c67432f859a8a06ac63cafbf0006ae8b8a1fbb03ca574db3627 SHA512 e6d9ac18f8ee6118228cdad1fc2b2a8ebe7237fa491873cdf37f894420d26b0244c25c7d9d24bfa25b417ed81523890ffc2bfd1b77260a622e5192379ef72b4e
+EBUILD freebsd-sbin-11.1.ebuild 2646 BLAKE2B 79418a3a6ef338c4a3b5cf8032d42606d42102e0bfd11bad8ebab3af03c84e785ddcfb7517e89945f4f34b690903bff5596b6b97d341f14d4dd9cfb77899504f SHA512 5ddec2a2ff87e62670d88fa71f4ed7166ff20de188d81adad3c6dd7b8988505a7f5a766d23fc7b93e50ddb5e44ea8cd75964bfb4202b70ff0b22dccca5d3fc73
+EBUILD freebsd-sbin-9.1.ebuild 2656 BLAKE2B afe136ee0e3a0404aec3207f499dbc2d158c40686772a1c8a0d1025034917d0b1f730f0483e395117653be762f34261fca4e37f7ef441870e378f0cdecf374fd SHA512 fad12585ea56a2e87d5326b25b752d5aea6c0d635b2a1bc3c583032a9728757307d71a5dc55d8e080efcd5d1df568f6a161eeb2dfd0a5a75cb09b100a5591bad
 MISC metadata.xml 611 BLAKE2B 74992d5b0b76a115a51cb01273ca718f057f832fee09d1ee4959cb0cd058eceed28d1e71e77e41a386f1c056cbb7c08ca7a4dec1853b5b21209710b9eb96ef1f SHA512 f5564d34b62dfd20fda9ce5e17de3fc45b9d281de062e8858aa090049218ee5a05670967111032bce63363ae64a98ba39753964c013e12aaf5e15e90719a720e
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
index 09b3cbb45f8e..50a513208cb8 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.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=5
@@ -10,7 +10,7 @@ SLOT="0"
 LICENSE="BSD zfs? ( CDDL )"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild
deleted file mode 100644
index 430a320ac379..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl )
-	dev-libs/libedit
-	sys-libs/readline
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
-	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-7.1-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# initd script for idmapd
-	newinitd "${FILESDIR}/idmapd.initd" idmapd
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild
index 31c9d7794de8..85dc8c8e5a78 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.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=2
@@ -6,7 +6,7 @@ EAPI=2
 inherit bsdmk freebsd multilib
 
 DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 
 SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 145704eb607f..61d0e44703c3 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -4,26 +4,16 @@ AUX freebsd-share-10.3-gentoo-skel.patch 600 BLAKE2B b04b8653aef9add52fe180b5876
 AUX freebsd-share-5.3-doc-locations.patch 608 BLAKE2B b79fd173a1051dd6af748f45d0476ba21d8f2f72baea6965b2db22bbfc9ecd428c3e9b6e296ad8d8df6276cc61ff9f54da932d81c7ba3af5f68b0ce5cc96eb4a SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6
 AUX freebsd-share-5.4-gentoo-skel.patch 621 BLAKE2B 96a8d7759ed001a1c04e254255c7e7cb927898391346b2dff14839fbcfb0f8d2c19e3d6ce6b3b847cbaa2322089317f64efe854ad878a51d1f9fc6496f12f7ab SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 BLAKE2B 56d6b8585cc49f5547240f28343f6114b75cd49b97bf532e11e17220f55224f8a2c1f365c858643d7879ce133ec16bf33d361e7783a65539763e7769a6297932 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-share-8.2.tar.bz2 3797560 BLAKE2B 411eae0c8da465cbfb61be450bc72218b97499aa8ce36abbafc8408aa85a10a144b48a0b3941d8049326f1afe9c0306c66ce176e8fb456981185c39671100cbb SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4
 DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-share-11.1.ebuild 3336 BLAKE2B ccc17da18a5275cc592ce2adce80f2b024c7fad65bafd3e4b1341c1c1a001000f4862d89504c5030ec95c2c4ec3c5cb10c255cc9703ef2c48330968302b3ef11 SHA512 ab1b7653ec6db7deaf19d731adf27d40ff0eab88d7aa056714f63232ca40d0560e63b5850ee3341c47d150d5d64ad3e6031178d1923533f3c0a8ff2b7dc15ede
-EBUILD freebsd-share-8.2.ebuild 2445 BLAKE2B 10db1e63675fba4d35e6b1a582a7998e66ff802e51f990605ecbe243cda59887bd68c811da140de4848f152d9fe6219f3508477e13c0054ba453aa4eea7616d7 SHA512 9c5141a258faad0bd1bb3903f359ef0dad2ea88f73d5ae4e24ec7d2b86d2f0642bf7cd960f18785cca7b729b7082040641366b3207c21b69cc3da5a812b23b41
-EBUILD freebsd-share-9.1.ebuild 2574 BLAKE2B 14a140c600040f967c871a916bf736e08bb5ae0d68754ae02bfe719b30e9c025a8102ca1edcd8dab91c331c6d4874379cd525cf7bb4f8032c19f5b3a7de3b80f SHA512 e0061942e6004beaf43e1f5fdcabfd9033b69e10ed29508c51a4fd8f917e68130d7a24ca6a4a0d92429245576847292989cf6f38290f840c06de8b7a7b87004d
-MISC metadata.xml 350 BLAKE2B d28338ba6e48a466bb19a5a3f619aa4c33b578451922f9e42422b59cd08e7dae4f497584cd9856f429f90852d7c9415e28a4c79b7f86dca219e6e1ddb089f115 SHA512 50f19565decf09ffcadd28e20a882e75659eb301788f9760e37398acf41929968cd64078b716f4528521d3fa77403b3305ecd4ffd932fb6be2a7e2d02ae0a829
+EBUILD freebsd-share-11.1.ebuild 3324 BLAKE2B a4a35392bc6e32b2e7c8922e887260717b30df97d4c18b9d6b068338ed536e5cc4dafdbca59391345d1c2af93798b28417d660aa2cb86778b53d5097a904f3ce SHA512 6e91be861b588dc5e91ac6b6e71fd242c5b7d86f9aabc8077bc2084326b65d71c1da6a6c4bb1b61e71e991c501eb7ebd13bd2bb46352bdcd8b37815bd5ae1ea9
+EBUILD freebsd-share-9.1.ebuild 2562 BLAKE2B 0c3d22cb9db9e08f5c06dd49d3474e72de2ef7914e8143c4e40f39df0e43b57c39a0b4f12dc74b612331ec7a63cd8efe6a7942aa6a387d96810508c4892b992d SHA512 ee60aadb6756a7e922eafc4b75cabaff847d15e4513c4ea296d343f8468070fee2514aa169836806eb074b4954e12d7c3a66c431200333f60eb11fa217e8f525
+MISC metadata.xml 303 BLAKE2B 32a957edfc2dcb1fd1076d208b253fbe2408a65f44585ebd3863a9f6d95f4e25d8e3fc5ada378074e0d7e1ebd47793c4e8241656087da905100f68375c70df9e SHA512 4483a50bd02a3644bd12148d0a54ff78686d974337b5c22a267bdae228eefec85bf1a8b74a1c04a7759645e451e59c75734318d07376692d26c97261eaf2fbf3
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
index a579de545050..27899c51835f 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-11.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=5
@@ -12,7 +12,7 @@ LICENSE="BSD zfs? ( CDDL )"
 IUSE="doc usb zfs"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild
deleted file mode 100644
index df7170c8f1b4..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-8.0-gnu-miscfiles.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# This is a groff problem and not a -shared problem.
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
-	mkmake || die "emake failed"
-}
-
-src_install() {
-	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
index f3a6f4c52e40..6d06af01a442 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd
 
 DESCRIPTION="FreeBSD shared tools/files"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="doc"
 
diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
index 30006739b84a..a470eb89458a 100644
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ b/sys-freebsd/freebsd-share/metadata.xml
@@ -6,7 +6,6 @@
 		<name>BSD Project</name>
 	</maintainer>
 	<use>
-		<flag name="isdn">Enable ISDN support</flag>
 		<flag name="zfs">Enable ZFS support.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 873cb24befd4..d85a4f69ce36 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -5,13 +5,9 @@ AUX freebsd-sources-11.0-gentoo.patch 852 BLAKE2B 81306d42748674cf550d5399a1ab02
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 BLAKE2B 7644dccfb8ad6242c903fb0d5d81601c9ab395628a1cfdc299a31575db4ea6656ac1d3e6c15c751e96a7ce384909e95a90928b3cd1caa9de7d926a3ad9682092 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64
 AUX freebsd-sources-6.1-ntfs.patch 1043 BLAKE2B cf7777656f4d49975c7ad4cb5786c0534c80db87cdc3ecc46619d4f757ad087527fbbd96a436a309255e8968341c9dda71cc485277ee485ab5b8127482120e03 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad
 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 BLAKE2B 86ef2add961195d4429db30e7d43ba3f6d43c1c2316e269e952e8e0c84da82fc6ec77fc84e7c3be2d5a5f76bec9e093b7d748ffbb57fa168f31c007066ae64d2 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7
-AUX freebsd-sources-7.1-binutils_link.patch 1297 BLAKE2B 31f31c0a5b8999bf774e498d2b0734aaa7521b6af9e1b6ecbff17d0300ae74fce8daf62b451ebbea18d484c8f62cfd71643a703fca110c254a1185ad3daf13b8 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0
 AUX freebsd-sources-7.1-includes.patch 318 BLAKE2B e95da1360824b9a5037bf55deda2d92a72a08e0e42f8ecd4080863bed69f10137b2c2637bafbe1088fe6bf2bfed7f83a748cab42a14b41b7243efd524ae15589 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7
 AUX freebsd-sources-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f
-AUX freebsd-sources-7.2-debug-O2.patch 771 BLAKE2B 97217822a435da048d6c628e5a3fd9ad104dc8e8a98cf992561f9e3750aaca7088eaded205fd53b0b28c6ba9d42160b7cd8be58849c9832387e4abb47838bde3 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201
-AUX freebsd-sources-8.0-gentoo.patch 1138 BLAKE2B 806bed2b9fad754bef54fa37795063d1f66314885726e22e0b46a9f3249eed72956b0a45a0d8af7bc9d699962b4311b86e582440e209d8e16f14f5a904a3bc7c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc
 AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 BLAKE2B 2c783822d71de3633c5b914a38d1a80b9afd4a5e4335ac9a01da605306c8d0f5605970f808d9b7c93e9853a7b741eaec8f0b1701602160761404558eaf93f680 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5
-AUX freebsd-sources-8.2-unix2.patch 1642 BLAKE2B 96b784136100ca1094c847496f9755ff0e4b3bc033266c9f7cbe2be3fc89e963214e2bf479efab0c5e7005880cfcf6d767242cc8671965bb43cc5853b66e1c0b SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b
 AUX freebsd-sources-9.0-disable-optimization.patch 927 BLAKE2B 42fff42c4d1bc57aed5c4b4dc30328f8ac3317f36cb3b4df60690e5ce9e3ef19d2a1b6a8e35082aad6c43283b47af8df6c94912710d55fc925e2eae08d275459 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b
 AUX freebsd-sources-9.0-ipv6refcount.patch 3259 BLAKE2B 48607d9851f9a37994fc507decf3fc6710406e2fc12cc24cc5a08f5a0717ebc4409ada146b795689036561481078a3cfbc74c697cb3559cc04d2f7b238ee1426 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658
 AUX freebsd-sources-9.0-sysctluint.patch 403 BLAKE2B 3860821b308a75dcad8fa5910cb6c287ca2013269d21b588d0abbb1a79197366eac7eb733c87136f77ba2556913f36784842ac5f089d5c9bdb59bdb836748049 SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c
@@ -30,17 +26,14 @@ AUX freebsd-sources-9.1-mmap.patch 676 BLAKE2B 17fb129a34eb0280b1edfdb2a5b138443
 AUX freebsd-sources-9.1-nfsserver.patch 650 BLAKE2B d719735cfe035de970f42cc40dded1785c038ce03c568dd7ccaf5a3715f658131cb02e1291b2a327b54fdff1f58f76c5deb41332ba4a125cded18344e21a0a17 SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe
 AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770a8541d3a3c0ede353a535f7e93f33ff62c800e9cf775e1bb56b5ba00917d1cd81294404dd660c6e954c01e352a5f413f9 SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99
 AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e
-AUX freebsd-sources-cve-2012-0217.patch 856 BLAKE2B 7dcbe58d7e58165fbdf734d59554c6e05f1248bdbafd0b5fa8b820de2aae50c9dd15938dc66603a683ba225e5e4e1271a7acea10fd1d43c6595226cea85f63b3 SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9
 DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc
 DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7
 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15
 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
 DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-EBUILD freebsd-sources-11.1_p2.ebuild 4596 BLAKE2B 66b50e7b707962a367151246456e215af2456f579fe93fecea423f919555d74c6c11f80d9c72d02e334072b8632cee9275ba345bedeed2d9ab1d5fe413b0d1ef SHA512 b9cb8af695e5ef100cfd72dc852a0e5b90c2ffdeb6e7866d105286d18cc343645b7985e6c47fe80a5aa56bb05011a589293e8a754baa914285bad43807a260a4
-EBUILD freebsd-sources-8.2-r2.ebuild 3671 BLAKE2B ffe430c6ad815d2135130de624acad622d9dfbee4ebc356d2e4d52fbcf67c979745067ebfbb331363f5b5859cb9e2cd11ecbbed018154bd3fabcd40e5d804d54 SHA512 4e2c7ff852639c0cc5124beb0a3b5f998780553892eae1d1c6bbc2b253a82e56838897062f6e55e4fb47be2f99060f1e9b7392e794b25a49a38d925774a1423a
-EBUILD freebsd-sources-9.1-r3.ebuild 2514 BLAKE2B 8365ccfc2287740cdbb4f1b59cdc105065edef4f44ec59b3051b506072210491f4468ecd52fcb7d071967b665590f467ef5c788985d9bd10c3c396cbff456683 SHA512 e21a899b3329ac8abfb1a167a56a71a6e37b0b3ec50af9f6274f2353c2a422805a62543105eeda21a1f7d7a4325de6bb749b08851ffe7f5e8b113d8e8571023d
-EBUILD freebsd-sources-9.1-r9.ebuild 3059 BLAKE2B 99e91d727964772bf769cecfadb152e917cec34858b20cfa9ad6401d0466b90c07f4cecb457b4740c4ed532f3ec933a7dd95fa868524aa4c060f27554b6e53c7 SHA512 5e241adb02fe3b5fedbd4dac59c1f38d815c2b1041bf6efdd0ed406ff9b380ff7b8ba72210539fc94a11dbb3d7b7422a162e03ee0fb393f8fa7a77df3b327d55
+EBUILD freebsd-sources-11.1_p2.ebuild 4594 BLAKE2B b4861bdab72dcfbaaadccacd98efabada77878264140e35428acbe427e17a9d56edda10c5275bb7abcc9107badfe010fa642bcc1bf760e02241b4da6c9644887 SHA512 a700daa8edbfc20f6aa9e82288529f613bc2134ed5dab624d0aba56b4189b78a680ec3a13110d7e4aa15471c4133651ce4472096ae242c772a73faa953df10ab
+EBUILD freebsd-sources-9.1-r3.ebuild 2508 BLAKE2B 2aee9a694feb07368341dc8817f441d7c1f842b2b2ba2e4398b2ee23633b2f5648519ce4d85180fb6a66fb220bd9992427d8709b614afc0caa5687ed7d167b4b SHA512 481a7816515b4b08f9b7185837b90a35aab02912135f6eab5bc12a0d1223e3b7cddcd6c1d23e9ebdf440fe9d2e3035af091238b6bd004dbeff389f50be558df5
+EBUILD freebsd-sources-9.1-r9.ebuild 3053 BLAKE2B 92fe95d5496c84a86cc5eca23902e326c1645a6d34b8a5031d7a3f43fbceba0f6ee4f69e039d92996e99e8923b39b08e00fc972b5f56534399d2e55ba9aa1cf8 SHA512 99535792a4e17d9ad108174f8e09f32582b0f6a0a3d6edcb026668479e90a319252b628f7348add35740952467b84875b47eb125bc61d43d712fcda461071295
 MISC metadata.xml 444 BLAKE2B 26160b0d71ed4eb333357e7d3d5fd131038abfeb50db42107cabab63fe2123cc9d495d53a33bc8fea3622dee7994076c57163ab9904c452c1d3bbdad569481b9 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
deleted file mode 100644
index 43d01baef347..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
---- sys.orig/conf/kern.post.mk	2007-03-23 18:55:59 -0300
-+++ sys/conf/kern.post.mk	2008-06-18 19:51:13 -0300
-@@ -85,7 +85,9 @@
- ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
- 	@rm -f ${.TARGET}
- 	@echo linking ${.TARGET}
--	${SYSTEM_LD}
-+	${SYSTEM_LD} -o ${.TARGET}.tmp
-+	@sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
-+	${SYSTEM_LD} "@${.TARGET}.lopt"
- .if defined(CTFMERGE)
- 	${SYSTEM_CTFMERGE}
- .endif
-diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
---- sys.orig/conf/kmod.mk	2008-06-18 09:11:53 -0300
-+++ sys/conf/kmod.mk	2008-06-18 19:50:01 -0300
-@@ -176,7 +176,8 @@
- 
- .if ${MACHINE_ARCH} != amd64
- ${FULLPROG}: ${KMOD}.kld
--	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+	sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
- .if !defined(DEBUG_FLAGS)
- 	${OBJCOPY} --strip-debug ${.TARGET}
- .endif
-diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
---- sys.orig/tools/gen-ld-u-options	1969-12-31 21:00:00 -0300
-+++ sys/tools/gen-ld-u-options	2008-06-18 19:47:56 -0300
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
-+do
-+    echo -n " -u __start_$i -u __stop_$i "
-+done
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
deleted file mode 100644
index 4fa3565207ec..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-My UltraSPARC U5 panics on boot about a memory alignment error when compiled
-with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
-affect debugging.
-
-NOTE: This does not fix the memory alignment panic when loading kernel modules.
-
-Roy Marples (uberlord@gentoo.org)
-
---- sys/conf/kern.pre.mk.old	2009-05-22 10:09:46 +0000
-+++ sys/conf/kern.pre.mk	2009-05-22 10:10:27 +0000
-@@ -22,15 +22,13 @@
- COPTFLAGS?=	-O
- .else
- . if defined(DEBUG)
--_MINUS_O=	-O
- CTFFLAGS+=	-g
- . else
--_MINUS_O=	-O2
- . endif
- . if ${MACHINE_ARCH} == "amd64"
- COPTFLAGS?=-O2 -frename-registers -pipe
- . else
--COPTFLAGS?=${_MINUS_O} -pipe
-+COPTFLAGS?=-O2 -pipe
- . endif
- . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
deleted file mode 100644
index 0f8d070e9a31..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- sys/conf/kern.mk.old	2007-05-24 23:53:42.000000000 +0200
-+++ sys/conf/kern.mk	        2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+		${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
-+CFLAGS+=	-mpreferred-stack-boundary=2 \
- 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
- INLINE_LIMIT?=	8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
---- sys/dev/aic7xxx/aicasm/Makefile.old	2010-03-10 14:01:50 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile	2010-03-10 14:01:56 +0100
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- WARNS?=	6
- 
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
deleted file mode 100644
index 50dacd0e5a49..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sys/kern/uipc_usrreq.c
-===================================================================
---- sys/kern/uipc_usrreq.c	(revision 225745)
-+++ sys/kern/uipc_usrreq.c	(working copy)
-@@ -462,6 +462,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
- 
-+	if (soun->sun_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
- 	if (namelen <= 0)
- 		return (EINVAL);
-@@ -1252,6 +1254,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
- 
-+	if (nam->sa_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
- 	if (len <= 0)
- 		return (EINVAL);
-Index: sys/compat/linux/linux_socket.c
-===================================================================
---- sys/compat/linux/linux_socket.c	(revision 225919)
-+++ sys/compat/linux/linux_socket.c	(working copy)
-@@ -104,6 +104,7 @@
- 	int oldv6size;
- 	struct sockaddr_in6 *sin6;
- #endif
-+	int namelen;
- 
- 	if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
- 		return (EINVAL);
-@@ -166,6 +167,20 @@
- 		}
- 	}
- 
-+	if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
-+		for (namelen = 0;
-+		    namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
-+		    namelen++)
-+			if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
-+				break;
-+		if (namelen + offsetof(struct sockaddr_un, sun_path) >
-+		    sizeof(struct sockaddr_un)) {
-+			error = EINVAL;
-+			goto out;
-+		}
-+		alloclen = sizeof(struct sockaddr_un);
-+	}
-+
- 	sa = (struct sockaddr *) kosa;
- 	sa->sa_family = bdom;
- 	sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
deleted file mode 100644
index 0bf1b611a091..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/amd64/amd64/trap.c
-===================================================================
---- sys/amd64/amd64/trap.c.orig
-+++ sys/amd64/amd64/trap.c	(working copy)
-@@ -972,4 +972,21 @@
- 	     syscallname(td->td_proc, sa.code)));
- 
- 	syscallret(td, error, &sa);
-+
-+	/*
-+	 * If the user-supplied value of %rip is not a canonical
-+	 * address, then some CPUs will trigger a ring 0 #GP during
-+	 * the sysret instruction.  However, the fault handler would
-+	 * execute with the user's %gs and %rsp in ring 0 which would
-+	 * not be safe.  Instead, preemptively kill the thread with a
-+	 * SIGBUS.
-+	 */
-+	if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+		ksiginfo_init_trap(&ksi);
-+		ksi.ksi_signo = SIGBUS;
-+		ksi.ksi_code = BUS_OBJERR;
-+		ksi.ksi_trapno = T_PROTFLT;
-+		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+		trapsignal(td, &ksi);
-+	}
- }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
index b4d22b6fc70e..32b3d46dc935 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
@@ -18,7 +18,7 @@ UPSTREAM_PATCHES=( "SA-17:08/ptrace.patch"
 	"EN-17:08/pf.patch" )
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
@@ -137,18 +137,18 @@ pkg_preinst() {
 		rm -f "${ROOT}/usr/src/sys"
 	fi
 
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
+#	if use sparc-fbsd ; then
+#		ewarn "WARNING: kldload currently causes kernel panics"
+#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+#		ewarn "Please compile all modules you need into the kernel"
+#	fi
 
 	ewarn "If you want to manually compile (not recommended), please don't forget the following steps."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
+#	if ! use sparc-fbsd ; then
+#		ewarn "export CC=clang"
+#		ewarn "export CXX=clang++"
+#	fi
 	if ! use zfs ; then
 		ewarn "export WITHOUT_CDDL="
 		ewarn "Note, Please set USE=zfs if you want to enable modules under the CDDL."
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
deleted file mode 100644
index ccb0c43f6faf..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 8.2-RELEASE it's 800001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	# http://security.FreeBSD.org/patches/SA-11:05/unix2.patch
-	epatch "${FILESDIR}"/${P}-unix2.patch
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See https://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
-	epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
index a36f195b6947..fc852df1d6ff 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="symlink"
 
@@ -74,10 +74,10 @@ pkg_postinst() {
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
 	fi
 
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
+#	if use sparc-fbsd ; then
+#		ewarn "WARNING: kldload currently causes kernel panics"
+#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+#		ewarn "Please compile all modules you need into the kernel"
+#	fi
 }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
index 798f1f370f0b..de5badfc6b22 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="symlink"
 
@@ -87,10 +87,10 @@ pkg_postinst() {
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
 	fi
 
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
+#	if use sparc-fbsd ; then
+#		ewarn "WARNING: kldload currently causes kernel panics"
+#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+#		ewarn "Please compile all modules you need into the kernel"
+#	fi
 }
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index b5ee24b2c359..198434f168e1 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -3,11 +3,7 @@ AUX freebsd-ubin-10.2-talk-workaround.patch 349 BLAKE2B c5697082af994d7f019254c1
 AUX freebsd-ubin-11.0-setXid.patch 3527 BLAKE2B feccd24c34869e35dad18391687be0bec1c86b5573c40ba9c97a3faef0578031226aee817552d19d4416892896ed9e69867287744637def99c2915ff31f96f36 SHA512 204ce8a36eae6435d9549de7c45e361715fd50f721ea44aba630fdfad482bf434e8ac34c1bab588b7af2e2c941931e2aeb4690d65904d617b65ecfa7c76c4211
 AUX freebsd-ubin-11.1-fixmakefiles.patch 453 BLAKE2B 626500cab079cb0a28a375cb3415fc1ecdd3f8ae5c92f564a63420d1e1d6a7f91184d45f81b6a6ac73a2b217b6345db3789ad59c8aa15571f9d259b603f52a03 SHA512 ec3cd800596998c2bc3499a0cde45a173daf87db2af709bef1ae47e70f88a16a7af7649492e4ab96abba4d9b10b58f82e7d8cb3c2882a738ae7963677fd60f0f
 AUX freebsd-ubin-6.0-bsdcmp.patch 413 BLAKE2B 3c9b81f373d1438ca97edf0b0c0339faadf04a3b73f63a9fda51618803b191bbf697a038809ead6d276c3664c309acc68186f5fc571de26334605a693442536a SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50
-AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 BLAKE2B 83a23e099842f1d89ee3cfa14e7ea0c340bf0e5874e5b5650bc0fa8af67339430501b83bc8c31fa09cc2c14ec94888ea0faf43533ada590a8798476094c4e65a SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d
-AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 BLAKE2B aec894276aeee03484c2a4e7751a8b78301747d23794ef046aabb13f59f60d6ff66282e26399f140d74aa9acfc4361ebd8415ba75eb230f43c39fce0ab58767e SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e
-AUX freebsd-ubin-8.0-bsdar.patch 556 BLAKE2B dac1259bad031300b1e24e970c37e681213fc590d86e0df286bb2dcd17925727d900540baa2b0d2ac768058db9a13ee0e7dd91bb9dc833f4910b420686cc2c2a SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430
 AUX freebsd-ubin-8.0-xinstall.patch 1014 BLAKE2B 9d51cab56860e63bc79057ec910b1f5d39dc1c100e43a0f15ce4c3696da4da3366dbb13bea280fdaae2dff91e2a5d0aad2f5b7448a46d76fdfce317393db7f46 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d
-AUX freebsd-ubin-8.2-compress.patch 1658 BLAKE2B fda8b86c361c7c171a36d4a788ddaefc4b0d1b8f6a0e2687aeec379e64b3b9df623ac7aa322041a7dc5d0c1de116b71cbc0310308ec541bc91bad1afbe1b80c3 SHA512 9b94b608e4dffb27cec0e6994a06de710ff2d73125d18fad2c5bbe9cab3e1f626ba2ade0333cac9d72350e30b2746f1ccf096bb67b472d1b9b0b79da68bf43bc
 AUX freebsd-ubin-9.0-fixmakefiles.patch 445 BLAKE2B 6d284099f5c52d94fe682e190cb584f3a78e475005ddc349fbf1fb690a17f87e9753fc93a27715e3815450fadb51d7ae9158308cea1aeec9e58310709474a620 SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955
 AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 BLAKE2B 7ff532f2bfa1b6f70894757fd249543e479f6bc31aa2328aa9c9edcd4ea7c67666ee6cea06af616f3de9e6e86dd50b8b76d6f860aa95705abe686227423b2ffc SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa
 AUX freebsd-ubin-9.1-bsdar.patch 656 BLAKE2B 3e224819d75dbba4b11fc3cb9a493ae2467f7396ee17d9e4511414f60c53578bff8442eda82497b33b37184e1814bbd54a48197577526c335e7447f1ed09817b SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac
@@ -20,25 +16,16 @@ AUX locate-updatedb-cron 122 BLAKE2B 47f9847f8d1ca474a882cdbb24ecdda4d15f8bf24a5
 AUX login.1.pamd 145 BLAKE2B 74b7fc80ccfbe63fcdedc533bff27e9f857c0c71a8429cd7f7c748ac86924e38bdeaef19ab36fa9583eeb247b49a554618622311b28bee6c71f32ac838fb0df1 SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397
 AUX passwd.1.pamd 145 BLAKE2B b2d0f308d79db41bf38523ff309686da8a2feac0a9173100941b54d6a04f959ccb149f9a91fb747f73cd6b39eee74e075b37061a6e01a2a5360a49a33f38b882 SHA512 89f8a8a7058c2105c71a98099ba79f7169b660633cacc7be5352622481fd0a6c82f6b5403f34bfb059f8cf524671e86d7f0031dd7c89fc98fe5d5f33986a557a
 AUX su.1.pamd 312 BLAKE2B 2142e9f4cc37bd9b2f23b11f5c221ddd1bc73b18859e90931202900ffbbc4d896fb716b3d219d583facca4602e6836a10c4f53bac09b75dedc590c56323f3da5 SHA512 f7ceb3659313197138d057a67b325fab7a304426ad7b6e8e3fbda2cae47f42a3348eaa1e5153b20626cef63da5096c60cb7f2e1904c3031d9fd13df765fc70b4
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-EBUILD freebsd-ubin-11.1.ebuild 6203 BLAKE2B 4f0627a072962c3f70fc44efa493c0947677ad8f08302b53c9e64fcbee7267df7ec5b88b1a1a2fa3b55c90412f426e9f4847bc157511baba9ab9f6d5335c62b3 SHA512 aad001318ee376d64c06a3b3c8eed3477b27e27a50120c4135e6eea0966aed7b80a176a6fcd5095e55526340c5eb8a01d42fe57765b42d78453d6208a4e76ac6
-EBUILD freebsd-ubin-8.2-r1.ebuild 4520 BLAKE2B 86709e29a161d33d53be9db41106f3dffcf5a043431e269eeab614cec6e14eb97df838bb18584424456c16aca0a4c2e32cbcfb8ca538546189f051e8c4a6adb9 SHA512 92a14a5812aafea6a7c772e4da874651babc2fd8e0c03172ed5dfea7ab50c51cde3ace435a7e8ccfcbfdb45e725c9cfdf6b307efd2e2f77f5a00295b5d7c148e
-EBUILD freebsd-ubin-9.1-r2.ebuild 5447 BLAKE2B 6afa74903b56300050b8a8987cd050479d87ad1894c8b859dc8f6770aae361066d8133f0c81feeb65d4ba4226635ae2f604387be67dc08e1b7410298aea22d81 SHA512 fc4dc85aa3a37cd734e6ff59811e55e4679a178a9feb6f7e99410835cac73fe95730067267e7c808bba718ce9ca1d5f9d532c96080b7b61238e657869ec5027d
-EBUILD freebsd-ubin-9.1-r3.ebuild 5454 BLAKE2B faea05dfb1ab5b98c98f7d7975ec4433352ca7fface10aa6746397c5cb3aba00768f9250028886549e85e104287d59e1944eea733288eb0fe7a3ac210545f353 SHA512 b70bb34cf6536e080f2fc40f3018dce2e1c4061932e6f9137709bea5d0878e6f4625d4d7d7f34b3bd51e48a46ff9f3d352ac112b66579de6d0249bb7a0a3eb57
+EBUILD freebsd-ubin-11.1.ebuild 6191 BLAKE2B f39322b75a7d4a208e00c4a254fa785ed97f47c02fe74982cb724d83d8d9990dad52d3147b79ac228ffa01fe97e39e4863a8335ed7c8986e955dc7f422ffc2e5 SHA512 a900e3f060f44f9b15f0894725cfb0c247e3cfd7785184a2847714d1089a2dd61c3c7882d9dd0922e88e1d83bb0572ff874106bc0466dae883538cfd23009ea1
+EBUILD freebsd-ubin-9.1-r2.ebuild 5435 BLAKE2B 593ac216d25f29ea13839a4713115d7b502d9c706b5c44d258c6fd95d96a1782dd5065ec4a439ce01208cefa056f75d7ca629160d9c43b88d4dab6d172d04e6f SHA512 10cbe0ef273e83d0828ba54178fc03f736f0eba0e77d194ccd497bc1fc9123cb88705dca4bc3918fcc1a6fb8adca71edc215a4056c7a2f59e0a60c8e091fc395
+EBUILD freebsd-ubin-9.1-r3.ebuild 5442 BLAKE2B a19be7516757aafad2141d462023cd0dcc078393be1f8b54219c1ba8d214c737f2a956d1a30931be9f07fc95633e90d18f3f56cb4b1c1bd955767a521c602abd SHA512 53e627e4f98a2b7636992cd7d33366128b4d1f39bfea2ab1af49ccfc896db8ba98d9dc391d67d09a0ba609b6ee05fcde285cce6cf5cf4b0739c65adacf5930a5
 MISC metadata.xml 738 BLAKE2B 610b94f0d41c0b374855c3e340e18061db019949712332be10179ece5ad4ed84512c519279695d1c294bb1b8482d7980135c1b53b254e7078a4ba7c9575da471 SHA512 1761e6535f251fb4e9e8495ab0682677c633109b410984d142a3e3de144bd79e2a472044c064dc3c2f8aea7eded011e2848770257d100b4837701d2c71f3b824
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
deleted file mode 100644
index b135a82a5238..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: usr.bin/calendar/Makefile
-===================================================================
---- usr.bin/calendar/Makefile.orig
-+++ usr.bin/calendar/Makefile
-@@ -10,6 +10,7 @@ FR_LINKS=       fr_FR.ISO8859-15
- TEXTMODE?=	444
- 
- beforeinstall:
-+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
- 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
- .for lang in ${INTER}
-Index: usr.bin/ee/Makefile
-===================================================================
---- usr.bin/ee/Makefile.orig
-+++ usr.bin/ee/Makefile
-@@ -12,12 +12,12 @@ LDADD=	-lncurses
- NLS=	en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
- 	uk_UA.KOI8-U ru_RU.KOI8-R
- 
--NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
--NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
--        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
--	fr_FR.ISO8859-15
--NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
--        de_CH.ISO8859-15 de_DE.ISO8859-15
-+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
-+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-+#        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
-+#	fr_FR.ISO8859-15
-+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-+#        de_CH.ISO8859-15 de_DE.ISO8859-15
- 
- NLSSRCFILES=ee.msg
- .for lang in ${NLS}
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
deleted file mode 100644
index a89cf52dfc4c..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-By default the mkioctl program that generates code for kdump does look for
-ioctls in the whole /usr/include tree, but this does break when xorg is merged.
-This patch allows to look for include files only in the source tree.
-
-Index: fbsd-6/usr.bin/kdump/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/kdump/Makefile
-+++ fbsd-6/usr.bin/kdump/Makefile
-@@ -10,6 +10,6 @@ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CUR
- CLEANFILES=	ioctl.c
- 
- ioctl.c: mkioctls
--	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>
-Index: fbsd-6/usr.bin/truss/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/truss/Makefile
-+++ fbsd-6/usr.bin/truss/Makefile
-@@ -29,6 +29,6 @@ syscalls.h:	syscalls.master
- 		${.CURDIR}/i386.conf
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
--	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
deleted file mode 100644
index c966b9b88ad7..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr.bin/ar/Makefile.old	2010-03-12 14:50:30 +0100
-+++ usr.bin/ar/Makefile	2010-03-12 14:50:53 +0100
-@@ -1,6 +1,6 @@
- # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
- 
--PROG=	ar
-+PROG=	freebsd-ar
- SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
- 
- WARNS?=	5
-@@ -10,8 +10,7 @@
- 
- CFLAGS+=-I. -I${.CURDIR}
- 
--NO_SHARED?=	yes
--LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
--MLINKS= ar.1 ranlib.1
-+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
deleted file mode 100644
index 5bd1d5524c31..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: usr.bin/compress/zopen.c
-===================================================================
---- usr.bin/compress/zopen.c	(revision 225020)
-+++ usr.bin/compress/zopen.c	(working copy)
-@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num)
- 	block_compress = maxbits & BLOCK_MASK;
- 	maxbits &= BIT_MASK;
- 	maxmaxcode = 1L << maxbits;
--	if (maxbits > BITS) {
-+	if (maxbits > BITS || maxbits < 12) {
- 		errno = EFTYPE;
- 		return (-1);
- 	}
-@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num)
- 			for (code = 255; code >= 0; code--)
- 				tab_prefixof(code) = 0;
- 			clear_flg = 1;
--			free_ent = FIRST - 1;
--			if ((code = getcode(zs)) == -1)	/* O, untimely death! */
--				break;
-+			free_ent = FIRST;
-+			oldcode = -1;
-+			continue;
- 		}
- 		incode = code;
- 
--		/* Special case for KwKwK string. */
-+		/* Special case for kWkWk string. */
- 		if (code >= free_ent) {
-+			if (code > free_ent || oldcode == -1) {
-+				/* Bad stream. */
-+				errno = EINVAL;
-+				return (-1);
-+			}
- 			*stackp++ = finchar;
- 			code = oldcode;
- 		}
-+		/*
-+		 * The above condition ensures that code < free_ent.
-+		 * The construction of tab_prefixof in turn guarantees that
-+		 * each iteration decreases code and therefore stack usage is
-+		 * bound by 1 << BITS - 256.
-+		 */
- 
- 		/* Generate output characters in reverse order. */
- 		while (code >= 256) {
-@@ -540,7 +551,7 @@ middle:		do {
- 		} while (stackp > de_stack);
- 
- 		/* Generate the new entry. */
--		if ((code = free_ent) < maxmaxcode) {
-+		if ((code = free_ent) < maxmaxcode && oldcode != -1) {
- 			tab_prefixof(code) = (u_short) oldcode;
- 			tab_suffixof(code) = finchar;
- 			free_ent = code + 1;
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
index 0aa366c68d63..4a52e0bedec6 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.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=5
@@ -14,7 +14,7 @@ LICENSE="BSD zfs? ( CDDL )"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
deleted file mode 100644
index cafa7605cf93..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( app-arch/libarchive )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-6.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-8.0-bsdar.patch"
-	"${FILESDIR}/${P}-compress.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	whois tftp"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-src_install() {
-	freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
index 2b7bb22a77f1..51d1442d20f2 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.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
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
index f292b7e8ba5a..5c516589984e 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.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
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index bbf4a673cb8a..c95480e33781 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,14 +1,11 @@
 AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 BLAKE2B bddbdf3869a084f4a3eed616398bbcad3759570ce25ff4467747f2ac1795a50cc082e5e2858f61faa3d70acecbf91c0f793d6a559622e3c8f8a07485138bfa79 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd
 AUX freebsd-usbin-11.0-workaround.patch 374 BLAKE2B 7e4b18ccddd1da87fc2d6bb8d8c98be45cc1b2d1d8b383316746a793b6eb3aa9d722e11ea600d0c49111b00c5ddb237eaa019b2babeed86da7d0beef6ff0189d SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518
 AUX freebsd-usbin-11.1-bsdxml2expat.patch 841 BLAKE2B 89b5b0ed64dcf5c95eb727110651bb77079a4ccfc346fbd9ac1b26e3a4d53c452d657379ca876e6eb8b50dd90be59737b84405de873613dadf3bebeae7c788de SHA512 69f9055dc536132f1ec46389b53e25261632d726bc74857210ecb5511114f07d4b550e5e4a7a6e066a4a68c4a4bb4e44309d01f569b154fc773247dbd7f3fb23
-AUX freebsd-usbin-7.0-nowrap.patch 1185 BLAKE2B abf703cc6a6a7294b2be9da26f71add505b0394d465211a1154690f8e6705d39e6b71f5a63c9a298eb5d9df544037b03577bae16c259d84d78ca03f048e2b438 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee
-AUX freebsd-usbin-8.2-newsyslog.patch 400 BLAKE2B 12be44c218cc355a2eaaace2061ac9d1f62b2c44cdde6816a9e35fe525692d1971af8d78bc78740642d970a0d8d6e18f04879114851811052600b16c9b02bde6 SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56
 AUX freebsd-usbin-9.0-newsyslog.patch 507 BLAKE2B 7c95ebd60ca6cc1bac56b84359a389dada9e71de9f275cf99d72f329fb408bd16845fb46d60037c514deb4ea21cd894da57ae28193e56970e383c5a8e1c689b7 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae
 AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 BLAKE2B c521420d05d41a4f65d20786c0057e4e684860f1ba28d2976fa44c6fa94379ab1423b8e332cf30c99fdf6b06b54525c491e2fc17a5f820e7cbc2d1a10d868b2c SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0
 AUX freebsd-usbin-9.1-kldxref.patch 756 BLAKE2B 9ddf3efe8b5c0ed13158bda03c2a89e70d0692520d31590448a3b24440b24228edc37600a3052fc91c82ac6f9ab8a5ef163954b911122659ce26d95d1fe5836f SHA512 8d1e0c80a6698729bdf40e60ac0373ed76e4c394f7fc93e9ae78e9e8bb06d63c99d04dbb942e90cc9240fc429be7048c4fee22c3ce593b49be90c9df3fc549ec
 AUX freebsd-usbin-adduser.patch 428 BLAKE2B 3008953aa7ea14405b0e914f518fa05a5de744283110959900ab1ee9887b8b48d8d15131f26280773ff0173f1c60c077c66fedfad1b0310d0e6c5abb5a2b1370 SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3
 AUX iscsid.initd 429 BLAKE2B 366c216bf7f4584d1aa115302547b7066105b5107a976504c68725a1f7ca80adb7bd19b4acdaa2ea41b45c42bfed2b028a17ab28201163222788432768f2e5a6 SHA512 49a90719aa0279e19899a2107113cad0784a2cf3b57a0c24ad08549fa4b44dcb1aceecd71027e363b8d2cbbe1b590480ef7806cb05d8b00c1830c2d77b8a8540
-AUX mountd.patch 542 BLAKE2B 3da93977dc98ae0c95a4df71bf990c9cd42c79c782ad83b9c6473f603a97a481fd800729530c5820b23c46dc14485af22efb705cfbc75db88f348fce0a3d04fc SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5
 AUX nfs.confd 303 BLAKE2B 69f72512c7e518f9078ea3873c5a2c9f0e1fef02ba3d769a18d1c8f347a8f8d5981cbe7ce34946431b373ae2b580505d74714f7bdbc0a7298745f02f96d35404 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a
 AUX nfs.initd 1424 BLAKE2B d3988adba20f8c8d4114342ca90752ea6dfce1993bce29991655639b995784bb25f8ebd7d0dee687d5e5e2970862f688dcc74239fac4b7de4beb8cddc6c1cdad SHA512 1d85de665dfea1845189f2ad2e7205ab6185ce228f7140ccaafa22c84f8b9f0b4b4c5a26bd53895f1f2c4639bbeb8d5b76106d2e64851eb62f229028dc61cb5c
 AUX nfsuserd.confd 153 BLAKE2B 931bde9b889bae7a58a9dd2b37583e1b9caa610a4eda9f4b70ed15d8a8752edc669b9b7f45d5613db57f05648c9f20f0efe2808f25b000627dd7c36778efce58 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073
@@ -16,28 +13,17 @@ AUX nfsuserd.initd 447 BLAKE2B 0367d6849fc1392ae308023c5c5ddf4df0db0b38e86c486d8
 AUX pw.conf 179 BLAKE2B d93e3d2df7bc636b21b2bfa30b5b76b671f98631c360f7977c9368b0f1fa96cfa922c6820836addd24804b50c3a9978ca901dd7068f5d721b8ac8c6b8ff151f7 SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891
 AUX rpc.lockd.initd 530 BLAKE2B 03926d9b01e3d191030a18785ef53824836d1826895d064a303d83f5eff8e3a3630273d5547d1d0d95bd85db7f421b790671cf9e882af58621dd8756fde86fe6 SHA512 930c42b63a230f6f64ecdaec95f61e43b463abe109f926c298507fa3c6b090edba1f8dcc95046a0a5b8c0378d336fbf728f9db77b8b0822d0e2b36713fefc9e5
 AUX rpc.statd.initd 520 BLAKE2B 701d58e57520dd9237a7e2261071304a1f820816c0902e06122a4729872432e6c29dc62a686f53d674a75f2c3050b6adf04b2d3c665f2f3639362fecf0ca929c SHA512 62c3bef69ca0619e3492050379a4c8b490305ab0ee7620143c31be7af414b1f1cbd79feaee345bd5e6bfdfa6c93bcce3cc9ff61a2f63e235a3807920e260cb7a
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-usbin-11.1.ebuild 5454 BLAKE2B 388e4183cf15d1ec29dfb0e7c38e5bc4e8531c4b3aa192cd0368adad1f4450f89b1b44336fc7a6bafeb4368cd3022fe9fd12628d20d3d4641eccdc1e611b072e SHA512 6b37709519942d7dbe85f12c347838cd07de93d5f5bb2b3867e16b1b1da8af1a78745585b1d016989dac7692143433d96d6dbc68cb492ff9d315314f667ad43f
-EBUILD freebsd-usbin-8.2-r2.ebuild 5093 BLAKE2B b383f35bd8cc32c1a130240ed680591670b0274097934bab481d0e97d2226b5dcbbac33906f432306bea321ba7b421f2d41b4db8c1925c95722f1a9b83c11e5e SHA512 77a75c88f844eb51896b1021fbb9690771e80cdba214c6f3d7ae8dbfac9bfd9f5db2af587839612d485818243451b50a61596aa457bfa92b2f5008a5ae203ed2
-EBUILD freebsd-usbin-9.1-r1.ebuild 5359 BLAKE2B 17673327f8f6498fec2bd9453a34830ebb1729c859a06243da4a00d130773b32688adfd74012607f2568a41d07249fb939e58cc81350838e0389dd2a377bbff6 SHA512 e59ef89170cde0cfa4802ee20c94c4bed6d71f695f0f961cdd7ff6667af719561f156f1f0f6ba5be5395a00020c4f419c354e8cb48fcaec307dd5247b3750dec
+EBUILD freebsd-usbin-11.1.ebuild 5442 BLAKE2B 68a9b16ec4eceded11cbfda41eaf8e5d5108e43ba16d351c8e7e82480ab747f9088592bf6dc9aeb35507cfe0d53936108dee467ed0ddac1b728141116925f42b SHA512 ec043c20093c49637c5ee352259015addcf23c610c893a21b3a9f512b097b3d659ed788316540435b3edfedbe3b949325f2a935a8d46acd61593cb27dd6756ac
+EBUILD freebsd-usbin-9.1-r1.ebuild 5347 BLAKE2B f2588f153a30c134cebc1bf46092840fd1638ee963c296aa7872871e482b186463783bb14ec3dadc987d2c121f883f2ac82586e819fddad73ffdcd48c2421556 SHA512 578b2754262864fee5f76b0a3b4e30b5d3069d47a20fb9aa6a97ab70da1dfe0a1cb42121debca776c3e94fd9de1d1501b0cdc9c2b7ba0cc34bacc6157cc4e291
 MISC metadata.xml 599 BLAKE2B 70b00a85a1d670dc842bf5234aa6a82cc31564ec25c2f1789440b5beae5e4e0ab76b7b16122b92205d616e86225d892eb183f21c3e0c8aa63cb32f60a0647265 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
deleted file mode 100644
index 9b11104e8337..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
---- usr.sbin.orig/rpcbind/Makefile	2007-04-21 12:02:30 +0000
-+++ usr.sbin/rpcbind/Makefile	2007-04-21 12:05:32 +0000
-@@ -8,13 +8,20 @@
- SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
- 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
- 
--CFLAGS+= -DPORTMAP -DLIBWRAP
-+CFLAGS+= -DPORTMAP
- 
- .if ${MK_INET6_SUPPORT} != "no"
- CFLAGS+= -DINET6
- .endif
- 
--DPADD=	${LIBWRAP} ${LIBUTIL}
--LDADD=	-lwrap -lutil
-+DPADD=	${LIBUTIL}
-+LDADD=	-lutil
-+
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DLIBWRAP
-+DPADD+=         ${LIBWRAP}
-+LDADD+=         -lwrap
-+.endif
-+
- 
- .include <bsd.prog.mk>
-diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
---- usr.sbin.orig/ypserv/Makefile	2007-04-21 12:02:31 +0000
-+++ usr.sbin/ypserv/Makefile	2007-04-21 12:06:53 +0000
-@@ -8,10 +8,13 @@
- SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
- 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
- 
--CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
-+CFLAGS+= -DDB_CACHE -I.
- 
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DTCP_WRAPPER
- DPADD=	${LIBWRAP}
- LDADD=	-lwrap
-+.endif
- 
- CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
- 
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
deleted file mode 100644
index a0983912178f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr.sbin/newsyslog/pathnames.h.orig	2001-07-30 18:17:17.000000000 +0300
-+++ usr.sbin/newsyslog/pathnames.h	2009-09-11 08:32:57.508226240 +0300
-@@ -24,5 +24,5 @@
- 
- #define _PATH_CONF	"/etc/newsyslog.conf"
- #define _PATH_SYSLOGPID	_PATH_VARRUN "syslog.pid"
--#define _PATH_BZIP2	"/usr/bin/bzip2"
--#define _PATH_GZIP	"/usr/bin/gzip"
-+#define _PATH_BZIP2	"/bin/bzip2"
-+#define _PATH_GZIP	"/bin/gzip"
diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch
deleted file mode 100644
index 3cb9f03e9d8f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/mountd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc
-
-Index: usr.sbin/mountd/mountd.c
-===================================================================
---- usr.sbin/mountd/mountd.c	20 Dec 2010 09:28:28 -0000	1.107
-+++ usr.sbin/mountd/mountd.c	1 Mar 2011 11:47:16 -0000	1.108
-@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i
- 
- 	for (i = 0; i < len; i++) {
- 		bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
--		*p++ = (1 << bits) - 1;
-+		*p++ = (u_char)~0 << (CHAR_BIT - bits);
- 		bitlen -= bits;
- 	}
- 	return 0;
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
index 36367a5e496d..5e4b26e2c2fd 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.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=5
@@ -13,7 +13,7 @@ LICENSE="BSD zfs? ( CDDL )"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
deleted file mode 100644
index 2bf4b1f35f0a..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2
-			mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	acpi? ( sys-power/iasl )
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	dev-libs/libelf
-	dev-libs/libedit
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 minimal netware nis pam ssl usb build"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch"
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/mountd.patch"
-	"${FILESDIR}/${PN}-8.2-newsyslog.patch" )
-
-REMOVE_SUBDIRS="
-	named named-checkzone named-checkconf rndc rndc-confgen
-	dnssec-keygen dnssec-signzone
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg_install freebsd-update"
-
-src_prepare() {
-	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-		ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in nfs rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
index 11c304685cfb..2627caf77333 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.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=2
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic eutils
 
 DESCRIPTION="FreeBSD /usr/sbin tools"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
diff --git a/sys-freebsd/ubin-wrappers/Manifest b/sys-freebsd/ubin-wrappers/Manifest
index 2286e286be6a..1310daa943ff 100644
--- a/sys-freebsd/ubin-wrappers/Manifest
+++ b/sys-freebsd/ubin-wrappers/Manifest
@@ -1,2 +1,2 @@
-EBUILD ubin-wrappers-0.ebuild 781 BLAKE2B 3ac0cda528c298894c546cc6c50a58b4cf1ef9af84190efc72d644a750477b9060b3bed4beff5bb594c84f6198d31b7f86aac05f55f11f2217fb01382621ae10 SHA512 a438b6e683273b7f832e2e2cf41ad644cf4a5006ea493886e46b3008a3e158372c179d8836b54f1d258a5562157b774098e5a4758f107f48af1c97b597d7411f
+EBUILD ubin-wrappers-0.ebuild 769 BLAKE2B b18bca98024fc32a287283f5ad80cf6d7070fe0c57368e356c5e43e3f2958d677151adc3c87e06d7f0ac580e5497ade2c5001a093384f416824a0592524017d6 SHA512 6b11cf09d20ce8a585c3191ff69b19ef918c87b7a1e35d2dc6f71b3662e879147059f05588e821f908d13f17e274148bec4711020137098888f7355c3eb17959
 MISC metadata.xml 242 BLAKE2B 96580d939bee0b28e643476ad839223e9992a8bbcc59c5902a2b7d71945dfecf01bf924f11884f3f684184181deaa13849ce318c2aa0683d33113e87d191bc26 SHA512 b854e91958adbf3787c2f322ff793e9a7e1881eed7018e83935a99a6a68db80996eb87786d5162c8d66460801f601bc477071baa4010152abff68668e36047d3
diff --git a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
index ad8aabbca3e8..e183e180cc94 100644
--- a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
+++ b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="userland_BSD userland_GNU"
 
 DEPEND=""
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f0462e297aa8..b5a4d00454a6 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 59ad2f63123c..e8a30d664ae6 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,7 +5,9 @@ AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab
 DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f64d8cfdcc01f2e008eea8141423e9d364af42fa3b58f9f8a76f898a01b3918a2a3ff98bc62ab105fa85feb3c1d55cd SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249
+DIST cryptsetup-2.0.1.tar.xz 10110424 BLAKE2B b3becffcb7000e40e1f47da4013998de557259f64dfdb24def953a375ed89dd8b4f1f3b95d7f1150638f29bc018ecb282db9f06ef7ba63b77a68ddfdfccd0c1a SHA512 b0c16de67169aefe861e0d6692dfa7ff1d7cf34990611c71edb82606ebf39a529511b36f7c452da591bdc39c4125a4355b7444d268680458219f2cad63e0f74b
 EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928
 EBUILD cryptsetup-1.7.5.ebuild 4037 BLAKE2B 1f4087211e970a85168dfa430529e16f4a4a2d6685a139a146f1c295d5c24cb66812409b9b54025884a7ac7dfde2c583aad81f5d23e75285b67443cf90843866 SHA512 d066730d351a2d01714c57fe5f430382276167a0b7e914d17c90760c2adc4442a71e2537e85b97ce71cb0f6d44e6ea399a0624e4ffd8fb4a43b81f5c3318d177
 EBUILD cryptsetup-2.0.0-r1.ebuild 4098 BLAKE2B 26ec10dfc4d31c972dc655a7ab4dbecfdf63dc587df5cb1c772604c8cd61cf9a7f6d05cee9c2c7f20d46876ff6749c469ca78840152b843d8a31c08ad54954e3 SHA512 f1f7a6bc99c865687e6fe58822feb19165e5de8bd132b681ab38a2ce5e658a83cf448c7b6e9bdec7bd9d059465efb681ffeb68f155db8f2cfc4d6fc0cdcf246c
+EBUILD cryptsetup-2.0.1.ebuild 4034 BLAKE2B 77ef011fd8005a29e27fb480137b9f36e2a160122a6917b532d2645f04360f7c042f9444819b6d1e6b59c7bfb4b981a7f7585e9cbd2ca22a6a44a957e6a0d25a SHA512 59315e58bafd417c781b38378ccd6ad8342ba89d6347ef0b40e399411c408eea370f295a6ce3fca2ea82bb06e4cb99aa278b883d62afeb928cd576a3488c2521
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild
new file mode 100644
index 000000000000..8a3cab745499
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools python-single-r1 linux-info libtool ltprune versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	use python && python_setup
+
+	# We disable autotool python integration so we can use eclasses
+	# for proper integration with multiple python versions.
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable python)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED%}"/sbin/cryptsetup{.static,} || die
+		mv "${ED%}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	prune_libtool_files --modules
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index 6278a6d76675..a373d76840d9 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -4,5 +4,5 @@ DIST encfs-1.8.1.tar.gz 316534 BLAKE2B 318b4ec8e17a7187c299e1287ad1927db2da64c96
 DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5
 EBUILD encfs-1.7.5.ebuild 944 BLAKE2B 15eddfdf2608b1a7bc9790759024ff989ac7af61f7cb3dbf83cb030c51a0db54ee403dd451f285ed08203e4aa05e15ab339f1d108cbbc39e1eab56acc5dfc27e SHA512 7cc33ba27c23b1220cdd59a494fe92c219041c3dcff2189301ac8ba1d635ea117e41c6d5658fa3ad00d883df0961ac9ba56e44c7b09149670f95d3b7d6cc4848
 EBUILD encfs-1.8.1.ebuild 1186 BLAKE2B e1e6f0bc4fba1fe1d9f2eb7b4896a5011ee519bb9af631881dbf747f632b2fec0d8cdb128d441c0be56efcc7806afd8299dea81c392822608ed09a29cc5b45dc SHA512 d9133dbcf045e0a9fdef6c7fe8f7e8aa67b82d776f0f05388c93a891a54c3f9f48ab4d2ec232e358c54e2d713248a45a66ef950825e4e2677157f7fde154a1a9
-EBUILD encfs-1.9.2.ebuild 908 BLAKE2B 72e6c9ade188977f93348d45e830e18f015f189d9577789c75ca356ec21816cb35cba247df64c58a385909518d7fa665e720e4a883c5ef50ed586c98b0046dfa SHA512 b23c7ed3054f808feca0425b30532136cbeb46690bf8175ba9e4a31bf8af43e1661d4e738fe5ebb5ea0bf15dbf4a7a982fe2ff0e4156be82e5cd807e09e3ea30
+EBUILD encfs-1.9.2.ebuild 913 BLAKE2B b55fa2df2488784bb268f110889b4837639cca2cad158833ac6b2ce14ca232c6f220b5cdc26e97bdfd8be29b8c6a8186744e9a6e0626f7c69c90a7f7f14d1351 SHA512 113d8cfdb07d579edb53f4c58db10433cf653e4fe2890b3893eb610ff061d7323e28894474977bb933238d2ed42afbd0a8ddf95c1e1364e8c12e785c6e346ce5
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index 01426e04c93a..b2180d316cd9 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 159f00c2385e..9e7537122730 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -14,6 +14,6 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb
 EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
+EBUILD udev-236.ebuild 9986 BLAKE2B 70f0639d812d5b80e11ac39e39b0f3df525111d043107bbfeb9dd31a97d0fe0253c23e8a109b2794a41bd61093b3d21dcb0a94e7c340a461777e3ec51c3f561f SHA512 e3e5f17d0dbc479b52b64a4abad8dca63a4670399759ae2da50bda52edf84b3abee2d265a890d5869d0a67201f1db0da8083f57cb3b33135444d53a600440641
 EBUILD udev-9999.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild
index ec6201a5a68d..0bc6698ce506 100644
--- a/sys-fs/udev/udev-236.ebuild
+++ b/sys-fs/udev/udev-236.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 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 6028c91377be..5e748e834ed2 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -7,9 +7,9 @@ DIST udisks-2.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83d
 DIST udisks-2.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
 DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310
-EBUILD udisks-1.0.5-r1.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
+EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
 EBUILD udisks-2.1.8.ebuild 2997 BLAKE2B 3339216fdb9ab778f5601ab798be81ffe76ecf9c50d4e493cd86c80a2a6e150fb174d5ba0127e6b8cde3f81e9bf114ad6529bc1d45876dc02555d36e5f61b90e SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25
 EBUILD udisks-2.6.5.ebuild 3348 BLAKE2B f227e1c664937ff73880f50d4847f61a7f42d681d7320d580863578abf4d2d6b41b5c38513cfdfb76311b6baf107b7b32ecbe9826213828c3936454d27d57736 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc
-EBUILD udisks-2.7.4-r1.ebuild 3434 BLAKE2B bf1a9ede6b6faef5c1ed6ee2fa935b2abf46479035dba551f1f57f0cfc43627615820e3335c7ba62ea3bd6dc2c467b1192762f95f919c49c4ba19079228e3247 SHA512 109d5a2052b632ebcce964770703f4e5f25d6b1d0a5981d87c66742a932d6202ae11ece57e22e9ecb15b8c04c394886b16820022a47c6b7c8af8e8b31c0d0242
+EBUILD udisks-2.7.4-r1.ebuild 3450 BLAKE2B 5c8e19e8780ce2a13fec5a5f4d8a3d73bc271818d62ed7cc3a9b399378710ec9ffe29373fa8660a132772b6b6c19684e6c6828a66930695d77e5ba09ce8a82a2 SHA512 e725a238dff25f397a4ad444c73dd9dd6745f246b49e2977cacf3107ecc07a60c3a6667fc744567b2c9fc4fc17e75c3c237df90c7a81de4a72ac2904c06549ad
 EBUILD udisks-2.7.5-r1.ebuild 3503 BLAKE2B 5aa11ad64789c01674579d8de9486f8b56a71fe84a33ca30f6279e478d42e68cae0a929b2720f863e9479348e255b6444e9a6884fec2eb46a183d9a1b70e447b SHA512 cf390eef1066db7dfb5aaeaadbe6d8ca57afd172b901eef5f25bb7aedf52c6758f83731642cc1fe8ec412582cc4ea47f095686c35ae10eedbe718e992f2d1f4f
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-1.0.5-r1.ebuild b/sys-fs/udisks/udisks-1.0.5-r2.ebuild
index 513b9e8dcb5a..513b9e8dcb5a 100644
--- a/sys-fs/udisks/udisks-1.0.5-r1.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r2.ebuild
diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild
index 833fa85161b7..e3adc9ad0cda 100644
--- a/sys-fs/udisks/udisks-2.7.4-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.7.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 ia64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86"
 IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 2187d825bbc9..8def4c1f21f4 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,20 +1,10 @@
-AUX xfsprogs-4.12.0-fix_musl.patch 3133 BLAKE2B 172940d6fd57f0ab165dc29cdccb9f4e509fb5ba0c39e47480608a6be0388c157ea1e0a4bf62f33dda0f2bd7b5f65b308f2f4fada4b108348e6e190d420f1cf8 SHA512 882de116f5cfe71fb5d3ac81db50eca6a1b666ea40041ab1e922507bc17906055ac02335bce94c64dcb3ad8938a48064f5b364e8867a72ac19077cc92a93a249
 AUX xfsprogs-4.12.0-sharedlibs.patch 2361 BLAKE2B 3e487d35a858aa4adfdd41a853dab75ca62042710a82432e2dc1a0d23bd6121c2056d201a0e28e3ce538baf5eb1dcf2f72f38086c52955abeb7cc3709c903a62 SHA512 bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba
-AUX xfsprogs-4.3.0-cross-compile.patch 5112 BLAKE2B a2afc10b26aa42838999a1b2c8ca90dc54040f033f56f0a84ada02605342b204a03201b9fae03ee5adf4fbdda1d0c58f76d6ae153232d0b2619c1a4cfd33959c SHA512 2d6303b7c89b3e1ca2ba1d95a4477d0d1c2360ed68bf9c9d3630f990081be98ace9b9c164729635fa582cc5c8bd418e1824e35f613512d43cc6116fcda379582
-AUX xfsprogs-4.3.0-sharedlibs.patch 2310 BLAKE2B 6c9438a1ccfc4916ee4198b08e6b462f2a53d24afed86f3f316c59c5ae5381118b1789141dda56d2afb878059262b7e0227768dc8a05a3a7476a9dea38d0a832 SHA512 6d7ad2bc8b74390f81ecfa3774c837d083dc7e3332bd2e5450c4d67805d54f9727afeace39755e5d1185a230abcc9644bf2eb1544708d81b4f93a419aad8fdf4
-AUX xfsprogs-4.5.0-linguas.patch 967 BLAKE2B 7cd2051e135f33c7268eb68acc05f7a368cecda6868a55d03a0b1d94e5aafde5d12184c205d11eb0750f44a9a51edd5e38a7cb11a257f6ed05adf99db59f4cb8 SHA512 6d812dce622a3d38fe2b23e47c8f188012522dee3eaa6f002080f2b2ba8e50dc31ed8fc56d9e10b13d4f0dc54d6377b77d8a3823494176e843480e5226e79679
 AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9
 AUX xfsprogs-4.7.0-sharedlibs.patch 2355 BLAKE2B 03d1dfd738b973d9f904cec83528e6c61f9ebc8090c05ed8e51dc709185196f22b6db416d548fd0fd35296934177660a9d864881d07511f43287d647c392e4ae SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe
 AUX xfsprogs-4.9.0-cross-compile.patch 3663 BLAKE2B 1fdbc4307c0b177428e5b016321c791736c4cf0dfdfe19a413f0bb20d4f866b5bebe165c58b30132fadef078f5de7cbded1e310bc6871fb65559d00b2ae107fe SHA512 150ebcc26b21eb3e52575dd6b4bf2f451abb4906071b66e79df3697a56345e178f6b9bb11a7bd19283adb47a6b5e9c1dd807775ac2c814f0e2db795788fd1159
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
-DIST xfsprogs-4.12.0.tar.xz 1128400 BLAKE2B 9e9c172bbe377106213e10d574857639c2ea49f5cac3d4c6c9480c6d8ef5d33cf3640ad12e0c3a83471b85f03bba4d48e582cbfe34c98d4b56229ce85750f615 SHA512 1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a
-DIST xfsprogs-4.13.1.tar.xz 1133556 BLAKE2B 9a829a0656d6d69d25094b8177957dd9ac3aecb5f50fd6997e13b7131a15cea4ccb52c0ff7d977a5284df5fa0d63fd8f0db6315e14ead883c92143fda71575a5 SHA512 6c234a6c22aa3cabe0ea698c11175dca6c19d803989127ccb13b526ff6d34dcef9dd6e19ff0c4fb3903078f24210a8cfcd0508dac29d52fbee4dfed37d5888f3
 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
-DIST xfsprogs-4.5.0.tar.gz 1524382 BLAKE2B 7ff26e6c61081db37c4fb4a15abdeb3ece2c6cea4980f3c43e488a8c5c4b54f6369ab191635d40031161456380e347a2a3f807e1992806499f3cab1ebbefc88d SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
-EBUILD xfsprogs-4.12.0.ebuild 2733 BLAKE2B 91254ce021009746a40486f0e2d4697b4b5ee8440b25cb9b0f4ee7166acc9a6a110211268b7485cbfa77bcf8e9f214eb2dad26bb5bd51294ff2ae324109068d2 SHA512 b163f664b954fd6ace1e3ce1ad352deab0a10050c8b0b96dba8446cd4d9cbddb31c6c043ce7bffe86975606682e6e268f0efedda544c107284c92e7b4014d63d
-EBUILD xfsprogs-4.13.1.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
 EBUILD xfsprogs-4.14.0.ebuild 2662 BLAKE2B e798156785443f5a6b5e283670b3300c84a5189b0204e79cddda32a80e0ee2b0b56e1b591136d5dd2c95240453b9c10f6ff07f970c6d847fc7086597124b8da9 SHA512 7d464a2c5446917aabe9d8f50a60dc43ff6e92bde11999dbd24cbb87f8d90140b60a21a24f26b40fbe6d59c1c1d628591fc7840fc4b903e57bb4e4fdcb0e08a6
-EBUILD xfsprogs-4.5.0.ebuild 2876 BLAKE2B dc897627ade02ec497d20fd761c102737b1fce4cbd62b252ca1a4fd06ae393b87d67c78584c4af8d4c5f3f958e84ee69e808bf46fa7ac29fbe08db0cd03b6af5 SHA512 2b40573bc0cb60c3b2d6e77c1b1b064856cee0e394b371622da66e12c11792b1b48e6ab8615679b18afef3f17a7264680c9787d1fbb243c012ea837c3463a946
-EBUILD xfsprogs-4.9.0.ebuild 2715 BLAKE2B 11f3355289c0801b61a914527182d3488d5d5eb9aef53ce1433db3f3ea7c379b960d1fe7ffea06694dc18bc68ee1b87905b34a3efaf79d41432a7a590818bc2a SHA512 ca6f97b41217d7d1e238d366811c77b2fbf5a43e99c79805999ba25f955e6a76290dedd95a93242777e44410ed07d0ebc1810f40771a43fdffbe90f283e90bf2
+EBUILD xfsprogs-4.9.0.ebuild 2717 BLAKE2B f24db0e5c16988192a849e6d42a143e103adb7569dba8a96cb5c6ac08d97663f9259c5b31073f2940b9a2e971c850b7ca200945f1bbd86f879a7a26d2e11f30b SHA512 b604adb4f3e3cbdf8e35d44d53e1c24d6be61552e0f4c14762d2f9f706d33a29226cbd30b11079faa2ecbea35ed85b45fe7908c2f0c9886dd698e2e607ddfe6a
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
deleted file mode 100644
index efc57e4f693d..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001
-From: "Darrick J. Wong" <darrick.wong@oracle.com>
-Date: Tue, 25 Jul 2017 13:45:01 -0500
-Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when
- metadumping to stdout"), we solved the problem of xfs_db printfs ending up in
- the metadump stream by reassigning stdout for the duration of a stdout
- metadump.  Unfortunately, musl doesn't allow stdout to be reassigned (in
- their view "extern FILE *stdout" means "extern FILE * const stdout"), so we
- abandon the old approach in favor of playing games with dup() to switch the
- raw file descriptors.
-
-While we're at it, fix a regression where an unconverted outf test
-allows progress info to end up in the metadump stream.
-
-Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
----
- db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 36 insertions(+), 11 deletions(-)
-
-diff --git a/db/metadump.c b/db/metadump.c
-index 96641e0..4e2f648 100644
---- a/db/metadump.c
-+++ b/db/metadump.c
-@@ -78,6 +78,7 @@ static int		obfuscate = 1;
- static int		zero_stale_data = 1;
- static int		show_warnings = 0;
- static int		progress_since_warning = 0;
-+static bool		stdout_metadump;
- 
- void
- metadump_init(void)
-@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...)
- 	va_end(ap);
- 	buf[sizeof(buf)-1] = '\0';
- 
--	f = (outf == stdout) ? stderr : stdout;
-+	f = stdout_metadump ? stderr : stdout;
- 	fprintf(f, "\r%-59s", buf);
- 	fflush(f);
- 	progress_since_warning = 1;
-@@ -2750,7 +2751,8 @@ metadump_f(
- 	xfs_agnumber_t	agno;
- 	int		c;
- 	int		start_iocur_sp;
--	bool		stdout_metadump = false;
-+	int		outfd = -1;
-+	int		ret;
- 	char		*p;
- 
- 	exitcode = 1;
-@@ -2870,16 +2872,35 @@ metadump_f(
- 		 * metadump operation so that dbprintf and other messages
- 		 * are sent to the console instead of polluting the
- 		 * metadump stream.
-+		 *
-+		 * We get to do this the hard way because musl doesn't
-+		 * allow reassignment of stdout.
- 		 */
--		outf = stdout;
--		stdout = stderr;
-+		fflush(stdout);
-+		outfd = dup(STDOUT_FILENO);
-+		if (outfd < 0) {
-+			perror("opening dump stream");
-+			goto out;
-+		}
-+		ret = dup2(STDERR_FILENO, STDOUT_FILENO);
-+		if (ret < 0) {
-+			perror("redirecting stdout");
-+			close(outfd);
-+			goto out;
-+		}
-+		outf = fdopen(outfd, "a");
-+		if (outf == NULL) {
-+			fprintf(stderr, "cannot create dump stream\n");
-+			dup2(outfd, 1);
-+			close(outfd);
-+			goto out;
-+		}
- 		stdout_metadump = true;
- 	} else {
- 		outf = fopen(argv[optind], "wb");
- 		if (outf == NULL) {
- 			print_warning("cannot create dump file");
--			free(metablock);
--			return 0;
-+			goto out;
- 		}
- 	}
- 
-@@ -2907,15 +2928,19 @@ metadump_f(
- 	if (progress_since_warning)
- 		fputc('\n', stdout_metadump ? stderr : stdout);
- 
--	if (stdout_metadump)
--		stdout = outf;
--	else
--		fclose(outf);
-+	if (stdout_metadump) {
-+		fflush(outf);
-+		fflush(stdout);
-+		ret = dup2(outfd, STDOUT_FILENO);
-+		if (ret < 0)
-+			perror("un-redirecting stdout");
-+	}
-+	fclose(outf);
- 
- 	/* cleanup iocur stack */
- 	while (iocur_sp > start_iocur_sp)
- 		pop_cur();
--
-+out:
- 	free(metablock);
- 
- 	return 0;
--- 
-2.13.3
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
deleted file mode 100644
index c54566451a9e..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 1a366eedc0eb4da46da48e9f6e2da27c7b5d2076 Mon Sep 17 00:00:00 2001
-From: Gwendal Grignou <gwendal@chromium.org>
-Date: Fri, 3 Jun 2016 09:17:28 -0700
-Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment.
-
-Without this patch, we are using the same compiler and options for the host
-compiler (BUILD_CC) and the target compiler (CC), and we would get error
-messages at compilation:
-x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ...
-x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option
-'-mfpu=neon'
-'-mfloat-abi=hard'
-'-clang-syntax'
-'-mfpu=neon'
-'-mfloat-abi=hard'
-'-clang-syntax'
-
-Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up
-from the ebuild.
-
-Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
----
- configure            | 26 +++++++++++++++++++++-----
- configure.ac         | 20 +++++++++++++++-----
- include/builddefs.in |  6 ++++--
- libxfs/Makefile      |  4 ++--
- 4 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/configure b/configure
-index 325081f..863a447 100755
---- a/configure
-+++ b/configure
-@@ -700,6 +700,7 @@ libreadline
- enable_blkid
- enable_gettext
- enable_shared
-+BUILD_CFLAGS
- BUILD_CC
- CPP
- LT_SYS_LIBRARY_PATH
-@@ -806,7 +807,9 @@ LDFLAGS
- LIBS
- CPPFLAGS
- LT_SYS_LIBRARY_PATH
--CPP'
-+CPP
-+BUILD_CC
-+BUILD_CFLAGS'
- 
- 
- # Initialize some variables set by options.
-@@ -1456,6 +1459,9 @@ Some influential environment variables:
-   LT_SYS_LIBRARY_PATH
-               User-defined run-time library search path.
-   CPP         C preprocessor
-+  BUILD_CC    C compiler for build tools
-+  BUILD_CFLAGS
-+              C compiler flags for build tools
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--if test $cross_compiling = no; then
--  BUILD_CC="$CC"
- 
--else
--  for ac_prog in gcc cc
-+if test "${BUILD_CC+set}" != "set"; then
-+  if test $cross_compiling = no; then
-+    BUILD_CC="$CC"
-+  else
-+    for ac_prog in gcc cc
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -12003,6 +12010,15 @@ fi
-   test -n "$BUILD_CC" && break
- done
- 
-+  fi
-+fi
-+
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+  if test $cross_compiling = no; then
-+    BUILD_CFLAGS="$CFLAGS"
-+  else
-+    BUILD_CFLAGS="-g -O2"
-+  fi
- fi
- 
- # Check whether --enable-shared was given.
-diff --git a/configure.ac b/configure.ac
-index d44438f..fc286b3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr)
- AC_PROG_LIBTOOL
- 
- AC_PROG_CC
--if test $cross_compiling = no; then
--  BUILD_CC="$CC"
--  AC_SUBST(BUILD_CC)
--else
--  AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
-+if test "${BUILD_CC+set}" != "set"; then
-+  if test $cross_compiling = no; then
-+    BUILD_CC="$CC"
-+  else
-+    AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+  fi
-+fi
-+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+  if test $cross_compiling = no; then
-+    BUILD_CFLAGS="$CFLAGS"
-+  else
-+    BUILD_CFLAGS="-g -O2"
-+  fi
- fi
- 
- AC_ARG_ENABLE(shared,
-diff --git a/include/builddefs.in b/include/builddefs.in
-index c2ca4cb..9ca57a6 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
- LTLDFLAGS = @LDFLAGS@
- CFLAGS = @CFLAGS@
-+BUILD_CFLAGS = @BUILD_CFLAGS@
- 
- LIBRT = @librt@
- LIBUUID = @libuuid@
-@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID
- endif
- 
- 
--GCFLAGS = $(OPTIMIZER) $(DEBUG) \
-+GCFLAGS = $(DEBUG) \
- 	  -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
- 	  -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
- 
-@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes)
- GCFLAGS += -DENABLE_GETTEXT
- endif
- 
-+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
- # First, Global, Platform, Local CFLAGS
--CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
-+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
- 
- include $(TOPDIR)/include/buildmacros
- 
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 873d4ec..8d728c0 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY)
- 
- crc32table.h: gen_crc32table.c
- 	@echo "    [CC]     gen_crc32table"
--	$(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
-+	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
- 	@echo "    [GENERATE] $@"
- 	$(Q) ./gen_crc32table > crc32table.h
- 
-@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
- # disk.
- crc32selftest: gen_crc32table.c crc32table.h crc32.c
- 	@echo "    [TEST]    CRC32"
--	$(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
-+	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
- 	$(Q) ./$@
- 
- # set up include/xfs header directory
--- 
-2.8.0.rc3.226.g39d4020
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
deleted file mode 100644
index a39af0d8cb43..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- xfsprogs-4.3.0/include/buildmacros
-+++ xfsprogs-4.3.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
--	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.3.0/libxcmd/Makefile
-+++ xfsprogs-4.3.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.3.0/libxfs/Makefile
-+++ xfsprogs-4.3.0/libxfs/Makefile
-@@ -138,6 +138,7 @@
- 
- install-dev: install
- 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+	$(INSTALL_LTLIB_DEV)
- 
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.3.0/libxlog/Makefile
-+++ xfsprogs-4.3.0/libxlog/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
-@@ -19,6 +21,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.3.0/Makefile
-+++ xfsprogs-4.3.0/Makefile
-@@ -82,6 +82,8 @@
- quota: libxcmd
- repair: libxlog
- copy: libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch b/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
deleted file mode 100644
index 9912e49ebf84..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2212e8bb59e7c3930d49da2ec5f4f0a9ceb086c7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 8 Apr 2016 16:41:31 -0400
-Subject: [PATCH] po: respect LINGUAS build setting
-
-It is common gettext practice to limit the translations a particular
-package will include by setting the LINGUAS environment variable.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- po/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/po/Makefile b/po/Makefile
-index edf92ad..a5250b3 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -6,7 +6,10 @@ TOPDIR = ..
- include $(TOPDIR)/include/builddefs
- 
- POTHEAD = $(PKG_NAME).pot
--LINGUAS = de pl
-+# If the user has requested a specific set of translations, only build those.
-+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
-+LINGUAS ?= $(SUPPORTED_LINGUAS)
-+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
- LSRCFILES = $(LINGUAS:%=%.po)
- LDIRT = $(POTHEAD)
- 
--- 
-2.7.4
-
diff --git a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
deleted file mode 100644
index 4736e0b82b64..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.12.0-fix_musl.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
-		include/builddefs.in || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
deleted file mode 100644
index a77ca48cb15d..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
-		include/builddefs.in || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf=(
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
-
-	econf "${myconf[@]}"
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
deleted file mode 100644
index 3f9a00c49a14..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.5.0-linguas.patch
-	"${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
-		include/builddefs.in || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
-
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 0d581fec662b..4dca309b8b99 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="xfs filesystem utilities"
 HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 4d05c422a7f9..655e99f514cb 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 4af2c13da3ce..4d014067881b 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -11,5 +11,5 @@ DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4
 EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd663885396fe1d8c849977d4792e0f82ae4db517cc28aa1f676726f843a74cbdaead75305543bac19d99c2afe4cd74f73 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067
 EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a5388ada4c5359dd21c6e21abd2beebf194b7d5890c6f96016e15928118b88603e56bf4a81fe82ce09f5d33534bf5 SHA512 65f4f7193a6eb32c81cf57ac8d37c7a82ad2fe0bb580f5dc65c168b02a41f4cea29b81f6432f760bf59decdde501800d7a573dd6a5c021834896e911035f5ebd
 EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26
-EBUILD dracut-046-r1.ebuild 4810 BLAKE2B 3ca2824cde954c150e7ffa44ecaefb45e9f89400bafeaccc355949ffae4da4a3f044116fca4c79795d53021ffc70326f0874e1510127de45159106362ec195ae SHA512 b70ffa92394934a105fd82dc84b4220d437032a665b0d2561bb2c7943b2bc55fdaa5ac573a2d026894913a6dea75ab326f9413e0eabfe8c73b4f87d33b836c28
+EBUILD dracut-046-r1.ebuild 4809 BLAKE2B c3ade9ab83eb45a34a5d7a843a92e7facd961cfcff151fe148688dd778a3512fcb214055cfc043dddda4fa1ccc3428434fec36390ba0983db6edc39eda6c3b7c SHA512 90eb901a2ab3a05bfd3e1be8ff0b48177b7dc46bcc21bf0ac798856e288172fc5a2205c512d68fd9c4ed7d173712c7ca2d7190888911c6542fc90d8ed8ef6690
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
index 174e2fb68266..74b47ce9ebbe 100644
--- a/sys-kernel/dracut/dracut-046-r1.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org"
 SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="debug selinux"
 
 RESTRICT="test"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index c8833e52096a..17a0138d3f9b 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -43,6 +43,9 @@ DIST genpatches-4.14-18.extras.tar.xz 17500 BLAKE2B c858ab443c96384fed01154b3665
 DIST genpatches-4.14-19.base.tar.xz 452160 BLAKE2B 17ea7d41932b27feb9d83d7f7e620ba681b7051d25d32ff8dc6fbaac3642473737c89ffe33564c0a5bf2cfa15ffea31fe1abd4748874a6db53bf2a6f3b457693 SHA512 7263397dbbcc508ba4242c48ad470cf34ff94e69c143cd0f0f1142a7f07dd44517620c19fcdfb6e239091c112a877c5abec5f6b4ddeb668d4054ed7204838126
 DIST genpatches-4.14-19.experimental.tar.xz 5180 BLAKE2B 5f38d5116ca27f91d4e370d5bd78efc1dc85a715cb8329cc0d19e762b6ae395b7e261b1835d5c3c69ff10457ea69ca0fe2b993c1d5ae0c161f47ec1686af998b SHA512 d60a0ed5bdb7dcd92a7e99d507d9cdd45443ac0b3e2b6cfd16d31d192120a1a8a32215041ca040ca2838978ec6ca6a8f309859a2519fd2fe305d49d1761a177b
 DIST genpatches-4.14-19.extras.tar.xz 17480 BLAKE2B e214124df420df163c22a8d904a7fff2f1b672e1f86bc259d8ddebfc374489789fa547e4bdaacc80eac2080106c84a56fbb0a418fbcebc5266a5d9b1b4f711ea SHA512 8e06e3e692c575e08c5ab8e9f3883e7f82b436cc3d2cdcb79b0e10689acb621f58a33ca7ad582fa6f14fc8545343a7d04219a845dfbb249539d10dddbde5b8be
+DIST genpatches-4.14-20.base.tar.xz 480536 BLAKE2B de076ea8dfcec740a606a347c1ea52d723ed1d80cccc9156bc31cbda4814af03bf7c6711f01e479bb2c88a37f83fc53db17700c6e2f1d79f3fde8ca5f0f8f1aa SHA512 5744952e167b94607690e83ccad17a0851763647365d16811f6cc59f64020da3c19436f58c1bb19e3790baa082eaedad2826d04a9da9cf340d89ad7b3064fafb
+DIST genpatches-4.14-20.experimental.tar.xz 5180 BLAKE2B d8482323b0d5ef996d3e6830ff6e88c6d1e19f722108affbceab8bbc032e64363a4c9f470ed64a353bbacb1dd08dee007634e868f072f2329f2e2c612e84e2ec SHA512 5187fcf6b730ee81e3afba9caa1b8f3c8873c5e59243f4b5006fb3f5b821577425b04cef90658be77cad7ca60bc8e1c56ec39e271f9b543e9e63b93994475f63
+DIST genpatches-4.14-20.extras.tar.xz 17492 BLAKE2B 9540c0fbc4c6f824a235fe80a3ba3ccdbd274eaf65db74d748057da8146004f0391a8fef75bc2a0ae79d17535320840e5bee91afef4b567e0c972952a20f1482 SHA512 12e435f75c8907c985bcce2bc5b572385e905a8970712f53e85616c3b61a9c4f1567a4b7662758c537a2f533078a2dbb7f723b96c5bc9b61931d644d04833032
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -73,6 +76,9 @@ DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787
 DIST genpatches-4.4-116.base.tar.xz 1719772 BLAKE2B 163d9b1341012e443264a43a9030e70e4aebdcc871f44c8eae0b2e956712c302ca0c00682d3299f55d7c34148d62323bb6919cc3bd72a130798f984bcedcf94f SHA512 077f7c50b7e01e3f5e4b0fda0d377547f27b000ee84f8d66cc92e990441ecce603bded93e1d40c7cead49f4fd0325d6a055d017898fe8b07dff608c5dbeb6924
 DIST genpatches-4.4-116.experimental.tar.xz 87796 BLAKE2B 119464d5722a2173d694b4f502a086778e44aad495121b4e7e68c113ba0603fd28a5d6e90b0c311c1d35ea668aabeae8828c3093fac3899e122a206815b8c6e7 SHA512 3643dc9b48d4ed2dbc6ed6ae9c56b830a66a5c22e7e9676e7b807e297e78c5ee92c726342e004b1a140518c897cdc7d430bfea40c7d789317666dada3fff2582
 DIST genpatches-4.4-116.extras.tar.xz 16452 BLAKE2B 6a7b47b5d1f1b281c8b2bee1b9c4ba8b58c23d460613c0585157903aa502322210fc206abb003c3cdc2b17dc2c5b8c24dc8e0fb257df67fa7403c0499fd34910 SHA512 c1a4b08388c907faf7a49112095d5420991750bb725d459fe3d77074806a93bbfa2ab668e4f5ff661c469e5b63ee755fd2912c4af3514a9e39e1002a4763bb7b
+DIST genpatches-4.4-117.base.tar.xz 1734428 BLAKE2B f7d891e1d0e5d9273d495ad42b1cdb72730d56ee1a572e44abd35a62f38b71aa8b78adfaa1537636bf0ce73e634f56d419856805498168b85c0fa40ac97a7b00 SHA512 a351549239b85ccf432832d1fabd2be2403096b41eb8ed1dd21d92246c24ae7d0ec6f70570348ec61e01533105664d0f9d85b9e74d317bc368e72c4ef73ed412
+DIST genpatches-4.4-117.experimental.tar.xz 87768 BLAKE2B ddcc6fdcfd688f957ac8e144739910fcb2c27c1d81ad2c7266878f559166baf5bdea28ee39a9d4e89907e3384028cee7b29cc5d72ab996574a18a9c8c6695f69 SHA512 0daee9a3eb93beefcd86d5c5140a18c1f9101dd12946e60be61e53f8eee17b2d30262df5c9e2a6615ab7574092741f3833351a865f842e4d2d2a88d32b7450e6
+DIST genpatches-4.4-117.extras.tar.xz 16452 BLAKE2B 9e482d457abb019663d022a8c2971883a1b90b0c155e6bd54ad99f85909d3f19d7476b7dd69543cb820290e59c72780f33b51b863a32987713fb70feaf03b2d8 SHA512 d27658290e685637a6afc2c6bd85fe872c10a75bc9fcf34ea288b66d9c7dee14d7b997b75530f292c799ebefd168c5e54a2447f60ab9c46c39b59c83a79abdf6
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -115,6 +121,9 @@ DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a9
 DIST genpatches-4.9-80.base.tar.xz 1472296 BLAKE2B 3d5a961e2b84d71df250078e223ebe7a7c3cd05093d22219813454664d3c7bd85fb332d26c0d212144a6d50607256ce4e739f35faf935b323d533de452e46ca5 SHA512 9e7b5418ffbe7515573381d054accb89fd5bef83748b21ac1cd5f2352dbbeb1f55c606eec45174ed093289098420d9c1f780b182be1650f4963499cce310e3e7
 DIST genpatches-4.9-80.experimental.tar.xz 106456 BLAKE2B 4399562800f6224722105166d24075fb53237b6eab5728b20ff368fa6080ee1d8f6845b5835adec64d5a3583bdf063e8970ff1c9f61b989de474ece88fa9d318 SHA512 03fca9e1bfbf504bc3b42cac4626701aefb36f1f8f0a10d5b7f428aa1244030f50ffc6e24101afc1a6c16d741eb56f44d33c6a2293910a13c97a97f7fb061650
 DIST genpatches-4.9-80.extras.tar.xz 17352 BLAKE2B 8e3043af0e0ccddb209bcce022cd5ddb4ca681b4c0dbdd6a3fb8767b6154ba716fadc137059a845f93a20dcfdb35b3520e6fe67a6fbf5d9018ff1d72368a2358 SHA512 5049f111e3a5ed50f150ab9e257df362f91758424f151ef4ca86c69d6382231b4b2d31262bb331dbe99e4f7c8fe8eede134f0e6dec7e13fbdedfe504f9f73488
+DIST genpatches-4.9-81.base.tar.xz 1485156 BLAKE2B 552c163be8839e6d8cf086a11b8ec8e4ea7fa89ac420c51df02fd52dcfd91008698389282b7d4f4a631ed66c30428d1c37f7ce63d0906734ee04f9a9817c4d97 SHA512 45890146343db03df4fbb51d2121a86be4c7904999d037e4852346f5db7ce5f9daa4e3fda405f21dc6df3dea8a4d3d295416162afd27344454d2022f9804872b
+DIST genpatches-4.9-81.experimental.tar.xz 106400 BLAKE2B 5b542d87b2e47c6ec666756295472aa03c8ef3a1adb28a6433c0b74ee24c32321a0980736390dbe264b2046cfaf4b04499ef940714e3ddc1fd82add51ae6fccc SHA512 e19b574b87de3735bcc03aa89e83b285913e701788ba9baed27a3a86bac119b554a65995b46f78a445767daabc269bc61b3f76880071adb3a36630f2295b795c
+DIST genpatches-4.9-81.extras.tar.xz 17356 BLAKE2B 3e26281722b92a9720a04bdc35910e558adfdb2094f908174a209d04b50fd4859bc60a6fc19b808ae85f103d7961183e74f2cc9419140a9683e78692dc040962 SHA512 37fe1b24e66825c1b63e5f78ec798dfd3350690250ba356a4c0abd3f395bdeb97604c94f90ba3934a9303adf6e983ce0739ee58dece40f1db9790ab900755ff0
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
@@ -133,6 +142,7 @@ EBUILD gentoo-sources-4.14.11.ebuild 742 BLAKE2B 758990368d1b70dc99338f90b7773a5
 EBUILD gentoo-sources-4.14.12.ebuild 742 BLAKE2B 58861d838c385bdce69f2b373a932d28823020b2208b034ec57d49c88ba74c6a61df046b948d428849daef152e4b39d150ea17eca788000a86f9cb40eea06f2e SHA512 67f2967d872499bfbd7f07685f7230e2c304eee168c5f3ce3684aca478498f7a6d698aae235f11f85944cb8137fc847b367e00c1eb0e781919335ccc4c5f17af
 EBUILD gentoo-sources-4.14.13.ebuild 742 BLAKE2B 79defa786bd57b36c14f7ceb99da40240e55d8da85ad615dfc86d2790fd66d9904b2d9563ed743c70891a72afc0492a1cbc41e7df539e76ab5058cab5e980010 SHA512 1a95e26e2ba26de63b604f0891c4649ea0a929dabc93006592f1388dfe94af90465d0563ee517146dc52b35fcb4dfea0c2e0ade39f8ba6bf0c1eaf1721e79f5d
 EBUILD gentoo-sources-4.14.14.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
+EBUILD gentoo-sources-4.14.15.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
 EBUILD gentoo-sources-4.14.8-r1.ebuild 742 BLAKE2B 493b800cb7fdd217c141aa2d94f6af21d83aa2c19e8cc76613ebda470b115218504e1faa487260aa3ec5798df2dbd15d37fc88112ff8411676f3b57d177a3bff SHA512 d6dada25484f8dba5a772a51d3073224f3e8e4ef72eff9a365c900ae574181e21ee7035c812e068158cbc5916abc874864809973a8435afbf8b2b88c4a939a0a
 EBUILD gentoo-sources-4.14.9.ebuild 742 BLAKE2B 2ec59b4a79db4d5e94b268a5d8888f54fd6a5ee61d146c9fd7553dff8d6443609cb198cff98fec615e7b2ec5a535a22765c3b328adf923cde7e03e5da36fc434 SHA512 d488ac5b60c05c266d1e4c911b6ca341dc024f087ef3896576648f6488fb810733e3693814871d15331b4cf9e7d62da47b3b8456e4fac4a6c6f03ba247bae4ab
 EBUILD gentoo-sources-4.4.104.ebuild 743 BLAKE2B 802e40cca68ffd0a60e89b78472150c9607d1536a24da4ce8b6931e05fbaa630dfb5e30d1f3b49fd8a94c7d33fb9489f377bd96de471712d16450ec4d704de7a SHA512 55a5c40f01ceeced4a226f18e7e30bfed7a0e8fe684d3d1f3e8ab66a3509ff3c4fc128e4d0b551a5f1efff44e95f1e5a19db3d4ca4d567499b2e1b6951e36c21
@@ -145,6 +155,7 @@ EBUILD gentoo-sources-4.4.110.ebuild 743 BLAKE2B b97cdb80532d857229893737c3897de
 EBUILD gentoo-sources-4.4.111-r1.ebuild 740 BLAKE2B 09de9738648759b590d68006c5a7a257b4e12ced99882305674a0bb364403bdc9f1be22816b3e61972a5daa5212cc7728c347d1d41b3422fd1a7d7f29b370fd7 SHA512 fda1c3d4f9ea9b6712e182878239262dbba76f3ec15058d19ca5f48430302452e3e752b6c349e0837c1b0be4d5845f0ec3032d4f01c8e392487f97f1873b8260
 EBUILD gentoo-sources-4.4.111.ebuild 741 BLAKE2B 028cce31f7f50089d7db9cb7dca2bebce722561ebdf66db4bd6ac30ab45003ff69cd15cb8fc2f7dc88ba727de627a3806ab995463888ad9fb415a51756152bd7 SHA512 3224d48de5ca7c51e339496d642271980cf1c994ddcf76f71e688ecc795aa5a5bb16b133cf3146df5b0828ad7682bd905dc6ea9d70c4fa678b8c9cac272fdfea
 EBUILD gentoo-sources-4.4.112.ebuild 743 BLAKE2B 813f94f002876e7cae223a0cdae8f9e2f735a6865c219883fdd2bb3d364b22403c8b14f0f07c43b47964c08bce561201f91440973d11c62ac08c951702d751a8 SHA512 d064a2e5d9d22545246cdca70e2f4e22ef6b1725c6236a69936e18746ce45ea1305cba44fe927a1db74713fa76787399b77d262036084c08e43b6821d0865f69
+EBUILD gentoo-sources-4.4.113.ebuild 743 BLAKE2B 6c31cc1269e4a32bc808657758e7e8ffe86bf93047a07fe8d606733b957e3b9e2384bcb52a27b11cee6bc798197e5827c4e4e6255eb8afd0089994d44e3312b9 SHA512 d42207f49e8763bea3d46fb1baadae30267896d0b725ea448971b92744d782fc27a7e19f258ed0a17510c16c47978676d632a8bbf66244022f21b63c56858ea5
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -159,4 +170,5 @@ EBUILD gentoo-sources-4.9.75.ebuild 742 BLAKE2B bc74daa96072fba3bdc880132b8c3ee0
 EBUILD gentoo-sources-4.9.76-r1.ebuild 738 BLAKE2B 1ca2fe48f4b065e44a59c5fb9ac2b8d83e714dc6eece310fd7565ee07636f584a6c7b544806868c289348cd3bd345363c04e1f70b4d2f65a7d6448ca72f3c47e SHA512 c0652cfc3af5b1373d1a294e19813a4b4ae7f7206c603d373a6668f32a8d772dc990d29be5b7b9ab5577450b2f299e6bcdc14f77be273e93a33ddd59e415cde6
 EBUILD gentoo-sources-4.9.76.ebuild 741 BLAKE2B 4ceda6a592c887c09173d606b2af6abd55a4a12971f5c0492ebf69956e9f9c7efb8f58c7621adc2f9860a04ed238703a634f2d571ec15348c7bbdfbfe5f0c143 SHA512 4104af66eff2c6142fd3316803fc51fd7b736ac1f2de5ef6fe158c946ea3bab5b8030739e332670c53dc8b47ebb0478d020c69070d8acf88de7f46969fe0b28e
 EBUILD gentoo-sources-4.9.77.ebuild 742 BLAKE2B 704f24883b5dad9bb1ffed3c6ed0467c95c4120fdbcef843f9d6e99df3f3da709c0e2e2fe6a2da60cd0c98ffcc6d18f9f62b1e7937a624325b524eed1af3218c SHA512 410e8917baaab9458edecf5f89c83ee8f12dc7687e53cb2ce5d40ea7956f251f1a76fed5f35d00cea1410ce7038b16159e94c3f3215e17342020cea1fec10ae7
+EBUILD gentoo-sources-4.9.78.ebuild 742 BLAKE2B ec4a48c6993642d9b6979c924b7aa9961f8476ad5b104888c85c2d196dea26b89811abec09cce695767aaded850a65449b78134a57d282d0f663259f13e0b7be SHA512 5869154cd2e4ead0e92ec29020f19231ab6d39c568900bca8c7147bb805f72b60822c3051307db9e109a8db9ad0cda86f5abbcc61a2f79ed50d071924399a3d3
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.15.ebuild
new file mode 100644
index 000000000000..6e68168d8f5e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="20"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.113.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.113.ebuild
new file mode 100644
index 000000000000..2cf5321e5659
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.113.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="117"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.78.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.78.ebuild
new file mode 100644
index 000000000000..e2e79ba29d30
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.78.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="81"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 5ace3dc5eb2b..571417ca6de0 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -7,6 +7,7 @@ DIST patch-4.15-rc5.patch 45928364 BLAKE2B 0e798993916680abae0ec40c4bc3128b4b79f
 DIST patch-4.15-rc6.patch 46146258 BLAKE2B 7a71a6e995aaa104012bb8f2a6e728658a2961d511d5302e7c3de182ae104ea8eafbce2a7b3c7a342ae84cbdee26cf9306fe231b9b92268cc8ed3d7cf562f3f6 SHA512 b68965ef7b78ed9a0547d3a00432b0afaa8441a77412026c84d9b91b751f62d54cb263ec0ffc3547196038f0fe39bdcdfd1e7535776dc8f7a139528ea8ce3dcc
 DIST patch-4.15-rc7.patch 46244792 BLAKE2B 80731383db15ebc6aac897b97fe1602ab161f04ca1f3811b47e699d5d50c5e96281672261770c0e8a80f3c0111f6b210104bc67478ccc00cb658cd7d42fb396b SHA512 fae57a83355d3ee0d1b3f07c1af89036f97cb22ab2135a5b57299efb451f3ef91dd8e3822928fb3ad44271508a1ea355771b0e9416d41d25c3888a5074281ade
 DIST patch-4.15-rc8.patch 46486932 BLAKE2B 783cc4fa216d7591a7cf0713cb1aa285017f382c1f6f8c5ebb5a98a5627080854b0f081f7a4417d650c0591ef1878047ebc54cc8ce04763214e861abb74c343d SHA512 30fdd6ad1174f8e3e2b58b80c2796cda502a24153fbdd8852defac552800b4f7baf66c840ec5c3ef4095391b89e6a700e9e5f88e67a2663db4544ac986c2142c
+DIST patch-4.15-rc9.patch 46706278 BLAKE2B 67552561e9a9e4d8bd6e878f3779319414abdc587140d31388eace7d43f955982f1a49cc36948d5b67f3379d8e13e6a8237d2f3c714860d32f042f01a0c53f5f SHA512 2d54f54d2a7b8586f3d5e3f2fef7768a7c10440c5394c14d397fc6686c56d028c7a5a81bf0e4e5a89f41b7d7124c69d983f7d972accd1e7c18b3505a579e80a8
 EBUILD git-sources-4.15_rc1.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc2.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc3.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
@@ -15,4 +16,5 @@ EBUILD git-sources-4.15_rc5.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948
 EBUILD git-sources-4.15_rc6.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
 EBUILD git-sources-4.15_rc7.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
 EBUILD git-sources-4.15_rc8.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
+EBUILD git-sources-4.15_rc9.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
 MISC metadata.xml 647 BLAKE2B 49e79ab62f697fd3e7dcdc63376cc3412f8d91afe7a6219a2402551ce48b67ca5b707a501ee4401437d44dd3b7ee77b861fb3a5d0d55d766e2b9734697f3cff0 SHA512 4a673cd7f8ca3ee46bbf065d87337efa6ee77218781f25ce8b3924b9a90ca3cf10435b6f667d49ad16ba50662f82d107696622b3e55c707d56689ae0c5d2eda9
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild
new file mode 100644
index 000000000000..b525f064fb5d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.14"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index d2ed59d1ce6a..d0a964cfc858 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,10 +1,9 @@
 DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
-DIST linux-firmware-20171206.tar.gz 122782333 BLAKE2B f80f810c5544f3e7627fbfd70fdf9c725be710e1783d21e023e3d45e272a4c4521ccc12d406e204174fe10edeec7a1d06f56b09396c7952e00fb14e08b3fe3ef SHA512 1c0db1802732579c7923f0afaf0690db70f0925138ee1ea1a0eaff7f933a15fdc7d2fb3581e74883c01a75d16a285dc5467fabc7570cb378c0fa108426e7dc0f
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
+DIST linux-firmware-20180119.tar.gz 138505266 BLAKE2B d97f8d674b73f487cc90d4ad1f82c45967953bb5fd5241b7f552908efe39a3fe5890ab02b4826df9269bc7abd3dabd2ccf81542af11c97ae50335dc97c70b4ff SHA512 4378d6f9a80cc6c5f6b387b321794bb2a1c7931aebc90d134858ce59d83428d684ff22587efd234e9b30e6d71f672f9e04a92fa0b2c21605912e5ec72252be12
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
-EBUILD linux-firmware-20171206.ebuild 3292 BLAKE2B 456e5bcf89e1c7aad7db0b7db03f5c9d6fd5b70377dd4fb05a2d790e6bb16474f48500b1786f44bbab00c6144b5f251a7f72af4cdc905b14a6e0e2a9eeea921a SHA512 228744b704e482d1389bb4ff56db95c397a213eb93952032c8d504072a68adf68d8a5864381240f9ad436c29c1cac82fd177f48556682ec99b59a61016976044
 EBUILD linux-firmware-20180103-r1.ebuild 3501 BLAKE2B f6dae34d64343fbf98ee5128ce1b1eecc29425ed74254129fa0d69f15f9b8053402811c4e0f298bf3c4a6503701261f46a7ba1575a9077f16dc92cd8b6259424 SHA512 5700810ed30e5625c0de31cc3f01fbd2a221294390799bd29acca706706cbdcfda4e73b80207c4b6726f299d59edb78da2472a6bf988b352fafebc32596cb6aa
-EBUILD linux-firmware-20180103.ebuild 3292 BLAKE2B fdc9d0a0dbeeb9a5b22c69d1bce7bef97af6eaa012430afdb9ddfc8e491cd520bb8d7ab542f97bc1dff5ec0237a47568eb6225e1f876ec8d768a0a569f0f66f8 SHA512 b2f6fa573c116e0f9514fecff7acc2ad95ca7e81bcbb1ccc6bb8f08ebaae34ad5aba8c264300e65444f6c3d9e3d93e4febc2d9b3585b70565fcb7c2c4a23ce7e
+EBUILD linux-firmware-20180119.ebuild 3513 BLAKE2B c17a31ec4545214d6b508437d53f0aa0854f1f63b1a0ff15f210574c73460e5c6f762349294744705be76ba612d78f008213e09f2d9cc8be4112ce9968f383f4 SHA512 40180d26d2f65158f1422641484a56ec0cb11a90bc18dc0e40b35f0b9f71d9695a3f1478627ecf683547efeef324e85390085f65cb2d36c01f094895ba9cbd3f
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20171206.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171206.ebuild
deleted file mode 100644
index 046d9c1e0eed..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20171206.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	GIT_COMMIT="7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-		!sys-firmware/alsa-firmware[alsa_cards_sb16]
-		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!<sys-firmware/ivtv-firmware-20080701-r1
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/libertas-firmware
-		!sys-firmware/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/amd-ucode
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2000-ucode
-		!sys-firmware/iwl2030-ucode
-		!sys-firmware/iwl3945-ucode
-		!sys-firmware/iwl4965-ucode
-		!sys-firmware/iwl5000-ucode
-		!sys-firmware/iwl5150-ucode
-		!sys-firmware/iwl6000-ucode
-		!sys-firmware/iwl6005-ucode
-		!sys-firmware/iwl6030-ucode
-		!sys-firmware/iwl6050-ucode
-		!sys-firmware/iwl3160-ucode
-		!sys-firmware/iwl7260-ucode
-		!sys-firmware/iwl7265-ucode
-		!sys-firmware/iwl3160-7260-bt-ucode
-		!sys-firmware/radeon-ucode
-	)"
-#add anything else that collides to this
-
-QA_PREBUILT="lib/firmware/*"
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	default
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	if use !savedconfig; then
-		save_config ${PN}.conf
-	fi
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild
deleted file mode 100644
index 3642df85db82..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20180103.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	GIT_COMMIT="2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-		!sys-firmware/alsa-firmware[alsa_cards_sb16]
-		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!<sys-firmware/ivtv-firmware-20080701-r1
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/libertas-firmware
-		!sys-firmware/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/amd-ucode
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2000-ucode
-		!sys-firmware/iwl2030-ucode
-		!sys-firmware/iwl3945-ucode
-		!sys-firmware/iwl4965-ucode
-		!sys-firmware/iwl5000-ucode
-		!sys-firmware/iwl5150-ucode
-		!sys-firmware/iwl6000-ucode
-		!sys-firmware/iwl6005-ucode
-		!sys-firmware/iwl6030-ucode
-		!sys-firmware/iwl6050-ucode
-		!sys-firmware/iwl3160-ucode
-		!sys-firmware/iwl7260-ucode
-		!sys-firmware/iwl7265-ucode
-		!sys-firmware/iwl3160-7260-bt-ucode
-		!sys-firmware/radeon-ucode
-	)"
-#add anything else that collides to this
-
-QA_PREBUILT="lib/firmware/*"
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	default
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	if use !savedconfig; then
-		save_config ${PN}.conf
-	fi
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild
new file mode 100644
index 000000000000..fd73289cc2ea
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180119.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+else
+	GIT_COMMIT="2a713be25a44bd6cec90d8affc54b246a2ca9c7b"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
+		mirror://gentoo/microcode_amd_fam17h.tar.gz
+		https://dev.gentoo.org/~whissi/dist/${PN}/microcode_amd_fam17h.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+		!sys-firmware/alsa-firmware[alsa_cards_sb16]
+		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-dialup/ueagle-atm
+		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
+		!net-wireless/i2400m-fw
+		!net-wireless/libertas-firmware
+		!sys-firmware/rt61-firmware
+		!net-wireless/rt73-firmware
+		!net-wireless/rt2860-firmware
+		!net-wireless/rt2870-firmware
+		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
+		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl7265-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
+		!sys-firmware/radeon-ucode
+	)"
+#add anything else that collides to this
+
+QA_PREBUILT="lib/firmware/*"
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	mv "${WORKDIR}"/microcode_amd_fam17h.bin "${S}"/amd-ucode || die
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+		find * \( \! -type d -and \! -name ${PN}.conf \) \
+			| sort ${PN}.conf ${PN}.conf - \
+			| uniq -u | xargs -r rm
+		eend $? || die
+		# remove empty directories, bug #396073
+		find -type d -empty -delete || die
+	fi
+}
+
+src_install() {
+	if use !savedconfig; then
+		save_config ${PN}.conf
+	fi
+	rm ${PN}.conf || die
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 88a965a27000..6326bae15eb0 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,14 +6,14 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.16.53.xz 1861772 BLAKE2B 4f575ae7d31911628052f56d1fef2ec8d8e9de9a8794752cec55d354234becc267d1af4fc4e0f58034096d09a9131270ce2089bf34a7cbb822989b97e65fa6d4 SHA512 2b703e84be6814f696a0929b9d5d352a01a75442a1992a7008c73cbdf5dc8049db7768f34984eff26fe207938948721ac1bdf7688024174d9173067dd7563bfd
 DIST patch-3.2.98.xz 1866168 BLAKE2B a36f145ce8ce5d70d106c9eda04ffe8be6c9caf234fbab6068b151e6128ca82dba5d776e08f25afead30b064230585de0209bf4067f19386ff6902230787a736 SHA512 7e1bfa08987ec1115ea20b9c27946326c8c1b6849ab025c0b72e741eafd462e173931a3bc8b483527c148e0f32859d34f96c1a895d08d8b117a63b08d281d319
-DIST patch-4.1.48.xz 1286376 BLAKE2B bc72b596f8fadaadeca4d4424465220e8ea2a9e96b51a718ee537ee7586c99dc796920ec760d7e351ee1d32a289fc06f0407bc5e85c3578be4bf3f062ffc7ebc SHA512 6bdab31db1f64f311b6181efa6b3a104a92be0e438e1f1c01cdec121bded8fe6cdc3340400a2249b3796cab454d81a0a19293adb07d40d52fd3d6ac1fe9963f9
-DIST patch-4.14.14.xz 430628 BLAKE2B b298fdbf9fd20e21662521e3d3e94791e2016b6f48ed6584e33c739f2ac2334b8e922fb2f4a7e99e18de1e360cf3d8c33331357aecb1c22528c8beca5e6b9c73 SHA512 abc13c99eb85b2bd25f3ac07fccdad52a801118a86d3cd153a8ca6254730e5604e34261e98945352b23cf0e0a0317074a5008701d1240cc958ef4199bffd1ab6
-DIST patch-4.4.112.xz 1582412 BLAKE2B c55bb796b7fa87ac048f3e808d817bf87cdae0a34d2ef5afcbac20168fdd5d9491ab081882566a4c449e1c31047506ab31b468cd4884c7000db83e0743fc48d9 SHA512 412faf4e757d5dc765dbb610454e9892eccdb796356ccee618e8cb0f8ba97b60c422206cbc1dc36c949484ce1a7683b19a9bacebfc6f7d5c909ee517a13c9042
-DIST patch-4.9.77.xz 1374644 BLAKE2B 8bf709185b04b4f31e7a2cc409430ee4a60f473020d399de0882e36bf201ac6a20461051c0cf01a6bcbf917035733f0493d4ece4f14dc3071bd004e5531a8fcc SHA512 87cbb29ecd87b5e3e8f06eb5afe6f313f7bb36933a05d8e3f185a7cb96b6cd0e69fc1eab9bf78d20a8671651da5a9a6c062797d3ed6c86258cc74335027453d6
+DIST patch-4.1.49.xz 1337256 BLAKE2B 3252613e08b734e282f7b2034da65b873e925e9244cb011d995913a1dc9829bcb1f374e21bcf785b97f05474b1b5a104c61adbf430eb7f75d8dadd854627d9d4 SHA512 e10f3186b94bfa2ee7189bf4527d4129bb89f23829a480bee87fddfb1d31533ffc1a97ee860a159828c0853e6579d6a4537fa646e977f0f66daf7d304a99ef8c
+DIST patch-4.14.15.xz 457912 BLAKE2B 19501a2cbc51eff59efe989af545ffb24829e0a1972c29b8e2d55f77957f76cdd538ed3af58c3ad8fee80f851afc1d5273a238e37c4938f9374e358c16a7f242 SHA512 faf165072fcff9f6f8cec76f0c35cf422afc453dfa2fc9ab5bc918eb177ebefd1e305f2c994a90c9dff073151762d79359789d118307ba15f53a020426c291a8
+DIST patch-4.4.113.xz 1595348 BLAKE2B 6094c18a9040dfe370b2d8c35b0b171242fabad5ce89afa6b4121eb8431f11dcd29b728fd8a27a3987ae30063155aa747c14b3dceb39aafbd063e4ad7aa07086 SHA512 644c4e9a633cf9c71b8950972260eba6144e4ef4053b339b69f7787ae7c3b71e9d0a82697870ae6138094865c9333ee922e31f59e6229ecf307fdb7f8eb111f1
+DIST patch-4.9.78.xz 1385616 BLAKE2B df41f4dcf1218d430c857c74eba0409077d636961789948fb195d474ac067ae49993339a59f4ef07ca5cde1c74b1644eab25b615050c351c1dfd396c4c1b1610 SHA512 439024b02e1b3ae6823a0c50e9edeeb591d385374cf6494bcf5f3d398d05fb388532145ba0fe6f87f95bb48c56a9e1e9f3de575e15519673ecef47b19bc6d7c7
 EBUILD vanilla-sources-3.16.53.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-3.2.98.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.1.48.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
-EBUILD vanilla-sources-4.14.14.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.4.112.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.9.77.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.1.49.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.14.15.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.4.113.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.9.78.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.48.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.48.ebuild
deleted file mode 100644
index 20e2c109b44b..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.48.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.49.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.14.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.1.49.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.112.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.15.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.112.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.15.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.77.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.113.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.77.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.113.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.78.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.78.ebuild
new file mode 100644
index 000000000000..9f9c2bf5ccf7
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.78.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 61e7d8cf6efd..700d948d1142 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 76b3f07ecc8c..69e5f131c823 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -6,8 +6,8 @@ DIST binutils-2.28.1-patches-1.0.tar.xz 19772 BLAKE2B 146b393b49ba868c7c064c5827
 DIST binutils-2.28.1.tar.bz2 28120394 BLAKE2B 3a0ed2bcf0c859638546b7460d9e6f0a55518402ff0c65c90ce462a318f5ae6690961616d188ce6cf0271c9f2fb8b7902782d32cf0e711068c53d3d06956d89e SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb
 DIST binutils-2.29.1-patches-2.tar.xz 18528 BLAKE2B 514496d6c9609362782d66b6cecbe3fe617f96dfb86e174a80d0b9113cbd4fce9d760fa61660ba2cfafbe1e482e955391cb8d3ef78d2c166c82796416a7ee106 SHA512 b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0
 DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878 SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
-EBUILD binutils-libs-2.25.1-r2.ebuild 2737 BLAKE2B 6a82bef6752e41aee0bdbca11c6ff9912b53fdd3570c9d9ed03b91146809c07944f5ac56d18d01febc9ffc9ae78f2fda76af493f1b9201d2a7d57c0e10994827 SHA512 e74c54f9a73d1f0193879fd181ec42951e24c89a0458461293982c19999e86d0c99ce6417bb53261763ea5012526e566b1adb5fef4f68a5d540489b9c0f78018
-EBUILD binutils-libs-2.27.ebuild 2859 BLAKE2B 330b1da8e59d4373a8981e9dfd6553cae06e534c51c9ae4c6850b1a1411e7015db6cd33b9bb6c56e9af179dc5b4c5c0e671d24f42cc982a0e0cfa3a60af2df1e SHA512 f0307817eed7b1fa5559543027d5e8ad3609021a92e06ee810e8008da9bfdba9559fd29d44cd961a40df735b4b78c38ba1156415b5f63d2ab43283b515a09bd0
-EBUILD binutils-libs-2.28.1.ebuild 2884 BLAKE2B 33b0e2475d97187012ab425a2c1ac27e6cebda56fe64861e9f996b05e93baf14337f72d3f4ac63c1e021d33da717eeff7694a10245f82746085b2cdfb675bd3f SHA512 d9679950c09f4381d441772b5c1906aa517399fac42eadf5a778c2fb40e72fd7846b04059c5f3331fbb4eb5dba2e50adc7281bfb55febbdd150b6dfceb1a45b8
+EBUILD binutils-libs-2.25.1-r2.ebuild 2725 BLAKE2B a4fe58fe79272a65c7703b3be801bd8ef197119cbb06b964a107b80eb7c3f38a65e2bb5de69a12b1eb939e04334c7767898d9adf6b853f622dfbb843fc3b7039 SHA512 8c610d03d282e72507e055fac6a3edb9b0fea10dda1934099a7b9b6577d90ce808c803ffc3e6b7378071bfa6d3fd8e1d6919031448d0d12bf86bd37dcbe4e53e
+EBUILD binutils-libs-2.27.ebuild 2847 BLAKE2B 3d02dfccc46d3398646d338e01f096de36a74fdf6d224a8ae221120fe8105cc674ed09840b01d84994ff11c4f73c88b39737b3ff484d32dbfb1183f20eb3a1a4 SHA512 629aeca9ec392f957fbbe7f2a3d5564016d096b7cbe63ef9337351e599722bced4c3eb190d8dd0f091eb3ff816e839b03f7a7662f22f9e22b36ef3e8e5bb93ae
+EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a1775ca47030bd26cf2cf4ce4f6b7f3c5325d1629b3713aa40a1f85b9b0151555cf0a978c0390bef48846b3b1eb0c89b05d SHA512 b00d0080957824bf447035172b4941fecfd358f2cbbdeb82a578e11e0a8b4c712091344b904d8f74840164032d210834b30ed8a90ac3dddb47dc9632d66f8a9b
 EBUILD binutils-libs-2.29.1-r1.ebuild 2922 BLAKE2B e7f2af611c5ad814d7d56d5e634a0742792e888f2b25766e0232942577346dbae715f0d1de4b201e0985fa96d601bf4830a9a41095c0b17c364b9b708deeb6fb SHA512 9a0f10ca491064805bebaa87a1f9a4808ed57da3b1aa0729e20b4a0fa143d535b9d3b6c58a882cfb7d0039ed36439b6bf8603cc140bbcd583a4a7c5ba7e7d73d
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
index 95a918e34685..2e9f71efc3aa 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs zlib"
 
 COMMON_DEPEND="zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
index 17de45b112f6..fcf683ee8b95 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.27.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"
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
index 0af572c85ed4..0e16ddc1a119 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.28.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="5"
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 8ee50f7844ad..23b3cca5e2a7 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -66,21 +66,21 @@ DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7
 EBUILD db-1.85-r3.ebuild 1317 BLAKE2B 562859ea0cb085156f80bef5db9a8b51c5eb2f54206b4e0d40148ff26d47fdcbe8bca659bb8cbf755bdc79f65f22c86b735f32229aa564bd9abd5e497cdf2c43 SHA512 86f94dfcb55449d961e3b25f139ab968ac1091db313b7906a0e3de941cd5da22e86546426dfbae39d4b25c328ad7991b2feaa1d013ac016ede4bbea8f302b2ba
 EBUILD db-3.2.9_p2.ebuild 4947 BLAKE2B 6fe86d9e7278a3d7d4f4cc439b5a68061c6c8886ce751c0775bd7e4869804f9f72eaa53f94cf1fbaf434262456c66dfd4fc816bf9d5f043b0194ca334b2c42c5 SHA512 435dd3a6743369e373b99cca0ed926aad98c91d2d79bce8af3ab97868c1624afd8a9ffc46cc5f1d035289211ceb222bc38fce214df1f358bf62d35cc4b1ec0af
 EBUILD db-4.2.52_p5-r1.ebuild 4994 BLAKE2B abae8bd056b3222bda147de00b69e94b1c3aa4d5c0a5403321c33c27f52bd1df335fb741fcfd583cb24e4141bf3eb53f25555648e66b854b7df526b60c62fcb5 SHA512 facc045c230d6c69dc821b308ad50acea7c64a16438d1d1eb8e09d95fefbb2f03f658f9eb8ca59eb538f66e4eabbedc6899ae94fbe3b4cd37cc69cc2dce54209
-EBUILD db-4.3.29_p1-r1.ebuild 4953 BLAKE2B 7c3dae7cd08765d09fcc580de4c8f54b0d6e4340cb1d531005467d7eb74569c87a8f8d2884013b073af9fdd29198484b5d1263eba116e193501060c4bee81a2c SHA512 edbe670abc1da1e80b4375d7c9e6c7f565b44e9b27fa5c1eca525eaadcf266c1c95d6f448fa30403d3f61420fa2d68d2d0966dd3bb95df8069652ad228004d41
+EBUILD db-4.3.29_p1-r1.ebuild 4941 BLAKE2B 030fa31a1ebf518e60230393eddd965128b231ed9f7eb42c768abfc69d77c332976f82fe14bc752ccb76147de515dbac156307efa6e99fe57af2951d271fe5bb SHA512 bd45849c6c699cdd4511ee4e289a6fc1c0c2ca9419f43f0385b4777c5bb6f4fec97295ff1df480bd812dcba8be08b57e6cc443b3911ac5836b7ba2543a582f14
 EBUILD db-4.4.20_p4-r1.ebuild 4833 BLAKE2B e61c054a9ed43ebbcf5afac9970034cc1e700596015b035d8d5eeb0a2f35fa58eee3d66ff2df53543e32c4a66afb445031a735d996cfc786c81ba91f874a7e97 SHA512 dc4d0d17ae2470cbf294a4e1dfaa2e0d5b3c7eb12131b59bc47eaba11347810a055deeb77e869471529bb31dd442eafeedce7c751386db8ee54a2e0217075531
-EBUILD db-4.5.20_p2-r1.ebuild 5112 BLAKE2B b0908abc370d06e4852ab803c6d252a6c9ec4a564221cd14f96c266076267ba8bdba170d31b581b8e6ef74fbed8d4eb66d0af36b45a86081dc0b70bab8fdad31 SHA512 66e0db87939fd8a4d6bf62067b5a4a183086334e617bb479427574b9a99a765b966e3656333db3e2996ad8cec7c47a0f8ca1670927aed5601ab233eb0ea0f854
-EBUILD db-4.6.21_p4.ebuild 4841 BLAKE2B 7368f49335b10f581ca51a85fbf0e38fbf3b5cd67078198d56a3980a903680e0d4c9ff4bdcc1d99d496b4baa99938e0370a724a12bb6d9d5ccd3f9a0ca6129a9 SHA512 4f20a6137342af997730d6d0dc980785b1263fa5b406d4d680c98eddf41d6c520cc83613561f5fe35025bacc6536cd530de48f7da41e4f05bd294a2697ce255c
-EBUILD db-4.7.25_p4.ebuild 4291 BLAKE2B bff32884c3bae48e41b5144f7d8d37bf682d918ae0fa72f1d533f938e4e63a6ad45836d9ce58faf9ae0ea2959c7e61e3235ceb28ddca7ec3fc874ef2ce9fb6b5 SHA512 7b71c66c36ba09417ea6cf4160a122dbab880a7c09ba008670d5b1c243f4add4537b12df2f21df16ee0de9a175ddd3108bd2b4f333afa489415a8dfe82974dcf
-EBUILD db-4.8.30-r2.ebuild 5057 BLAKE2B 3e29108c36376172a92df96bce039a18f35302c68d1302085be0e987ca211134e63f0e14b682ccd15f949500e071337408171b4b5c2c67caf5259d05ac35e74e SHA512 feed5105861a88475d9fca3f3fa2ab0134d1c8dac830d39340754d14178f833c652800b31e729854b186ab106ce3a4eab75982ee48693dbd2ca3fb91a0c66bfe
-EBUILD db-5.1.29-r1.ebuild 5467 BLAKE2B 58c0e9e7e5e21c5538db84af047f59423523bd4237ceae54b77a41d641a9f650c4c984704969398c8370e34b2b287cb6bd8da4567f6250ac78ec3fdf74bd24c0 SHA512 86ed6cf561152f39cb59a76fb547e8f676ef068c564941ea3c675097911d0b5663013d1912be05e6e30c9d1664ebddf11b6c88e24f2cacb5362dedb44c1e4e44
-EBUILD db-5.3.28-r2.ebuild 6625 BLAKE2B 856fbee64daf8b7b8b1b830f6d2d66472e991c2c36ae2ab3d1c6373aa4cc326c37b3cfa61ccf1061567864575c7682b00ea9a609b1937cd2c26bafb0225214bd SHA512 b576eb9cd538faee9056bf40720981a1e0cb6c327f557ab90650386ee688c39014da2d52893dda4943731517d26b18ff5ce9c6514a20225090b4a0c4b5710f8a
-EBUILD db-5.3.28-r3.ebuild 6730 BLAKE2B 82e562e2379c405a9118ea96c66f66306a83bb1b39ca3b3113ac830d1d867c1a1535fb67c4873d93ea2e5646d43add88f2f5c44b09f5c865069b3f7eec601ee6 SHA512 018f21342ef835a000c9db7fdb19eefbb51e666896b21ac5f390f0c350345711e98459711dd1be6d7f1dfe6be7ccb342acfb4b38f2aefa3d328728553f5ba451
-EBUILD db-6.0.35-r1.ebuild 6735 BLAKE2B 2d6e315724586df32999c1007ed9ceb1cf3022e8c539988673d7125a7348c46036a1423f6ae82ab79520a88b95b0bb7ce4661c9b94f1cdb683b930920b7f0fda SHA512 aa6fdd88f9c417c861dfddfdac478cab7198daab0cf3f5e83c691a3e74cf53e87862698ad7901d5d03ce1ca8fc0815dbd8e23d2ca8b7fcffce56b24afdf9e2d2
-EBUILD db-6.0.35.ebuild 6639 BLAKE2B 87ca802202d9fc30d565341be7859074a2611cd11ea34aa229dc27766a745cfa6e95e19998240a65387b79ef01eba7658d9fe1d556063929971524078b8eefdb SHA512 01be1372da86a8f0fa2d17be22172677c2f36664e12e3febc1c21c1e393cb663116253b348d9eae7490b0e47edf3e0592b007edefa15ae57ad30314dc16807b9
-EBUILD db-6.1.29-r1.ebuild 6735 BLAKE2B 2300421fcf9bc1661469720363079af3e866cdfd3252abe1aecf8f96e24a9ebe27fb005d833e4d73a3a594df615e802046220401116c4b518910b80a3b97f1ae SHA512 0c8379370b4e3ae62020fbd6243ab32e359621c0efe335ed7bd123fcaa1755089d5d29672c9c532a4a163441131a1c97528a49e76287c018ce5428d50bc7fa8f
-EBUILD db-6.1.29.ebuild 6639 BLAKE2B dc15920cb1ab7e1a36d9749b9d49902fa843bfb657f853a23e3a665acff72d5ad3c7c37494c01e35255059059a602770dee96988fc9ecb7cd7c8d6b9a3ffd800 SHA512 7d852633a7281ce2f0587f777d8fdeaf5cbbf7dee09784d3a7adc8121c10b336521f5ffe66ba825cd356e83d1274790db4d1c5905ffbdad594254d4a365e81b3
-EBUILD db-6.2.23-r1.ebuild 6750 BLAKE2B 7f3dd5215e0c0e6322fc250dfc62d70432c96ec9914caba1c00d512383a74bd9c3cec64f20ff2ec78394439cde9d0dcc8b12bfeca6e3ab7620b50dcfec07723a SHA512 dcb8e66457d243ff6a15f08372d2bed5d3e5203a1badae55b275119bcf6168b25cc4f6b3b13d38134343d2a2009dbfd88c70b7ea4e44da6705996033f9ffe42b
-EBUILD db-6.2.23.ebuild 6654 BLAKE2B 488ce9d75a23d2ab61cfd6efced4b6bae1827e4b86bff79fc988cb0f5f2b2b0542fac02cdf60e830ed3f94957665749d4c4bf5bacc72287bd190357dde815a23 SHA512 dafc35d5d2f996b951d5fb6f4e852001cb3af0c73a966673b8aa5929a44483bb24711d0a3afae93dda45b6161dc9eedee9b752f691bc312f95d99b244586a0cd
-EBUILD db-6.2.32-r1.ebuild 6753 BLAKE2B 8f91d1a20170df1c0d76d30725f586d307e258ac407cad27f65392fa97eecda622df33b51477d0c783776c5e36f792eeafd7075ddd2e024036e5cfc81f29b3db SHA512 44f34a5f04146aed5de7f71d4dd057da93a8c6e3b344e1cc5ace9b99148a906d9c2077bc9437173c6335b33129a8f36b86403879a1007fcf36aeb5738e901252
-EBUILD db-6.2.32.ebuild 6657 BLAKE2B 93e96652c40f1b792d3337f0b201a51a23070169c06e6bc6e63da31dd0dd2a1d110406830e4995c7aa7df2c52fb8008016ee26777474709cc7367c93007bff17 SHA512 5e894dbea0ea1f092fd2857a8b5eea9401fe4f6165b061224c47a4ab498a00643ce9d98d7b0b33168e6f64aa0391485a19d2c3ba75186ae722170b0feab31fe9
+EBUILD db-4.5.20_p2-r1.ebuild 5100 BLAKE2B 8306f6d5c563d782347d5ddc1c2405404cb834966dc8247dc1adb38f39fef43a9e0d0a4cd34f05f180267224bf97af22e9b02eda7b6d6fe2209fc5937bda9475 SHA512 c7fcfaf05fd56d49758e3c32db505622b32d7b62f572b0865c17a32c9a505de6b40d27b085ac2de64eed1a6c7f4168cc72f9f90c2fbfc548fefff13fa0628245
+EBUILD db-4.6.21_p4.ebuild 4829 BLAKE2B 669e22398bcf581b01e2d2d049e55949ddf58e17da9c8ae5e03898f4c72c7d563a044ea439c27eebf6472064d4207ffc44f99e69c23f4b7032a27162e9624861 SHA512 bea9f25513d3496abf35199c1749ab3262688f43dd9f71043ac6c3011e4c4dcd673616942c58fcee063ea8db28efcf215674a12c521a72e94495bf4b77e722ea
+EBUILD db-4.7.25_p4.ebuild 4279 BLAKE2B 217822eb27f4c99d19797ece71587b2cf963638aaa9a29f53cf93a4c8454f6a00ea64c99253f0094a7bb050ea6bc7739ba4d38efba1b7a586894f60d8748bf06 SHA512 236c9cbff1c703a66ad785a6542337853a7fcc11db3b2fc89a607b761175e1e03ad69b1f9db542804ade020e68dd254fb1a7071c8605223b82bd7024c57d5a58
+EBUILD db-4.8.30-r2.ebuild 5045 BLAKE2B f2abed6d90ee517f6beaaf564aa5f3e1407fe4b51c8322806a6f4fa4693dab860feead37883df48f923a33013fdc72f7bd1179958812e7b94f7ef810ea5c51fe SHA512 0e74b6db501a68c5ebd51a953cdd46a506a76816e2825a98315101db272ee5f36d5be8cf8ba6f317f92e6b21bd8f1815ca6ab4ca8e9c53524c8711ded70b995c
+EBUILD db-5.1.29-r1.ebuild 5455 BLAKE2B de1dc56b313f6b4e896e0c159225295d3f6e43e7d0037db1d99a9e9dbccbc58128bebe9b2d7db466b821afc74c3a40e366ab8e1aff2f541493aa353c31de2546 SHA512 339062eaaf7a7aab1f940622d5d51169698fe40b0db1b45af40a3217dc0d46ba9466244a814c7d59985594358ae56165602dca46b0924af1b60f814f40942a58
+EBUILD db-5.3.28-r2.ebuild 6613 BLAKE2B 924488bfd7a060f726c6a29a750d3e0d4b8ce37112a49df72ef5bb4801b9d40d2e41f63e4f74d1c663a44fa69f9563a476f45386d6f0b8ab37d4dbd2a1f8eaad SHA512 afa7530823330c870b3dba4a0f02a7e1d7451d7b3ef5bc07b446f80f272d1db19103b806270a6a1b15f1afc4eba15450ac8c9240c9b23eb5c2abcd400d3b2169
+EBUILD db-5.3.28-r3.ebuild 6718 BLAKE2B c734b962cb5efe7c2732e5c995515635c3d002d7623dbdba71d8aca21bec4c009b572f9d94ab00a8554bbef30a9b18ee02cc777cefd3a73c138b5c0aa671310f SHA512 91b650cf78b2df6f4392095bc5e31128876c393b79b6767e30f2fd4c31ab0e686e0d47b96b92ad7f874bbcb489cdab815685a8449efb1cc0749a9c89babc6380
+EBUILD db-6.0.35-r1.ebuild 6723 BLAKE2B 17910c7f395dec78a10bf0895d2d4719aa9910ff88cc76b879b048755671a8e33ac5f170b6a08122e11b7c09cd79a76f738a444a967c481bbcd5f6ed52892e21 SHA512 078cf4e67c8e4568a221fa4a5731f803aa92a95b283d811f3ec70da8dec85ad949f2602191713cadcc4ca43af0dada9f3d92107fce4007c87a83bc1935a9d071
+EBUILD db-6.0.35.ebuild 6627 BLAKE2B 1d55909a3c360bba43f2a6ddfacb643c0d3ad4f0c6d8df1a488b26fdd7529724330ee1477c31d32a7601785b4e94af9db1bd1eafc0a3777e8d0e5fd4fca3e5e5 SHA512 9b9588cc4b4df9b7edfa81bf66f73bcb41eb640f915595c0c6d99406245bc5e413dfdd6c626d26365d81adfd7231d1fd07fd90abcb1c3adfdae7d7b17664ead5
+EBUILD db-6.1.29-r1.ebuild 6723 BLAKE2B f2b2821bf924c6c1ca9da548800c256a02da558ef9b9696215bc9eb83edc2dcda040248a82dcf8daeff0fe802f55e74f5d50cd44f612befc3868bcf5633fae9a SHA512 8f2002dbb102436a187047b6dafd7eea64936152c755b5dbc67a65bda80740a891660162679efd413e2d4047aa37cc77818820d311bbdd803ebf2ac3248d695f
+EBUILD db-6.1.29.ebuild 6627 BLAKE2B 26e9ec779a3e24d85436904364c657b55b9352f2ed0466d9da48cd4886a81933a0c9b0eae9c84d213ece2dabdfe14a62bbdcfab44687dd9af53447f71f62bb2a SHA512 c1534e27e7c0fbc94e2c55ffe721fb2e8754228447ef65950b88ceb095653bcf69bb70d6eeaa2de76c7c4f535eb902552afe2219f8953fadd4f24e278a0cfb34
+EBUILD db-6.2.23-r1.ebuild 6738 BLAKE2B 996aa674b541d5881a1d68d420154cbcc219b13f2b5e4ef1b4ec13653a766c91e99937c4645c63e12d43b778348981ebca75b3dc7f0d3be2838048994c60b404 SHA512 e3acd982dcffe370fc7324d4ae2bb8b973eb08c22379f70cfe708588982e568e23d2473844d532ed027c719de2924bd0fcd9854ac9984d7681e67debddff5d5f
+EBUILD db-6.2.23.ebuild 6642 BLAKE2B e491865da9186b92e80e21eb30bb6713776f97695287638ae80ac0dc1ccc98ebe8ac06d83533afcf0c55e7a0cb23469653d98a40ea977ae6a389234fd616a164 SHA512 627dea1e5bcb9eb8e120996f8b15e8b0eba3bbbfd19771d5882824a27a32cfaf09f96f083adef5091ace6f1572bb96224c9a47df720f78944530949c9b4acbbc
+EBUILD db-6.2.32-r1.ebuild 6741 BLAKE2B deb43b6c21c904abba2cd2c6e21e959994726038e6c46f57326bc74db1cd5a4b5603a0c0ffb1ffa6f18e256e08ec0ae2c6af168cc465195f731859cedd154db0 SHA512 aae7b1543883d91311fae58906be0080f03fee7c7e42f7c245a06f1287b900e7b1f6e6cad44fa11adc163d06a6157b88d9bf70673ff62e1507ac005bb4955499
+EBUILD db-6.2.32.ebuild 6645 BLAKE2B d2f1a53bd602033e53f27611a825349e3bfa3c09eb62fb5faf153858e2f10f1a112450c992593cd340072b98147850e6bac97280c4781ad4027ea26b48e471d1 SHA512 78bd6a8f1cc0f13af9bac055963f17dca151df3b80a2be4189ad950a254fc6e467b23e5072a824eb1c93be5b2a9e2bef92619a5246be9693d7574017dd11ef18
 MISC metadata.xml 1323 BLAKE2B f954567067cc1490d6804dd9d7b612dd90733c7ab84546cbedc0075f8f3ef1faf6f1bb70bae31e83b0aa17666bd6711999b67ce4fe6c15bcffc3ba5bd8d004b7 SHA512 36f8b6db241ef960b2ac0f7bd19738066e3daadd90efbf7edc54a4774e491506d69a2207738f53643a3e52f1f35a900e4717747744bd30ca682265f50cb8884c
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild
index fa709ec48a83..1aa988529c93 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-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
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -25,7 +25,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index 178d0bf58c64..4e598127e113 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-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
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -25,7 +25,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index 7f32087a5edd..a748bd7f2f14 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.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
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -25,7 +25,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
index 828747ac824c..13e0ec8dfe8b 100644
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ b/sys-libs/db/db-4.7.25_p4.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
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -25,7 +25,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test rpc"
 
 # the entire testsuite needs the TCL functionality
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index 5584a2c115ad..37d23a102be2 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.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
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.8"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index 1098ae248f88..815bcac9ef94 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-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=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 5f80d60111f2..a4ef2e665c3a 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-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=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index 240a2b09a416..6906ac2db5a6 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-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
 
 EAPI=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
index 0c5fe167e084..d3d38fabd1a2 100644
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ b/sys-libs/db/db-6.0.35-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=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 5dce460076e1..9b9497e4426f 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.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
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.1.29-r1.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
index 1055a51317b6..97730d015517 100644
--- a/sys-libs/db/db-6.1.29-r1.ebuild
+++ b/sys-libs/db/db-6.1.29-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=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
index 950bc6f97452..c993478412f2 100644
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29.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
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.23-r1.ebuild b/sys-libs/db/db-6.2.23-r1.ebuild
index 2d4ba9b44373..e79ae1d3d07c 100644
--- a/sys-libs/db/db-6.2.23-r1.ebuild
+++ b/sys-libs/db/db-6.2.23-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=5
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
index ff7694a3b692..9d99d958c710 100644
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23.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
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.32-r1.ebuild b/sys-libs/db/db-6.2.32-r1.ebuild
index 2dbb2cc1a5de..9682a4394c9d 100644
--- a/sys-libs/db/db-6.2.32-r1.ebuild
+++ b/sys-libs/db/db-6.2.32-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
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.32.ebuild b/sys-libs/db/db-6.2.32.ebuild
index 61a18bfa9445..8fa1fd1ece68 100644
--- a/sys-libs/db/db-6.2.32.ebuild
+++ b/sys-libs/db/db-6.2.32.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
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 4b0b97b2d79b..1ad3824701d2 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,5 +1,9 @@
+AUX efivar-32-efi_guid_ux_capsule.patch 2054 BLAKE2B c349cb606fabb96729af078547bdb3e425607599397a067684753565f6aa98f340885585acaee64e3642a1c284eecca313e3348014e6ccfc5cee1e72ec1885fa SHA512 7e8852b9adb3702b7a7a9a26ee734234c7163aa95d10114d79f62ab6dc918a9afb762fb0476913f4515b36db1cc2c80eb5a0b509f0252483e5aaf51d4d76df76
 DIST efivar-30.tar.bz2 73202 BLAKE2B 6b146cb6d664e3419361e72ab6fd1578522e7fc219613ae21566cb40a700fe70f18750cc753338faca2ad078e2bc933fb33a3a4cdfb148eabb0fc71b1319fb71 SHA512 0a6d7175762011c3fc67b531d3d19a45e82195c729b9ff498be02b3a6a73f6c3c4f9e14a27470c6744b741d7d54db9ef24c7882639af25fca1034b7b9f641b39
 DIST efivar-31.tar.bz2 82404 BLAKE2B d339aa8ab7dcd6a60cb067fccfbc2c42407fba211ca96eb39f227d57e9403462505940f427651dfaffa8272c9edfe70898f181b9f6ecddbae4745eb3262de949 SHA512 5055f690fd99cf59895dcf3d11103494d917d4923567626f0bee816ea5e4dd56cec23627ede5f21bdc57b7306522471ad19cc8ab22ae94591dbd1925c084f163
+DIST efivar-32.tar.gz 108102 BLAKE2B 7f9d27433b40ec6c044ab34ccc697001ad23e39a46862d2e04db0f9a3dfc26ae53b46a3c3a8c957bf76df0969710f78249f72f7bf38e67c0aa902034a07acf8f SHA512 e73eae182fd645183dfe587591a286670ee1123a113e3e19e4070fb910ab7794e320defdc0597540df7664947f2a0497abbb763a19b4dfa40511a512c7f3e490
 EBUILD efivar-30.ebuild 954 BLAKE2B 16a06384903a1107391d5a0c35e816c8ed1ecb58eb4a9c7bd74d2a6cce8535dbffb120cbbe8ed5066099a86c111f173cebbc8f44abdfc7ee9f207ff341dab0fc SHA512 75253eb96dbe9ad28a0f12e4ea46a92a49cfd4b5c1749c812b6ac1ae355336b28c0a28a819b97f5ad9d55936ebde29f5e82b68b9dc819fba92bad7afd44881c0
 EBUILD efivar-31.ebuild 808 BLAKE2B 08ec030f1b4e435aed0e11c323d31012fe07abe73f1ebcaac1c61fd3a2092a500e897783ee8baf0f95aa6b05c6e6b9d8054082e45f811b3a3b3d6901f7122e69 SHA512 65954b2b405e708b0d0116b4327d7d047bb1ee8799a81c775a63677ff3eef354d9adb5a5852f25d5a036823643fb9a78f530f0fad03f379ab3d4d9ea5733e8e9
+EBUILD efivar-32-r1.ebuild 944 BLAKE2B eb0a3d778f8e5b370dc0fe3e1034cad111163e33091bf2439c92c23cd2c8f88f3e9572e14e8c94186e1371ace5a6c7f358af3f416c29b0e05d414d1d459a16cf SHA512 044f127958f61bc352030eb6526b2d84d886d6548fd64b428ad76ac05cb02c707142c0398d5b5e4bb410166369ddbf28a745255a627dc96d12b300075bf292b0
+EBUILD efivar-32.ebuild 885 BLAKE2B b994d6fc214667ba5af12bfabe189874dbbf882f93b134a9af43667f940c073d34f325dc1562c4d194bb30da2a9810caa51de11b7d582a0928b78adc7284bcd4 SHA512 88b639e7b6cc705d681ce709612bd5aaa396f09326ea6e47dc33c0c9f1bf192c6152c63f601536f8dad282d59d6022a4e4f9e91b69dd4967afe4dc64a889b270
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild
new file mode 100644
index 000000000000..2ae5a0644a86
--- /dev/null
+++ b/sys-libs/efivar/efivar-32-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar"
+#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-efi_guid_ux_capsule.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+	tc-export CC
+	tc-ld-disable-gold
+	export libdir="/usr/$(get_libdir)"
+	unset LIBS # Bug 562004
+
+	if [[ -n ${GCC_SPECS} ]]; then
+		# The environment overrides the command line.
+		GCC_SPECS+=":${S}/gcc.specs"
+	fi
+}
diff --git a/sys-libs/efivar/efivar-32.ebuild b/sys-libs/efivar/efivar-32.ebuild
new file mode 100644
index 000000000000..43993d90bc5f
--- /dev/null
+++ b/sys-libs/efivar/efivar-32.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar"
+#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+	tc-export CC
+	tc-ld-disable-gold
+	export libdir="/usr/$(get_libdir)"
+	unset LIBS # Bug 562004
+
+	if [[ -n ${GCC_SPECS} ]]; then
+		# The environment overrides the command line.
+		GCC_SPECS+=":${S}/gcc.specs"
+	fi
+}
diff --git a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
new file mode 100644
index 000000000000..8a5a72f66fb0
--- /dev/null
+++ b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
@@ -0,0 +1,59 @@
+From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 12 Sep 2017 10:45:31 -0400
+Subject: [PATCH] Make efi_guid_ux_capsule actually work.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/abignore         | 11 ++++++++++-
+ src/guids.txt        |  2 +-
+ src/libefivar.map.in |  4 ++++
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/abignore b/src/abignore
+index 74b5160..479b5c3 100644
+--- a/src/abignore
++++ b/src/abignore
+@@ -14,7 +14,16 @@
+ #               'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1
+ #
+ [suppress_type]
+-  soname_regexp = libefi(var|boot)\\.so
++  soname_regexp = libefi(var|boot)\\.so\\..*
+   name = efidp_data
+   type_kind = typedef
+   has_data_member_inserted_at = end
++
++# 1 Added variable:
++#
++#  'const __anonymous_struct__ efi_guid_ux_capsule'    {efi_guid_ux_capsule@@LIBEFIVAR_1.32}
++#
++[suppress_variable]
++  soname_regexp = ^libefivar\\.so\\.[[:digit:]]+
++  symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$
++  change_kind = add-variable
+diff --git a/src/guids.txt b/src/guids.txt
+index 87e2f61..06081ed 100644
+--- a/src/guids.txt
++++ b/src/guids.txt
+@@ -3,7 +3,7 @@
+ 0abba7dc-e516-4167-bbf5-4d9d1c739416	redhat	Red Hat
+ 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd	sha224	SHA-224
+ 126a762d-5758-4fca-8531-201a7f57f850	lenovo_boot_menu	Lenovo Boot Menu
+-3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule_guid	Firmware update localized text image
++3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule	Firmware update localized text image
+ 3bd2a492-96c0-4079-b420-fcf98ef103ed	x509_sha256	SHA256 hash of X.509 Certificate
+ 3c5766e8-269c-4e34-aa14-ed776e85b3b6	rsa2048	RSA 2048
+ 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF	lenovo	Lenovo
+diff --git a/src/libefivar.map.in b/src/libefivar.map.in
+index ba51d55..a95a505 100644
+--- a/src/libefivar.map.in
++++ b/src/libefivar.map.in
+@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 {
+ 		efi_error_get;
+ 		efi_error_clear;
+ } LIBEFIVAR_1.29;
++
++LIBEFIVAR_1.32 {
++	global: efi_guid_ux_capsule;
++} LIBEFIVAR_1.30;
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 18fb1a9f5259..787df21a17e9 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -4,7 +4,7 @@ DIST gdbm-1.11.tar.gz 811662 BLAKE2B 5936aaac753da4aa5e9a103cfb8a50d33d8ff124846
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
 DIST gdbm-1.14.1.tar.gz 894412 BLAKE2B e519af45d670ec4285ece01edc17770dcb0d77f12edcf2d3d4cb9580c6d2bb6d6dddb57d4f33490e11dc9df7cd08fd44ab7737b62271c5cfdc9485b90d0d4888 SHA512 a15d7acb0ebf459f4f7d262e5a05393a9a7c8e9ae906d12ccb3b38715de15a41c9254e7814555e2f9af306ef63b2dc68b5f9f6c7b75dd0db77e07a58831ff603
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
-EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.13-r2.ebuild 1893 BLAKE2B 4778219725556d62498cab0fe422a65551e7881b6f9447937973f21d768539a12aefa3486db4535ff0b3c92b0db0f285ad15fded8b321bd6a553a29b9a168ac7 SHA512 7d516305b43e5cb8fa17724bb74b0cf48d02802eeb3cd006ecb325e6869c831b335ccdd0d9be08da48dc480c1c13204329b127282f9dea972d991efef06daf60
-EBUILD gdbm-1.14.1.ebuild 1814 BLAKE2B 339557b78ab19986e57618be547699e248ab20c0cd91abd1242f974798c364d396a63ac2889fee4d11090bd710aea395a8b40a5dc9e3b96f36575fff25d5947b SHA512 19037ca081722f22445d29cb704143296b17ef0d66f8b9af016f377f497892af04f2173534e0416cae7ba31dfd8211a7fd2ed688b89cd402ff86922d61ff04b5
+EBUILD gdbm-1.11.ebuild 1875 BLAKE2B b3541731e9c3836ff85ec96c59a3e147a127ec383349367afa2ed7990bf5a942ca4cb47773542eede4d30232c2c484a64def0f07e347192c02d74558d0447e21 SHA512 e29b2fedc10762734e8b18b704c70210315acb00d7c1098d19671145b11c7d032496808cc5dd88c9da838ecbd20b5fc4ff7664c1cae1535f3d6401ae5fe53485
+EBUILD gdbm-1.13-r2.ebuild 1881 BLAKE2B 956325f68f45cb2eead743cd17f90e8f1397e3384b1f55a92c0d719d24f2731a5b2b5f5aa5b11ca4872968f732f623a8138faf93c31d55ff5a683be23ef3a055 SHA512 b43dbcd90a622769162fc478e8a0deb1719c164b22f052734d0c98bd51f761c359f5ef6d907868736b84599b2a2668cfe89be991e9e266ed409f8d9d3a649a57
+EBUILD gdbm-1.14.1.ebuild 1802 BLAKE2B a9872ffcb3aa6c7b0656095b30a4ea5e71fe6c7967244b59c84a0e59a739976ed08b89318a22e35548d00904bb7c51aacaaffe7f0f21c9ff059252d37a08ca38 SHA512 b0d3430a85a19106aea0e6a57c7334ca99e008bdb3f83e5413cfb19e9c9ab75d3cd54714bfdb2e172ed4edcc74f5c732ad4c9ca6e37fa806c76f25ceb6f8c244
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.11.ebuild b/sys-libs/gdbm/gdbm-1.11.ebuild
index 13204d00fa80..a1c16be88349 100644
--- a/sys-libs/gdbm/gdbm-1.11.ebuild
+++ b/sys-libs/gdbm/gdbm-1.11.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~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="+berkdb exporter nls static-libs"
 
 RDEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index dc4de68e2def..a60a6fb3f34b 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/1.13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.14.1.ebuild b/sys-libs/gdbm/gdbm-1.14.1.ebuild
index d93f3fffb730..18fd2fb5ad98 100644
--- a/sys-libs/gdbm/gdbm-1.14.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/5" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5c5015764cae..63e7ac718ccd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,5 +44,5 @@ EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e66
 EBUILD glibc-2.25-r10.ebuild 5012 BLAKE2B 86753e126c049ba2407529668b82094650a718b0abc954a28ee578d331c2ffa5e425ddfff67b7ab4decb91c3b966220eef6cf0247544015c0b3160ccff330576 SHA512 3a06e7d0a949bc7347c37e7b2fe48ad6ed328af9b0c3ca808f5fb50643aec6bd050ff868c926bc6f9aa62f572a2da26527de666a12b9e5ff9cb7cf680547e951
 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f
 EBUILD glibc-2.26-r5.ebuild 25380 BLAKE2B b3af0b788b73ede0255c2e5778fe637cd66f11e4912c00ae3e5cca3c65b6fce8f9613ff45768d97369ebfee6d0548bfdf41bb8ed8c4778d13612d9d98cc084c0 SHA512 6953295e4cbaa2f7d7241fe053704b2a949e0ee55515c3357ab3134cdcd6e84a1f00f01549ebf61640c3297814233062929f3bca5f91a5f5868742f5f7e5cb87
-EBUILD glibc-9999.ebuild 40516 BLAKE2B 47efe059c10b70deb5476d2f04b624a130b66a3240ac0d2ac4973884bc4e1bb90ad3ea3840b744c51a44092eaaf0112ca90e1a3b2e186fd02dcb1e08fb32942f SHA512 e9321670cf316b834110b739b93a0bd650e0a639db74c721dd40fb97043f36022bd5d75b55af563a01880c358f13d4d55ebe4006827f46338301ba6b88fc60ee
+EBUILD glibc-9999.ebuild 40515 BLAKE2B a3c635300f85a06f284ee6b26ba2db546602b28e3597d3ff0ad4002271b1381e3bc465055dae14255ad9e4a803cac55577ddb03fc2add8b04571bb6004de77d9 SHA512 d318c0f9700591296a2f954e60ee4235093bd205efdbec499d52521807d55ee721b0ebfb139fff21b6ba4325dccc1628d7268f7ddab826c2c84f2b50fe6ce134
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index cb0e4cb11119..aa2a6a11a4e7 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -694,7 +694,6 @@ sanity_prechecks() {
 	fi
 }
 
-
 #
 # the phases
 #
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index df48e5217772..10069af48fb2 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,5 +1,5 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
-EBUILD libblockdev-2.14-r1.ebuild 1507 BLAKE2B e7e3ec1c38699a4d3536d2be3386c5e29dd22dbb2e3e15aa4d2e4d3cb2767d74e4846aefb5546ada8122cd28e0e2163be098577eae320e3d3443bd5b1372e7f7 SHA512 24d2197caefb6f956e19242e54892e0c4cd1d88605ffde27b1658057bab28d4ce5b3be625c6367a711d5fa348761ade11817fc0524860ba5e00dde1a2a6e73dc
+EBUILD libblockdev-2.14-r1.ebuild 1504 BLAKE2B 8da60dc425c0b83f6e75705815bc94275937bd1c1d5ace0798c850d04d561910a1f7086f32d131b7aaf0d785cbacfc9179909d0e8909646524f34638a38ae399 SHA512 6e19060b01e9b21f1969d35cfff4a58c20456d4594f22ec4e8ae961480302abb639816f97212956e067b0df921ed17d8c1298ef025598c56aab663cb430e0ad9
 EBUILD libblockdev-2.15-r1.ebuild 1511 BLAKE2B 4dec54efab145e4b97faf0fabb0a98bde71ea31aae72ab6baa2e4fc70b046fe423bbdb1e3b95be911cf7b0d93b8f88529261b5819ec734e1aa1a1f402a2914e6 SHA512 9706152e06aba541beab82f1c3b20fa412cc96de67ebcaf3373eb6d071d8de40067c58136b1b32140ebcb6581c285f6fcbf1e6c2c0594687217a0d944612b058
 MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
diff --git a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
index 5d6b885a695b..54501941f3f2 100644
--- a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
diff --git a/sys-libs/musl-nscd/Manifest b/sys-libs/musl-nscd/Manifest
index dacf4289afb2..82bd0669063c 100644
--- a/sys-libs/musl-nscd/Manifest
+++ b/sys-libs/musl-nscd/Manifest
@@ -2,4 +2,4 @@ AUX nscd.initd 1415 BLAKE2B 4f9ef4c36addc71bb42ba1d8e1fa8657efd4b8d52ac69f8c1baa
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
 EBUILD musl-nscd-9999.ebuild 664 BLAKE2B ca11ffbc8dc8a5870fa95ed0a298408f1841f25564ea9f4f001acca10bdbd9f68a1854f101b4416e9828427a583784aca5b5b35f32d2136790c5b43405faeefd SHA512 a30eeab05e0cfe0427a59b40740b819cf236005f0cbbbca3e25990124d30040d141cc681e15947a47c6695e8ed8f9932a7ab72566cb6fd4d359ea941fcb0daf8
-MISC metadata.xml 402 BLAKE2B c9ddf685382edb8cb946b763e80292f2c244f76da7791863dff47c438430bf1c89f87f33652316bb75f1abfcd3ae59e2c85b3d6f9a097d111c4659a8f9df6f57 SHA512 365e5b780076080f19c4377606fd39a4c4f321e5383ed41d7a644601e705942a9c5264acd4a5390c2a57bb3d9bfcd5df00ad961bd07c5e7f28e4d5123b1a24f8
+MISC metadata.xml 515 BLAKE2B 29be68c37bdd741c5b72dacbeb98857da0942bcf26dcfe42f36979e16cf55c8dc082a1082f21d0b07f16167fd18e2f4e6d94a559db68a7f9b254016d194c9085 SHA512 4919ba1f27d992be161bec742964751ff49bf804c23e59afedf902b62c44a663505fea9b54dd80187b8d9a96e07883f5b1f85a640dda271decb4a6add43189f4
diff --git a/sys-libs/musl-nscd/metadata.xml b/sys-libs/musl-nscd/metadata.xml
index 7a97e61f8d53..0ef7be03a10f 100644
--- a/sys-libs/musl-nscd/metadata.xml
+++ b/sys-libs/musl-nscd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>lejonet@gentoo.org</email>
 		<name>Daniel Kuehn</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
 	<use>
 		<flag name="minimal">Only installs the header files</flag>
 	</use>
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 8b888d97933f..bbdacf700110 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -12,7 +12,7 @@ AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
-EBUILD ncurses-5.9-r101.ebuild 5295 BLAKE2B dccde970635c874070f52a3fe1cd49f6f2c21a3360299596d49db2d57ec9be4c9319fe1d38af49949d8528ced9559ffa8d01d339a5f44b3181cf6405f68a0a5b SHA512 e7505e1b91925abed6feb120da09ec578276c467fef6b3e99fa8ebf74e4abecc130507406919ea1c49e7f9e4738e9c0b4dc20f9964b603de50dba2abe637f1ad
-EBUILD ncurses-6.0-r1.ebuild 8645 BLAKE2B c74fd055fbcdd72c4f3a8d719ef568d015f4edb57ce9167497307689d069148ad4a8789014ae81d7b277c324cbe1189dc0f2205c50b915899b542ef63be875ec SHA512 6eba919e6333c4833455784a377257a6d8dd7d134daf9a536113327487c8f2a191da942f9bea76fb963b0c04a64cd6ac7065b2c32e30fd1e61df302d6d424fdc
-EBUILD ncurses-6.0-r2.ebuild 8778 BLAKE2B d6a032b565271120b83eecf9db92edfa823175ff0839f76af6c81023694234642b305a48d81c43d5b92dd3b9d4ffb779b07fb3b92d2787fb171ae446bf0ca8f5 SHA512 7439f04a0ecca8a87687aa08b1656b5e0eb2a78e37c3340e9ba8e2f40d85fc05a27316909ccc2b803bc98565bce57db35f44b3a23dcdd5c64e298a1bd1633657
+EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
+EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8
+EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index c722d68f3208..78a4d754b0c0 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.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
 
 # This version is just for the ABI .5 library
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index d98b23afb751..562662fc29ba 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
index 250619a40dd6..15d435938bc3 100644
--- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-6.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="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 74713b7e9717..5e56dfdac9c3 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -39,7 +39,7 @@ DIST readline70-001 1777 BLAKE2B ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc0011
 DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185
 DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385
 EBUILD readline-4.3_p5.ebuild 1541 BLAKE2B 15f7b523780d1b2b48ffec6ce2a9b18152c67efa28557f67b17f23dfd55a5a0712333f47b0348183a345a947aef53f184170b8c6470669bf7da58cedc05241b8 SHA512 3675fb0346094bf360035c5a9e3ffe1577b284024b0d5287a121999db7f81b5c40caddd9f71ec76c76d63216df6b094c98aeac0eb5ccbf9bde6d265506d0df03
-EBUILD readline-5.2_p14.ebuild 1610 BLAKE2B b89b5fba887c5bb7fa459ffb3bd83f2453c02177c02359533e92ae59a9c493d03b524de3bc20cb9ab872bd7b39aad3df055648678a9105f5ec3cd5a7009451f0 SHA512 0e4a5350507a2c42249bc142ac62e8c88698285e765ec63168ad878496b1b08d7ef0e3a8a05d99331a67eb490380ae5e6431c9289e21b4f6ae59477cbe8c9766
-EBUILD readline-6.3_p8-r3.ebuild 4536 BLAKE2B a700309ed31291404770ba8e6507b9b4638e0099f3f1da16c1fcf70b293a86b4e6140986ecfa19845548059ce2f5850fc586f2d97f3394634d81c8bd6efa26db SHA512 0f93d51c70b05b5103d05dd481b64ed5ad133ad6348e0799f2937fb944f1cc2c388a65940e6c405d3684b261e27586ce4d8f70063c53b2e4421888afdec674c9
-EBUILD readline-7.0_p3.ebuild 4625 BLAKE2B 7e84e6daf45216afaeb4a385a1c3ade2ce6242c4f847da480725a3211220e54575d21f074a7e8d50d77b0ad4e50a3a9f71f863d2706738ef52e745b9dc977199 SHA512 3b63ea12f1c39f4d6571cd4c5d804ce857fce067f0795ce1fb1f3353fd31b250d1d896f773c08b8a71673c674429da44ae6e1e245ccb5b65b56daa67791d9994
+EBUILD readline-5.2_p14.ebuild 1598 BLAKE2B c3ecb5f6130c10718b55db1a3e1d092cfce68d9b0f3cea3ccdf5fe673ebb5ed8efd043d0bf6d6800f432bb03d2c820debcadb6f7df1a0aa3580529bde04b5073 SHA512 bfcfdba85b3d11a3e977007e20ca5d023723aaaf62b03b216db86d8484ffaeeb268bf247f6fc3cb6222c67a9ad1591ef03e020dde08366c8c043e83b337af887
+EBUILD readline-6.3_p8-r3.ebuild 4524 BLAKE2B 352f23a25d9b045ac18f91efee5f3482a2c5a77c6b5883acc971c5df1ecdb5d8ddeed02334760a715bd9d088a7a05352a3d8f6422da08943c5b1f41cf6d43dda SHA512 8ea86f96e4edf7255df8264d62fdd15c29682163512845d9df26a8e7c5961a98f5f7f00df5c8f2c659d690eacfe24d9cce35b1fa3a15ff7eb964d7f2d9357767
+EBUILD readline-7.0_p3.ebuild 4613 BLAKE2B 7a4094f6358528379cc107006f41ce32a7c41d9d73185918c1df976d1c13f4be931aa7e268b75141d0ad2ad756d1e7ef99a2321acd5837d2bcb8eb737157a04a SHA512 f34c7306fdd26cfb98c330a9b94ae365772f3474a0afcdb29fa5a1197835bcc5839b54e3eb89cde0823ce8283c98313f41b7463a205b5b0b21fa488d596c73b2
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild
index 1b9d4fdd8656..822cdc110500 100644
--- a/sys-libs/readline/readline-5.2_p14.ebuild
+++ b/sys-libs/readline/readline-5.2_p14.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
 
 # This version is just for the ABI .5 library
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:1}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index a4a3e6cfeb4b..a5caff50ed3f 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.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
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/sys-libs/readline/readline-7.0_p3.ebuild b/sys-libs/readline/readline-7.0_p3.ebuild
index 7d3e57521704..195dc5f8d445 100644
--- a/sys-libs/readline/readline-7.0_p3.ebuild
+++ b/sys-libs/readline/readline-7.0_p3.ebuild
@@ -36,7 +36,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index bf883f060350..7bd86fa23ae7 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,6 +3,6 @@ AUX slang-2.2.4-memset.patch 1054 BLAKE2B a4d013b70719de8ab92fbd04afbde87b6be519
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.0.tar.bz2 1532986 BLAKE2B 92fe1338c2f07e78fbffd0435252a75d8158ae0ce6da9cf95cc553bcd8bdd393b7f1c975d516ab732805a006a03db963651736027e052c156910393443053934 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050
 DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da089b9e9a24d23ddd4958cbc43c729e42326b9e487f6356989434ad3029c1c7ae27b49b60b8e9598053cb24f043c8 SHA512 e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7
-EBUILD slang-2.3.0.ebuild 2278 BLAKE2B a80f356174cb2b2fb281db115bbcf4d0ca837c01778926165d282c79d12a93114ef9c4bafdcad2625ff9959404015c8eaf05a4d9d8dd17f164d979b6a30969f9 SHA512 698dc02deb7f95242f9921a03097699bc53311ad55cc5a4483fbe02eaa257ca3c0937ba222bfe109dd5de3f415843ba674cea0d729aae8f87def395a187cd475
-EBUILD slang-2.3.1a.ebuild 2276 BLAKE2B a68178e079210db4f5acb4c4982572330121da7b1f993b43380cd2173e524b6513a70f07c5dbc0e69c40948cb21a78fd68a844830a1471a1305157428bc9ab27 SHA512 bde4c819e1189fb82bf1d1a2d4be5f475888d6c2687b672a9728ea7561ce56601836e169ebbbffc97a3c2bb0df496b220fa1dc6485c29239685fb37dc23cae93
+EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661
+EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.0.ebuild b/sys-libs/slang/slang-2.3.0.ebuild
index ab491005f216..38007ab7d1a9 100644
--- a/sys-libs/slang/slang-2.3.0.ebuild
+++ b/sys-libs/slang/slang-2.3.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="cjk pcre png readline static-libs zlib"
 
 # ncurses for ncurses5-config to get terminfo directory
diff --git a/sys-libs/slang/slang-2.3.1a.ebuild b/sys-libs/slang/slang-2.3.1a.ebuild
index 9464375362ea..f0bda4177ce1 100644
--- a/sys-libs/slang/slang-2.3.1a.ebuild
+++ b/sys-libs/slang/slang-2.3.1a.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="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="cjk pcre png readline static-libs zlib"
 
 # ncurses for ncurses5-config to get terminfo directory
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 554e3af9fcf5..73973965a085 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,12 +1,8 @@
-AUX timezone-data-2016g-makefile.patch 2402 BLAKE2B 9c9393c5a9f656c7a7869601d7833149016e87eae9db50cab463a388685612327d45f3c4289571ce2fbd5568c9833516243051b9b484790c81b16ed578150a89 SHA512 e81fa4e5e8fe9a0a8169a93f197203695d8ada908b53c003e8393dcf22de1be0577608c0e79948c1e9c1ba6abe2875fb7f0f4f80a369e7a2c387b4a52863bb8d
 AUX timezone-data-2017c-makefile.patch 2306 BLAKE2B 35f1e86542103a1011e5073d91a26c9129ebb327a89d577f51ef564450df4a44fecaf3ddcd253a5f7dae67503f9765d7c7e7fa327ebfe010a86981162f460d36 SHA512 e31528922948b7e7204dc791be584dae081f057db7c56b89f2a5967ede5c200eb0661dfd4c9a22428bd1316449986307ffb6e49f1245f899b73393a93c190151
-DIST tzcode2017a.tar.gz 210671 BLAKE2B 1f361234c6bce4572896a07331b7b933429dabbfcda6dd798b415d303fe9ecf4ebd439930b1f54f2b956a27d864ecbd0b0bddb1edaaf49e5b2a29006ecc47bbd SHA512 36d744debd5263b6be39b3a9a146b7db1876f216a4bfc62b46631745861a9c03eda3220f213def86c724d3a11c41398c65c2e5d013ff2c1900e7bfc5e7844025
-DIST tzcode2017b.tar.gz 210780 BLAKE2B fd3c8eaeaee731b80f2873095c4d900b6fad8ac018dafde76be825b28729c1890c59a79e0ad98b2db318098189008fd1403bd2f8f1ea5c6f393ad42f7a50a777 SHA512 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1
 DIST tzcode2017c.tar.gz 219346 BLAKE2B 2ac64949343520c074718b33d42f73653fc2d355a1eb9ffc4ea1f59f33f8a06642bfed9778f99333c49bfb6226b10a263d078b04e2fd3de2a0d1cd35fb1f180e SHA512 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb
-DIST tzdata2017a.tar.gz 323983 BLAKE2B 8b5e558c80ab62ceedd0b41f1a5bc59083dea76df81d1418a4a779a8aeecfb9718cbf05f803b87731b00c9cfba3c2612e99083b4607c7e9f46f4ef114118ae7c SHA512 fe57930711998a0755749a2bf1b32fdbc9e6ee249762017beea52eae7e521236396300fe2d79298fd81eb6d73fb7567884c35995ed248be06188329d937e3873
-DIST tzdata2017b.tar.gz 324317 BLAKE2B aec4ac18b1ff7435754923c62e424813c975d0e06af6001ed1876365b74a2da85edbb076f72861b0ca829e6562651b6f9bdd8d969c8a5f0be993820e2f5cd1cb SHA512 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d
+DIST tzcode2018c.tar.gz 223876 BLAKE2B d0eaf4094c786a71d0ea4bbcf974044790f2631afa6ac5512cd2e787d400b5cf2dd3f2fcd5312f354dd1e57dc500d0134723d55a9ed94037128fc7ca9c29280d SHA512 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2
 DIST tzdata2017c.tar.gz 335571 BLAKE2B 466eefacd5600d15685d973b16d98053b3610efd9a1a9c7c7f1f384dcde8950d037c25ef065a85876433f9e9483fa72c46bb28f9c4225c7fe38a6376ada91132 SHA512 feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
-EBUILD timezone-data-2017a.ebuild 4599 BLAKE2B 921bd7e12a9f5e5a0a636f26998c4e7438838d79270a862c64a149d79576ab1b47241d41ffd7dabeb672f14bb288fb0d1ac4d285a3f2e20aa9516c1ab0c0c21e SHA512 0fc13e2b412819126186dc725210069c89864efb01cafbe521a8345788be8ee3d3b1d59a4e0a624fe6919f6b0418947a64ca038cc26a50bd6f12624489ecdd65
-EBUILD timezone-data-2017b.ebuild 4676 BLAKE2B 8a32faba541657e795f39e92f67899b5c0b076dc14f5efe21124375bc830c362672a6b1181fdfcb2704ef4e01827a2c75f7de101279925c87246eec499176dea SHA512 f68387320004598e1b55612b6228e21f708581878485f08547ce58d3fbbff456b2d6af3fd3810398308784724430fd64202781d0df88d4a5acc676e56e82c2a9
-EBUILD timezone-data-2017c.ebuild 4655 BLAKE2B 5f97b32bd696e62abc030fbe9ae565cdac3350c3caeb6385f400f0a3e4f612bb05970c375a1342d4d961c2807302849358a7cab6d8c9e832a79697ba490a3123 SHA512 7062692fed5e31c71d15c42d3020b05e6a337c880bfa0ee74d78556c20c0ca0998256eec13f73d239802a3c5058aa8a3c77ad81fb7fd5c2c523d15ffebff71d8
+DIST tzdata2018c.tar.gz 341074 BLAKE2B b2aff97cd4e9e094e4de93245e80b04c8aa4764199320beaf02633d16e230fa75908e5f088e67d837d91c7cc6b7a2757f90815fb7a439f35a73d9f59954a7016 SHA512 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
+EBUILD timezone-data-2017c.ebuild 4643 BLAKE2B 839382769d486bb6af71e13f9d80e98a4bc32c832b2671ff9b4f7693420cf3d95675abde53794d39bab20e378ca3df75794860ef29237dea88f01d154e1b5f04 SHA512 3a21c9c3ab764080539ee184a349a189a9259d1878c3af016f984eaa46e16ad5f0227d8cdcad26cb2b8466328298c597ca0ed4e4b0cbe33b9097b237d8a35642
+EBUILD timezone-data-2018c.ebuild 4983 BLAKE2B ac27b2aa19ba8b2c32409fb1e51c8bce73315697fb98c0dd074af10c63675872d9a42a72e5371f1427652d1de224de1b3d37d768596b7fc7bf0b7a385ea7c091 SHA512 6eebd82881dba5450a1ea846bbbd47f2f55f8dbebde6bbc57c099d4e8b312fc22dc9eef5c41170c26677d449fa06de135ab4a06e4c8f3e093f5e25886acb9e3a
 MISC metadata.xml 658 BLAKE2B 75ee5deafa4e9c1336119b2b2b87de6f8520a29f8fa7901c4995bddbb0cb185de9a019ff7703d0a8aa7b2f685a9ec2ca518641ea0c0a1b6123aa05faa04274a1 SHA512 94b68a5195b17cd1a7283a90a42ba9e1dfb0e7dde7c16f48202233cc2fc20ea718a1588b57b2af372e3c35ed403276cdd59456165a225f149a813abff2144c73
diff --git a/sys-libs/timezone-data/files/timezone-data-2016g-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2016g-makefile.patch
deleted file mode 100644
index 83cae6d59a80..000000000000
--- a/sys-libs/timezone-data/files/timezone-data-2016g-makefile.patch
+++ /dev/null
@@ -1,81 +0,0 @@
- - Fix up default paths
- - Support env CC
- - Don't build/install libtz.a
- - Don't install man-pages provided by sys-apps/man-pages
- - Move tzselect, zic, and zdump to bin
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES=	America/New_York
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
- TZDIR_BASENAME=	zoneinfo
--TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR=		$(TOPDIR)/share/$(TZDIR_BASENAME)
- 
- # Types to try, as an alternative to time_t.  int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
- 
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
- 
--ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=		$(TOPDIR)/sbin
- 
- # If you "make INSTALL", the "date" command gets installed in. . .
- 
-@@ -67,7 +67,7 @@ BINDIR=		$(TOPDIR)/bin
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -298,8 +298,7 @@ GZIPFLAGS=	-9n
- 
- #MAKE=		make
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CPPFLAGS+=		-DTZDIR=\"$(TZDIR)\"
- 
- AR=		ar
- 
-@@ -352,16 +354,12 @@ ALL:		all date
- install:	all $(DATA) $(REDO) $(MANS)
- 		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
--			$(DESTDIR)$(LIBDIR) \
-+			$(DESTDIR)$(BINDIR) \
- 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- 			$(DESTDIR)$(MANDIR)/man8
- 		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
- 		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
--		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+		cp tzselect zic zdump $(DESTDIR)$(BINDIR)/.
--		cp libtz.a $(DESTDIR)$(LIBDIR)/.
--		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- 		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
--		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
--		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
- 		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -440,7 +438,7 @@ tzselect:	tzselect.ksh
- 		chmod +x $@
- 
- check:		check_character_set check_white_space check_links check_sorted \
--		  check_tables check_tzs check_web
-+		  check_tables
- 
- check_character_set: $(ENCHILADA)
- 		LC_ALL=en_US.utf8 && export LC_ALL && \
diff --git a/sys-libs/timezone-data/timezone-data-2017a.ebuild b/sys-libs/timezone-data/timezone-data-2017a.ebuild
deleted file mode 100644
index df145b8363d2..000000000000
--- a/sys-libs/timezone-data/timezone-data-2017a.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2016g-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L ${etc_lt} ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ ${tz} == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e ${etc_lt} ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	pkg_config
-}
diff --git a/sys-libs/timezone-data/timezone-data-2017b.ebuild b/sys-libs/timezone-data/timezone-data-2017b.ebuild
deleted file mode 100644
index 5ecd0a12ca0e..000000000000
--- a/sys-libs/timezone-data/timezone-data-2017b.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2016g-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L ${etc_lt} ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ ${tz} == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e ${etc_lt} ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/timezone-data/timezone-data-2017c.ebuild b/sys-libs/timezone-data/timezone-data-2017c.ebuild
index 3f327a73d924..51555287f37a 100644
--- a/sys-libs/timezone-data/timezone-data-2017c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2017c.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.ta
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="nls leaps_timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/timezone-data/timezone-data-2018c.ebuild b/sys-libs/timezone-data/timezone-data-2018c.ebuild
new file mode 100644
index 000000000000..7f59f932db46
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2018c.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="nls leaps_timezone elibc_FreeBSD"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps_timezone posix_right posix_only) \
+		TZDATA_TEXT= \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L ${etc_lt} ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
+		return 0
+	fi
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${etc_lt} ]] ; then
+			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+			elog "Setting ${etc_lt} to Factory."
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 4fe4d357d02a..a1d07178ff88 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD zlib-1.2.11-r1.ebuild 3168 BLAKE2B 32994826c539cea0cc8cd9f4e229830179d331ad2e93e8059939ab6d34de027f2210b061933a67d04107eee887a2b9086006eb1600006f0f0a42b3c4fb9b8cd0 SHA512 68dbd9758b3f9f978f3856ed8617452e6552f1615dd4d2edce5711da82b451f6577e2360e5e229de0768494515e76b1dcdffe3603e6eba92722ece73c3491740
-EBUILD zlib-1.2.11.ebuild 3102 BLAKE2B cabb8527d233cb9d2e3dd08b2ec27b5b686d2a29efbc58df66c849739788375dd37a00fb694531c1a1d733f5f579c48e886d795d8ce6804f0c5fe34527d3267e SHA512 d423c1019803166a5f4b14a4e6bbf2119d698eaa9977c259140e2e378e692721235e6b6a45279fca1f7928e4c3d18c3e430f73ad994e69f4b4b3213b14668ee2
+EBUILD zlib-1.2.11-r1.ebuild 3156 BLAKE2B 1a42944c8de41ec49981cab03c2322952af723377c41e0a834a813e62e2d95be612fcae4541fecf528a11ee36ae19ca138fe1905d7b2b7570d8001307e484a85 SHA512 d326a004c18339fb98ad721f0276c5b9e12996f1567b18ed13fbc7399a55142dc6dc11f98c8840014d73e2a1b49c75c23024e6f58b7125ce5cd3ab3aff18ed21
+EBUILD zlib-1.2.11.ebuild 3090 BLAKE2B 977a4e8a7ea2740670669b1a9dbfd9df4ce7b420ee2d9a4b49361fe7357914b0d61c93a59489f31946990797157594a7e95ee7e244406c2889aa0920ed865ee2 SHA512 ca1bf1dd6706d8e116845a1e6bf55b4cfde9d57dcd8bd03f9f66afcbe83e4a4770a41fa5f400f878cd30dad0615ba452b5802bd4447d98e2fd098a69e4dcc8ff
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
index 78681fd43a20..72a283b1cb0f 100644
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-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
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild
index 8880513349a7..e8653b406ed5 100644
--- a/sys-libs/zlib/zlib-1.2.11.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11.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
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index a7d69275199f..6baf7d05fb2c 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index dbc8b8feeb19..39630ac68359 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,4 +1,7 @@
+AUX powertop-2.9-libc++.patch 1182 BLAKE2B cad53198b44a1b402995207c33e33d06cec5f2994f3acb2b03fd81cbf78d5e7b85828fbbc1290b0308494fd29fd5c6b8b886bed7d206e530835db9d559963652 SHA512 ea4925df50118e0394e81a1eb18fc2559d7459065bc9e10978e60bd9ada0c757583b691cf98f4da07be9545163663cb993db72774ae3963b7873500767b86972
 DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
-EBUILD powertop-2.8.ebuild 3316 BLAKE2B 2abff4940a54cd69899acd851ef7539447b99dc231ccb5c5465c7b3f5ef9dd9dfb65e4e9e06de129b4ac1d21f18a206cade36d44e96a8873fb0dbd6b3ae1ddd4 SHA512 89fddfe5836f3c52e83761eea4b58eadbe89354bb1a220bac798a637e9eff349cb5273df563b74bbb96413a41cc487a917fa4fbde65faeccf0ee9ac18c548d49
-EBUILD powertop-9999.ebuild 3575 BLAKE2B 39a2dd7a0e0bdd42459cd9c3605d934935b230d63e1a4db087abecc37f5d7c1f39325f192a5adb9f4fd79933122f4c423c9feb0b28b61f1f0c928e510207720a SHA512 c4f4fa75a57402806a1eb80183aea4c2dbbdbc0e9add49ccfc216445334674a104308318ff5fa228585cd1754c265a202465752fc043718843af49878937bc3e
+DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
+EBUILD powertop-2.8.ebuild 3356 BLAKE2B ab7b2846e8752558a56545e94fb036d7c4f5322cf02d29b3f9c30e76c3f3b9690e2cb962c8180991b169363bc22d1109fd4139a287f87cf6c53edb251d659cdd SHA512 e243fd2facd6195480a121d665d80ce049561713d81a1165ced9a18756d2ac9728620b83c0c6acbe9433c5a87e568003f70980b77d1866b302a55d22e75c2e90
+EBUILD powertop-2.9.ebuild 3709 BLAKE2B 0c33754aef5fa578e3081f4ea4bbf1f57b954a4c881505011f8341d97b3b7fdce8b2de250658ca14d5f2fd4cfdb5830c0a6693a757a59f1022bc33e1f713bf6d SHA512 31553e19089a6a510891e3e26f68f7b135bb04da803802ed1ff3df7a1c372bfe6446ccb5cc85a3794348a7912fbdea040b0c5107842df8ca8b52b7a1d3c6717b
+EBUILD powertop-9999.ebuild 3663 BLAKE2B b020232c48201403e5467004745f82dad3f25231107b8bd6b227b257f20611a305545195a3ff89a7990a05f4cca3d73c761966af4d0b61b663118043fbf0e522 SHA512 9020b3bb5e59d05150cc8e3bc22f18d959c18c08db02256f1b06754a1a4293a04e400fe3d37b1a6910ff4f167221e2b37abf67a52d13d76a9c4941d7d6cbf8d7
 MISC metadata.xml 253 BLAKE2B 48f33288fc58b41b96f50af29bb4ce8989e714fa989ed445afc8933d1483e1026a019783805ad1b42399227819f461ed5c874df1c78c4bf144bccd07306ee995 SHA512 fad4a58e4c2a6eaa8bbbdc75e3995b5da53c9291f82480e35a9badfc1374bcc484663f2577790a46218be90d3b42bb45620297316c5493bc4a46af0dbd29189e
diff --git a/sys-power/powertop/files/powertop-2.9-libc++.patch b/sys-power/powertop/files/powertop-2.9-libc++.patch
new file mode 100644
index 000000000000..d378280f3c68
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.9-libc++.patch
@@ -0,0 +1,44 @@
+https://github.com/fenrus75/powertop/commit/b9c431aad6cc5383c9571007469eee8e64ec85a6
+
+From b9c431aad6cc5383c9571007469eee8e64ec85a6 Mon Sep 17 00:00:00 2001
+From: Manoj Gupta <manojgupta@chromium.org>
+Date: Sat, 4 Nov 2017 13:44:04 -0700
+Subject: [PATCH] Fix powertop build with libc++.
+
+<ctime> header is not automatically included with libc++.
+Add it explicitly to make powertop build with libc++.
+
+This fixes the following errors:
+devices/gpu_rapl_device.cpp:35:14: error: use of undeclared identifier
+'time'; did you mean 'tie'?
+last_time = time(NULL);
+                ^~~~
+devices/gpu_rapl_device.cpp:45:14: error:use of undeclared identifier
+'time'; did you mean 'tie'?
+last_time = time(NULL);
+                ^~~~
+
+parameters/learn.cpp:161:10: error: use of undeclared identifier
+'time'; did you mean 'tie'?
+start =	time(NULL);
+            ^~~~
+---
+ src/lib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib.h b/src/lib.h
+index b64bb0f5433f..6d85eb6e4b40 100644
+--- a/src/lib.h
++++ b/src/lib.h
+@@ -54,7 +54,7 @@ extern const char *kernel_function(uint64_t address);
+ 
+ 
+ 
+-
++#include <ctime>
+ #include <string>
+ using namespace std;
+ 
+-- 
+2.15.1
+
diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild
index ab67bbf8ed91..e0975e47ca83 100644
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ b/sys-power/powertop/powertop-2.8.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
 		~CPU_FREQ_GOV_ONDEMAND
 		~FTRACE
 		~BLK_DEV_IO_TRACE
-		~TIMER_STATS
 		~TRACING
 	"
 	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
@@ -58,8 +57,7 @@ pkg_setup() {
 	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
 	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
 	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
-	ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
 	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
 	linux-info_pkg_setup
 	if linux_config_exists; then
@@ -84,6 +82,11 @@ pkg_setup() {
 			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
 			check_extra_config
 		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
 	fi
 }
 
diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild
new file mode 100644
index 000000000000..a46c1a302cbc
--- /dev/null
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils linux-info
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="tool that helps you find what software is using the most power"
+HOMEPAGE="https://01.org/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls unicode X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses:=[unicode?]
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libc++.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ_IDLE
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TRACING
+	"
+	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
+	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				check_extra_config
+			fi
+		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 3 19; then
+			CONFIG_CHECK="~PM_RUNTIME"
+			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
+			check_extra_config
+		else
+			CONFIG_CHECK="~PM"
+			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
+		scripts/version || die "Failed to extract version information"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	econf $(use_enable nls)
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 8d4d40d26b93..62872e31be8e 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-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"
@@ -9,8 +9,10 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	SRC_URI=""
 else
-	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="tool that helps you find what software is using the most power"
@@ -49,7 +51,6 @@ pkg_setup() {
 		~CPU_FREQ_GOV_ONDEMAND
 		~FTRACE
 		~BLK_DEV_IO_TRACE
-		~TIMER_STATS
 		~TRACING
 	"
 	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
@@ -62,8 +63,7 @@ pkg_setup() {
 	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
 	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
 	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
-	ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
 	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
 	linux-info_pkg_setup
 	if linux_config_exists; then
@@ -88,6 +88,11 @@ pkg_setup() {
 			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
 			check_extra_config
 		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
 	fi
 }
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 73ac5aafe4ba..81705b14da9d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 987292839716..4f689183b254 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -14,8 +14,8 @@ DIST criu-2.12.1.tar.bz2 646855 BLAKE2B b3bb7fd7b9006dd60346639c0d86954fa083de3a
 DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875 SHA512 ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 DIST criu-3.4.tar.bz2 701680 BLAKE2B 16cd6bde7f356322b979c14823d6f22ffc64a3104ca185c7407a97d7af9dc7a83bb538c86e7a93bb7d99c6a01eba309435d4e1e80033a90bf386d235871fca34 SHA512 71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
-EBUILD criu-2.12.1.ebuild 2419 BLAKE2B 7744791f874557b42cc03bcf35857423c1e8063655d528ea4abbe881376798d621e5d5cac156481591bfc54632558e92868f0ee8713ae6e394c1f297a37db964 SHA512 b9b6778fa3737115ce44409f92a11aab988556914dc173bc64b289a210b15cca94cb6310c005325b167298723e25869a7af13445857774bd5d9256f6dfcd292c
-EBUILD criu-2.5.ebuild 2400 BLAKE2B 43cd7ebac9ed3a9f171056e338557ef5d8f898a597dbc3052bca8c0d7d33363fd09bba71c1cc6cb457103858ef527c1c79e5024812b687e41a021cada044870c SHA512 234732d2a5267fcb757cbc9a116041cad81366bba9b9ce7155733b195146989aaab634f4ab073dfbc19621a5b5b6070b560440d53e1b77747ea58b675e538191
-EBUILD criu-3.4.ebuild 2331 BLAKE2B d4e239a8960236a624e6abf1c45adc0b4183742f5cd4f4c7906d1f06053d77b31d55bd7899b618fd7c3573ece55819b5694b03745cdc29e4adecc0f0643ff668 SHA512 3e0837e12873e795df846355df350ae9a5eb2c17f66218fde84205fdbcbc11dde35dd99c92f0be9b4cb435e6d3587c5580bcd08de9e1ac616f48de3970ce9199
+EBUILD criu-2.12.1-r1.ebuild 2419 BLAKE2B 962796151a06a2a4e8bd18c3986dc56f126457b97cd915960e5924f7338c580ed9aad0a078e1381ab0c327632eefde2d540e45691314cb1af49c88583a1e4c66 SHA512 653b81f9f0b668414ab5bbb89af492d0fa5bace24d99ff0d1f82e6aff1badef02fbfcb6506328bb7c462aaecb5dd4b3e839b707b4c4e21083e23b0f81e5bdf23
+EBUILD criu-2.5-r1.ebuild 2400 BLAKE2B d69f86d8cbe441515adaa45f60f394193c4cf0d66a138762b9cf2a9e3687c2b283e293f3ddfec06606421c8c57dd4d07abf0ed9372b9a3739a25e137432551e8 SHA512 2f6511dad5b89065430ed58786c4b12f539cdf0222c655eff5c9635ab83e4fc7bee4dc2f28dd8be5423078c6fb6f00beffb20a388962aaa99f16c06475cb8610
+EBUILD criu-3.4-r1.ebuild 2331 BLAKE2B 3555508c91ed9ff280d30cafdc1de4fbe91032e796cfc9cc065eb09a19545adc67fcd55be08288809f37b9d1c4ec94b4d4d125e90a8bf50c72c2ff0b41c26636 SHA512 72be29b80857de3110970182e2684452afb0a7fb8e6f14d952d2da1b64509945ae5ba0c853fdcafdd743fca3c7a5d28a98a5da09b802f82dccdcb0c9740f1a3a
 EBUILD criu-3.6.ebuild 2595 BLAKE2B a834b690e575a9b1cd6dc1d3d8109037cd9ef8942c6f3d4096c479201a0b9c2fe3d5e3714b2d8a4a448e377938d19dd5c3f4dd2dd3e75b810d68752a94ffc208 SHA512 464aabd062cca613fc10f6976c7a798404f3d6d79d9f9aa7d9c3d849ffa128c66404a14cb75cb8bfa5eb17595b04e62f1a6954cc35db8a4df9cc8de7e0663183
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-2.12.1-r1.ebuild b/sys-process/criu/criu-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..bf72562e14c7
--- /dev/null
+++ b/sys-process/criu/criu-2.12.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+RDEPEND="${RDEPEND}
+	python? (
+		|| (
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-libs/protobuf[python,${PYTHON_USEDEP}]
+		)
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+	"${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_compile() {
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+}
diff --git a/sys-process/criu/criu-2.12.1.ebuild b/sys-process/criu/criu-2.12.1.ebuild
deleted file mode 100644
index dcaf87f2ca35..000000000000
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/protobuf[python,${PYTHON_USEDEP}]
-		)
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
-	"${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/criu/criu-2.5-r1.ebuild b/sys-process/criu/criu-2.5-r1.ebuild
new file mode 100644
index 000000000000..71416acacc6d
--- /dev/null
+++ b/sys-process/criu/criu-2.5-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64"
+IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/protobuf-c
+	dev-libs/libnl:3
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+RDEPEND="${RDEPEND}
+	python? (
+		|| (
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-libs/protobuf[python,${PYTHON_USEDEP}]
+		)
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_compile() {
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+}
diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
deleted file mode 100644
index c234bdc1508a..000000000000
--- a/sys-process/criu/criu-2.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-	dev-libs/libnl:3
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/protobuf[python,${PYTHON_USEDEP}]
-		)
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/criu/criu-3.4-r1.ebuild b/sys-process/criu/criu-3.4-r1.ebuild
new file mode 100644
index 000000000000..37f7bdf70e91
--- /dev/null
+++ b/sys-process/criu/criu-3.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+RDEPEND="${RDEPEND}
+	python? (
+		|| (
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-libs/protobuf[python,${PYTHON_USEDEP}]
+		)
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_compile() {
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+}
diff --git a/sys-process/criu/criu-3.4.ebuild b/sys-process/criu/criu-3.4.ebuild
deleted file mode 100644
index 2aec9b89b4a4..000000000000
--- a/sys-process/criu/criu-3.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/protobuf[python,${PYTHON_USEDEP}]
-		)
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/cronbase/Manifest b/sys-process/cronbase/Manifest
index cd405adeb2a7..56b7bb2479ad 100644
--- a/sys-process/cronbase/Manifest
+++ b/sys-process/cronbase/Manifest
@@ -1,3 +1,3 @@
 AUX run-crons-0.3.7 4942 BLAKE2B 41be25ff5b647179dda723d44fc1441293ab8287427de9febedf49596cd816cbfad0fb98d1bb60602bd198bcef72eb8d5c9cfe01c66e09270bf653c2c6a6f650 SHA512 eb4f298fb67d7ff3e82d19e6a27f3f1df4b1abab86bd78f3ea85aecaead42a6c194773c21d63d081b62b0eb45cf2bdeb78b43b58906500e6bb52613f7e6bf164
-EBUILD cronbase-0.3.7-r6.ebuild 674 BLAKE2B 979f019f4e0a6daddeddfb68f7d81c7683c8fa721087c9c473fd869354b3d54c98c5ddb6fdc8262c673fc7cfd214f624c96a925d3e27237fdd0e656736b29d1e SHA512 521c30e7e1f15e03dd219c71db14f4059e7da09b480ab89aa7d7bda63eade23d7e233ae0d20bb1867155d20a9fd192a5396d9468305bd9216e8e821e53b404ef
+EBUILD cronbase-0.3.7-r6.ebuild 662 BLAKE2B fa55eb3db28ee8f41af05a8ad2697a9b98e7a759ee08ceb4a0b0b1ef27a9bd24e8f978dd9380deb64224460293e06a083eba21e21c7daf83c76583ab9928c5b9 SHA512 3ee57d8085f346f692105e6daa191e6c74c3fc0879dbdc7a7e7c3179d0ffcd1e8c4c4a2624320e858b8384712a6096bdaca3cc6e57ece7329adb401439a80fec
 MISC metadata.xml 369 BLAKE2B bdbea0ba5cc613c732d540aecf428dfe6c9984d71b8babdc2e925088fdc6cc42393fc1eee7e45360d11bda71e57d68b2f6425b65d90f8d6da7e5c81f51fd8e19 SHA512 6d24db6708277a844f149eb1c54aac57cc84bfe9e5e1b66eeebd478a283263f5097760f2df2588676d626615adf88ef9148d2a794e391f04f3cdd618c4c7ce93
diff --git a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
index f571702f9ed7..ed71cbb65704 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-process/fuser-bsd/Manifest b/sys-process/fuser-bsd/Manifest
index 153263573d13..b1e73a450147 100644
--- a/sys-process/fuser-bsd/Manifest
+++ b/sys-process/fuser-bsd/Manifest
@@ -1,4 +1,4 @@
 DIST fuser-1142334561.tar.bz2 11008 BLAKE2B 9aae4c2e9bce4ff459864126661485b173542a2195972eb9b2e543639875064fec702d770154157e82388af2e2aad954ceb1a8b5dfe59b664455f2e79c68ddb5 SHA512 49c6a2773da47a55c59210e878c40f3313cef21795ab5c67bb61632a5d8bc7857f9e3501f54029b3187809bb927ae93690687a0cbcf34e296b6e53d6e9dc6ee4
 DIST fuser-bsd-patches-1.tar.bz2 1694 BLAKE2B 09b6fda0f9d6b5b7c4fde67c4a7174844c81dcc354354abfd15cce35da345b324f23600df0f60ba7bf0f38035e0de602caba7f48fabc9016661cd3c85ef4ad49 SHA512 7dad917c3a9ff628f4fe6893fad5aa42d1e206182ce9d7b831fd3713b2757b39d4134a1d4f085e0ac90ea392fae6006cd446944128035dda5e4272b778457ef4
-EBUILD fuser-bsd-1142334561.ebuild 813 BLAKE2B ec825a646f940205fd6eff26761f8ae7957d34dbf19235f4c111545c2c83d48d394914b2c4c5bb28388e606d62845977aff9890baf8d6077f2f8817a0a17d060 SHA512 ec1e03e841c87fd5dc5b30ee6c0c2afce466f510490305279f74f80afc047fc24c087c8bde0378b7cce6acb6a37e36490ff5b8f4155cd01343e99c0200c6455f
+EBUILD fuser-bsd-1142334561.ebuild 801 BLAKE2B 65d81bb6b5fdd794386e62b8bfb55ae51a0c7b93898301accf1be584f1ae837c3f47e179875e0bfcbf23d0fac227b6ed549cb5efe46ff4a3eefc5821335d52aa SHA512 7f5e4e5d2a0cbacdebda9aee8cd923272e998005f6dc48affae9231b411f1a04a12bb076435d6f67f7eda520c1048c40a64c37a8c1c06e25a6355fcd52753f03
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild b/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
index 5c43d028228b..31ba1b8b40da 100644
--- a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
+++ b/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -15,7 +15,7 @@ SRC_URI="http://mbsd.msk.ru/dist/${MY_P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-freebsd/freebsd-mk-defs"
diff --git a/sys-process/pidof-bsd/Manifest b/sys-process/pidof-bsd/Manifest
index 474baede0049..e0c51b1ce92b 100644
--- a/sys-process/pidof-bsd/Manifest
+++ b/sys-process/pidof-bsd/Manifest
@@ -3,5 +3,5 @@ AUX pidof-bsd-20050501-firstarg.patch 485 BLAKE2B 669d832cbe90d0ec716fa9b544b9ae
 AUX pidof-bsd-20050501-gfbsd.patch 2825 BLAKE2B 48972ae404a5f0da4eb73d4a203879625305d351b2b2a759ce50f1ec33d746765329dc41dfd377e2d046c90c5ad591e0947d5ab5584c604cd49315975d76df4d SHA512 459bc1bb1452067207082c2b55ba86e47cb5a683cbc2ddf8b10545d8e961a0a8d9f5bba34236e150e391056364a4115be975b30e34df4c3dc82ed16bdad981a9
 AUX pidof-bsd-20050501-pname.patch 1374 BLAKE2B 3af207c7370141f6ddda3083902735bd0eb78c339540ece462d6ba7533c30e9978d4789fb624ac2cba971b10f5aff6004b198ab00539a84630c598fe9fb8c46d SHA512 5f3912a0f48db867181def6a6bb36f3544b069be89af0d0290d073f7d92041abda449c8b84694fed45e1d35a50bfa4bd157d695ab166fb61cc3b6c8d99e5f417
 DIST pidof-bsd-20050501.tar.gz 1769 BLAKE2B 6f64d23913e08adc52eef5550becb7f54a1eab805e1a7fe7883632756647bb633d617486fb7a4fa09459d32cdcfb09f41b5c157cc877a71fb07744e2cfced562 SHA512 27691305165848363415a7d487b36a87db0750a9c08e6327eef05f5e87326c91fbf46c415673f83268981a22bbfcfaaf5ef280c06c24b3ebb50d1483527f9c94
-EBUILD pidof-bsd-20050501-r4.ebuild 657 BLAKE2B 39f5ec41c5a317427a8f094dd86e5016b3f1b2473ddd3319452cffdcd942d2ae7864bce7b4b711846129c817a1e75fe33e850f48180b499896cf2204618a2016 SHA512 c01bf95df2455943b47acc303472698401009e10569f2a12b0008c6ca254c2ce3c824289542e50c4a4622a26a756a2e91c95092d7ca95adef9d1dc8b3eb5e918
+EBUILD pidof-bsd-20050501-r4.ebuild 645 BLAKE2B ccb0b90b39f3e5333d639c5ce32ab682a0c8a3cb7bab2063cd5c98a514670929b24fce11b3a8ae476f099a765f9b5dc1c73db2680e848825b7869f9148912b71 SHA512 348108d99edc1af4c49182d2d093f6c323809b63907c00ecc879ff88aecfdd733989c0a5039125e2cfabc7ff4756094c41b455a67b6615cbb9ad3c22a02ab12a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
index e40003dbc400..b8b39ec69cc5 100644
--- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
+++ b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-freebsd/freebsd-mk-defs"
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index e0275838dc07..91a727acc2ef 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -4,7 +4,7 @@ DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083
 DIST systemd-cron-1.5.3.tar.gz 29105 BLAKE2B c7c95df9be0383aa39a8525d3a5179a04ef1edc77d6c0e34095eb0fe26045c139e4d0c340d6999405baa99d00181cc6c2fb14d87ad401a685aaf3ad7adb5e006 SHA512 ea0241f93b8d92497fa020d84630ee153dc299d9b16b17567784a4dcb5ddf0a4589e7e033428562a862218ef79b192245178df2d7dcc69f779ef9156921674c7
 DIST systemd-cron-1.5.4.tar.gz 30436 BLAKE2B 5ce72e30e68cafbf812690704de4841d0436a97e6a9df12802374a0ef7fe2af4294310e4c14c68d5aa2508c9664402c17dcacb7b6a637f7b83853d97c78c557f SHA512 e6fe60de9d6cbc223b8358bd6b1a060e11f1ea16a8f0b24662914ddb18d827f7b4c62fd40dbefed3d0ac38b1e748998ec5e0430d4ea751e8a20b94b9803bcb89
 EBUILD systemd-cron-1.5.10.ebuild 1934 BLAKE2B 89898ee41545514cd1bab1000aec1ed90073a913aea45bad41dfb9e7f05a4f1bac2b744613d1b3b808a1ea7796118ae35c15264f60c18796934039861df27235 SHA512 08ad3edca36f7402aca3e40ef4ce048f6dd4d238fa6cccb4e8fc287c1dbc885321275a8364d9e0a34f0af29dba8c654735622dda62df6e24a10d6cd40e9a4112
-EBUILD systemd-cron-1.5.12-r1.ebuild 2038 BLAKE2B 1da19673c997792ac515cc297d4924f08eb6ba05ac2797c8809435ec788bb753296afdd9d67904d86e2bc3d1c40b1d8ec6f3e456bd2df41524e491180c3072d1 SHA512 274ac736b4f10ae2b59aa038456eb85b0d7f78ff3d24d3c94407262ca0d07faaa14539f0dd2dec1d6e5a7b4b4d1a41bc1da137eb8d5a4bb0be1985ec919df933
+EBUILD systemd-cron-1.5.12-r1.ebuild 2037 BLAKE2B 88c3b2716961dfc3d6eb9ec5724ad5b75c1e2a4e1e47b1b7f1360c07dd4454c490794866659bef53fb171b7cf3aa78fb6a39edfb1dced23c8cbc358941688180 SHA512 175dccc3f04e0169daa98517067151b8fed1a0c22eedbbcf5b9663c0b7f5b8ff970282bd5a8859cfbd0a78112d25ee77dc3409ba228297e8152854fa3acce21d
 EBUILD systemd-cron-1.5.3.ebuild 1928 BLAKE2B d62cf3310fa4af92735f0d4552420e07319c87377488e788bf23fd2db7d78d93c41dc3f15b0c4f9f23ea6245092155fb2101bbc3ee67a0fbd28fb862d17387d4 SHA512 5e370da06605db4f6d2366628ecbd498894302278795b530e78c16ef941b79f1aca94b2ae115c76544f53023429990708215b649cee30c18ef46dec45dd397e9
 EBUILD systemd-cron-1.5.4.ebuild 1932 BLAKE2B ffd5b09ab515b37252a43060a9a936a8461c3649699088d94e927cef81189acbd72a75d020809cee93fb78386ceb87a637d8026f0f5d364e8823b7e501135cb8 SHA512 d021886a0c23a7096097467b0794b0cf2756ce09af31a2f510fdefd3a8631c79e79383d153d60cba168d90e602c59d848a884722f44afc76f058af3d3205f519
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
index 44cfac6b53b7..c2c3644c42db 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
 
 RDEPEND=">=sys-apps/systemd-217
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index f6539c5f40a8..e2d6c1b10b12 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -6,5 +6,5 @@ DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c4
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
 EBUILD time-1.7-r1.ebuild 557 BLAKE2B 8d590bfbc57301a251d16908277f659d974eb83a4f121903782626b61b8fd852ccd8b38e641eb0c82489fc555a1450e03a5deffa1ff7fe2ffe7c832060d312b3 SHA512 5b627020ad01ba84c38cd154eede8bd1e9cdd8ff26ddb43be298bf1dc06720111d12d583e90997c8fdb582805cef40bd20ad5d54deb26b15c30e801efdc1fd69
 EBUILD time-1.7-r3.ebuild 643 BLAKE2B dd0f80a88ce6217c1e14248ebc51629f745dedb882f7853e249df18424ebda5638775e00233a7299282c5d3173dcdf0c7d6b55172cb336e480f250c1ee246dd3 SHA512 385137702371965342aa1178b21ed070f8bcc26a771d6c3d42e80de0bb2ce71ddebedb0e47fb833edf37aa148acbb06b690200fd3ac2f900ee46326466c2149f
-EBUILD time-1.7.2.ebuild 684 BLAKE2B c6dced0cd6f76fe6fedeb6af9368bea78fad2852d9b551a15ef15fee0ae672b5323375c3232b9f248b59661651537c3b6d2935d6bf0fa3d13f298c57e7a846e9 SHA512 2042c4de90f9af8ba856c50d34bcf1d2684977cc7c2b9019187be246b48e872158d89527748b9c0fee107041b5893a5ba0960295cb74e3ed2a46ffe4e3d2d075
+EBUILD time-1.7.2.ebuild 683 BLAKE2B f5e4fee69b16f75efbdba077cda680b5c294e38155427bec7f3bb422933d1188d719d94c0cd626f51c5d358c521372cd6c7cb18bf20febe81378d4e0a073f689 SHA512 fb9fd063b22f08caadb404d9f0e37cffa3b0e478e84a6fcc8a0a6a7852f05441596997b59b67db77db085ded85e68fa3c65a603f93f2cb7be98a598d7c14d473
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index b2a9570ce1ae..2dbebf19cb45 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest
index 40d5bf1737e3..a23246a71cb1 100644
--- a/sys-process/vixie-cron/Manifest
+++ b/sys-process/vixie-cron/Manifest
@@ -15,6 +15,6 @@ AUX vixie-cron.rc7 239 BLAKE2B 64248f4d67ba35ae9c4cbcc9f800782a4da9c0b8780b326cf
 AUX vixie-cron.service 178 BLAKE2B 2ef614075505ef9a48b89ae46d21c5c3544db711b430eabc04870b436437d9b194963b6da572c3bf2c758c4fc7aa37ee90500a1e72fc135ecb8a59f7582ebbba SHA512 09af14c9010c55c204db8755872df531d0e28b473d56f0b5f99c037e2183e2f9e2be9cc66895f4da2036b74efa7bc472e932331fac13722a505ae2be400a068d
 DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 BLAKE2B 1e276ade20e61ae17e45c10145532e3f32dfa74e32b6cbecde22863de82afb280e97d3b380626451524cfc7fc0663934657509b228a51b3b5ad42e26e5cceb3d SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b
 DIST vixie-cron-4.1.tar.bz2 54246 BLAKE2B 920bf5d95b24cd41677f4a748da02231ed75713ff280acafdf476ad0a71e73068bbad9070fc57d3b0cb39a9539da24182aa2dbc9eb9dfe241adaf9a46f9c5db2 SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04
-EBUILD vixie-cron-4.1-r14.ebuild 3493 BLAKE2B 79e6af2f9940e9d183619cb89b0251e502ef62126a553958d7e0499e3979bd72a60ce7cd22f5178c188e31591a03366bf3c263799576da8e1aed8feae3a29a80 SHA512 b51b9b7b81394c285db9b1a44aa4cc0b194c0b9480fbc1a57cf644db6b689b5715a763585c6145b8551a44e1676aabe409bc08c96a16de663c57d14184079c2c
-EBUILD vixie-cron-4.1-r15.ebuild 3498 BLAKE2B c451d338e740f9ca19bdad4080a26c6f9d581305135887754de657d9ba750e5ee1cfbefc1039cc73f74d2a54bec9cd64c6a817478e442ba36a5cec0a3b6afa29 SHA512 a1fe07c5fc7bf260cfbc4b9d3d508a0c486111d5e3569097d780902aae11dd2a0cbd9f8b2fc4f60046b439d65759b4f14ea1e0831dafde18bc5f489ebdf972ee
+EBUILD vixie-cron-4.1-r14.ebuild 3481 BLAKE2B c26a872b822d134a7bffe26460f308bd1f8f3fc214745fb4d23a40a1cb291d2823450831238949b933ea8e90a19aabcb90cf2c632bc4b2d090ecb97fd72b8916 SHA512 82ce946e83acc561b99ad435290be9afcd2d1eac85e438e5b152483522148c8f0b77436df8383f2d4c152aa657bce6884f95e5131b16d7ea269616a8e6d7e804
+EBUILD vixie-cron-4.1-r15.ebuild 3486 BLAKE2B 453bfe44fba4f9c16ca31583522911b3693278dd41627784f438274bc3f56100dd27d0081dec14232c8c574e60a2486537c75588c762ab7eb8d1ea0afe49f954 SHA512 d3165b88f7aae5f38de7f17ae2289aa0b194c91a062998cb074d3f9b11e57f6aef51834cefff06c78ca3994bae0a541e1cf6dc03b7e0ad8bb21ac1850e72de80
 MISC metadata.xml 256 BLAKE2B 7f6bf423ff7b1888b8b0c774896aff78d7e367bae5dcedebd27a9f0f844102d6904223a0fd8dbfa5cd568d9447be548580aa0f83de5373ac26eee266052e58b5 SHA512 155f3cbb14ae54e9dfb98e954f6bdf7f23bf5654ae2d00549f7722085a7243d934dfd99d6f1325b00dcaeb50c5344e818e602dc4e2fe47dc7aeb1fdb77668521
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild
index c0ddaff47e92..3fb29c5ff60a 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r14.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
 
 inherit cron toolchain-funcs pam eutils flag-o-matic user systemd
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
 
 LICENSE="ISC BSD-2 BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux pam debug"
 
 DEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
index 465243348865..963f4523634e 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r15.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 cron toolchain-funcs pam eutils flag-o-matic user systemd
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
 
 LICENSE="ISC BSD-2 BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux pam debug"
 
 DEPEND="selinux? ( sys-libs/libselinux )
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index dd6d560dbf10..ac416ced36cb 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index 8cd47a65ca19..acf6d939574b 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,3 +1,3 @@
-EBUILD awk-0.ebuild 420 BLAKE2B 383302187d57585ddd08c340af9206cbd6397612dc0f5e79cc65378b2a5612d8d607fb4a37316be4d614f013182b1266c27614a49f69884ff7115f7d525b7e89 SHA512 781f829fc4daa53088dd36114f0b7f446a966c69e50210f36c6645ec9771d8d3e4836a8fe1308a4c110d66b8bddc917fb29188a42f2095f96aa5f45b4a9e8970
-EBUILD awk-1.ebuild 514 BLAKE2B a9462e2eaba67047cd4743259c084ce27cc92a0a46d81c90a9af0b7c037403fe7c6ad6f86776d4c8626daf7f3910adb830c7f76f228c8a9f9de27f53fee16c99 SHA512 5dfd1d72a71c4519950829a0471695ea29604c4ef89ee26327f6bbb29a75e634ecbac93ca6d5bf3194a87c70b016fc8ecca30c411c5b3da92407c30377d84d43
+EBUILD awk-0.ebuild 408 BLAKE2B 5d6ee10a70182c72af83e58480d5b549a92acf11d7c573a72cc3839d00cc8193a3e94ae61381635344b1095ba9b5d2646eb5ffb49907508e7a0243a2af72972c SHA512 6d289e013bbbd00ca8a61d37574f55c6a6c5ac3e9efb0345b1d0dcf55e34bb5293d7186bb848cc2190e1f1db906f12b825711c81f70cd812c509e08a57f816fc
+EBUILD awk-1.ebuild 502 BLAKE2B a00c51fd595815ebfdc2e1868034eca01a60cc8bbf2475f6a3f591161c1ec69a7fd19c08690a42f8720a11623dbff730ec7ed56234abeccdde5c158aac3fa86a SHA512 e8a7a556e1ddf70eed000a4ecb136a61bc1db6b96cab8a4e6b6d7c7fe43a45f357cf66f9c16295641ab1eb5eaa8559f2c9291108517fcab47fc87bf1e715e109
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-0.ebuild b/virtual/awk/awk-0.ebuild
index 4aa2a627cc14..fba60ff9408d 100644
--- a/virtual/awk/awk-0.ebuild
+++ b/virtual/awk/awk-0.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=5
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+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 ~x86-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 5bc5a199c2b2..4dd38cb4881a 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.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=5
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+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 ~x86-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/bitcoin-leveldb/Manifest b/virtual/bitcoin-leveldb/Manifest
index dd450d68fc48..1ba6b592cc51 100644
--- a/virtual/bitcoin-leveldb/Manifest
+++ b/virtual/bitcoin-leveldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-leveldb-0-r1.ebuild 408 BLAKE2B 720f605e3683053a97d8a5095c68b6a05988d2fd965156a9d3344e64a600e7281e8513f5ce7c46ce3495c03b63497fb88d5318444fc9e99205556e915bdb6b4b SHA512 f42353e0db76c365fc61b5b5265d6fcf45c1216c39fc95a04a6e45559919d2df0471a46a31b4ec0ac75d13512e8868f3072840857cd4fc4a71cd98c217036367
+EBUILD bitcoin-leveldb-0-r2.ebuild 408 BLAKE2B 10c4f9c3cd66299b5f45fb6957b672aad9b17d792fe7d098f6ab97ed6eaa3a833175871d4e1833326ee5a2693563f9a56ed88223f2d4465902e8aac01a74269c SHA512 dc632eda8c05e1a57f0f1538c646a7fce7069de5fc7950b6b2610a555883a917b6fa50ba59d60b01dee9c07959ca402bd22424f97acffad47f61b3ec1da707bb
 MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
diff --git a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r1.ebuild b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r1.ebuild
deleted file mode 100644
index 14f193a5794f..000000000000
--- a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 amd64-linux x86-linux"
-
-RDEPEND="
-	|| (
-		=dev-libs/leveldb-1.18-r2
-		=dev-libs/leveldb-1.18
-		=dev-libs/leveldb-1.17
-		=dev-libs/leveldb-1.15.0-r1
-	)"
diff --git a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
new file mode 100644
index 000000000000..7bc2326931e9
--- /dev/null
+++ b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 amd64-linux x86-linux"
+
+RDEPEND="
+	|| (
+		=dev-libs/leveldb-1.18-r2
+		=dev-libs/leveldb-1.18
+		=dev-libs/leveldb-1.17
+		=dev-libs/leveldb-1.15.0-r1
+	)"
diff --git a/virtual/cron/Manifest b/virtual/cron/Manifest
index d3d7bc26ba11..7d09be176e10 100644
--- a/virtual/cron/Manifest
+++ b/virtual/cron/Manifest
@@ -1,3 +1,3 @@
-EBUILD cron-0-r1.ebuild 421 BLAKE2B 70f3773a8630e0d607c92b572d84b62a3a2098a55486e45f4013d94cce4ef93fe687c0c9510333257382c583515364b0920f1a962c637f177e875a0d1012548a SHA512 fa3c64924da8286361401e2da3e0d1ff533d6efc739defe3e17bda8c79f07014154188da2a899cbf422e05faf09284b3d03485be3cc604dedd725936424d141e
-EBUILD cron-0.ebuild 376 BLAKE2B 160b123c41c37e549a716a6102606f6c8f58d36a7298fa8065fafccb15d5ab9f61978f30e1ae81aa06da584988c347b374289a7981b78078dac2d9cf9ef9a585 SHA512 ef2a404ee38bef7676a037db66fdfdcf28f224094be7e770827eb49eae8b33d23e62517f7c17424c7015e0787e4dc1dc895b81a4210b1bc0c0bc5d088f7448ac
+EBUILD cron-0-r1.ebuild 409 BLAKE2B 50458430be9e3a8f7608df9e4a1a2ef74ae7b8dbfee0b9bb45412aca1e15002bf8de3be5ad76b25abe632c4ce7a54303800e840943ada27ea33117fc814044d6 SHA512 86857530ecbe29e3a1f37cf1243f0ac10d472346b446b0d7322f8c2bd5403d889d5f6671caf46f82348869762b11d3564174089b9a3ea9162d6d36af0479560b
+EBUILD cron-0.ebuild 364 BLAKE2B d4c80e365c0c3e06cb9e20902ac712aec71384cee80b20b71cbb16afe52bbf6e81bba15bdab0e2f4a2055a11046464d8abd65ce041bf57e81d8f552adeefae43 SHA512 4400c445be6278f25c2036f1baafea269522abc24635c54e4c36882c8742691d97643741397b8acbb033b826d8e102631c08f1e3121712733e35e163fe594f58
 MISC metadata.xml 369 BLAKE2B bdbea0ba5cc613c732d540aecf428dfe6c9984d71b8babdc2e925088fdc6cc42393fc1eee7e45360d11bda71e57d68b2f6425b65d90f8d6da7e5c81f51fd8e19 SHA512 6d24db6708277a844f149eb1c54aac57cc84bfe9e5e1b66eeebd478a283263f5097760f2df2588676d626615adf88ef9148d2a794e391f04f3cdd618c4c7ce93
diff --git a/virtual/cron/cron-0-r1.ebuild b/virtual/cron/cron-0-r1.ebuild
index c585c131cc04..02b62d1f09b0 100644
--- a/virtual/cron/cron-0-r1.ebuild
+++ b/virtual/cron/cron-0-r1.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=5
 
 DESCRIPTION="Virtual for cron"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="|| ( sys-process/cronie
 		sys-process/vixie-cron
diff --git a/virtual/cron/cron-0.ebuild b/virtual/cron/cron-0.ebuild
index 889bbf6d1b75..f1836885c7ba 100644
--- a/virtual/cron/cron-0.ebuild
+++ b/virtual/cron/cron-0.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=5
 
 DESCRIPTION="Virtual for cron"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND="|| ( sys-process/vixie-cron
 		sys-process/bcron
diff --git a/virtual/dev-manager/Manifest b/virtual/dev-manager/Manifest
index da520463ece2..66f823178807 100644
--- a/virtual/dev-manager/Manifest
+++ b/virtual/dev-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD dev-manager-0.ebuild 407 BLAKE2B 338cc9d3c730b7323fbb88ad2d13668d50a6d4da89fbe25a115c162f6ab6e453a8d2e5a386a615513c5f90d4fa1494fa6b9e20135e00b1e6d775ec15c3047963 SHA512 5221bc96bbf3a89038c9edb507683d3414ad9faa14a376d6c92ab50da1d4b747724c49dce9e6f17cddca696911c1a05893eaeadc7395ae4369c933f22a79cd77
+EBUILD dev-manager-0-r1.ebuild 395 BLAKE2B a6d6635fed8d76540774f7971b2eaf09119224f0e2809bb49ad0734ae2eb52549909e57250c101e19c3374253e1995c6e9b765f11ab012cd3a02b35dc36cadd1 SHA512 2043d732f8d348254c822526e65748d4404bbcb23e1c59dd5f6c5831e41131e210177fcda2d66ba2a7b1d067f40a7b788cc77d1bd9c23cefd681e3407b17610b
 MISC metadata.xml 352 BLAKE2B 07753e3a30f59a62be6fdd83f306c647d053056f6e348cbc11814d5239450ce1580c33ea166808f48da52dc2d9dfc213c012395494456db3118273b6d99c19a3 SHA512 a458b4e805d27339e74c7ae1a2b9e5e6456da63a5e13258f5d7f7db2f38aa8e550b21a01d61ab6b83789a5f4bb75e40580e8e01b85befd656e58a86503cecabb
diff --git a/virtual/dev-manager/dev-manager-0-r1.ebuild b/virtual/dev-manager/dev-manager-0-r1.ebuild
new file mode 100644
index 000000000000..71123a48549f
--- /dev/null
+++ b/virtual/dev-manager/dev-manager-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Virtual for the device filesystem manager"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+RDEPEND="|| (
+		virtual/udev
+		sys-apps/busybox[mdev]
+		sys-fs/devfsd
+		sys-fs/static-dev
+		sys-freebsd/freebsd-sbin
+	)"
diff --git a/virtual/dev-manager/dev-manager-0.ebuild b/virtual/dev-manager/dev-manager-0.ebuild
deleted file mode 100644
index 8872bea53596..000000000000
--- a/virtual/dev-manager/dev-manager-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for the device filesystem manager"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-RDEPEND="|| (
-		virtual/udev
-		sys-apps/busybox[mdev]
-		sys-fs/devfsd
-		sys-fs/static-dev
-		sys-freebsd/freebsd-sbin
-	)"
diff --git a/virtual/editor/Manifest b/virtual/editor/Manifest
index 83a813858207..b2106e52277e 100644
--- a/virtual/editor/Manifest
+++ b/virtual/editor/Manifest
@@ -1,2 +1,2 @@
-EBUILD editor-0.ebuild 1415 BLAKE2B dbb28cf335cb8679a7bd40c2f2bafb638301a9df2f61190b25fd0b536da744663625df433ba452c882507bdd56f35cd97127922ee0b27a9b621b0f1f7332ccf4 SHA512 14c1f048866bcbb2d7f02f3e79d70e83b4fca2b7d3ea879593da15b31f1e7b025026bd12b4dd4b94c13c00ec07346dac01d9d674b1f96477ea7bed777e88e846
+EBUILD editor-0.ebuild 1403 BLAKE2B 6b5829122e0a855f0f0b109593f68641a9e7731b65ef3c1d2f32d06801d8c2ecc9bc660b33d05ffad20f3b13a1512f7e66c4c7be6e96478930a4465fb85cf520 SHA512 c0e34be8b93f803b79ebfa72fc6862523f0e623fb58e840515b0eebc5442408a97ec2fbae23a915c9b35845790646661810cfa3666df612815cb57d4faddacd9
 MISC metadata.xml 475 BLAKE2B 04e3bc8d0eda87d6d57801992c848a5a2e68bb69b3688d2be4a7018ff4bdbde6fbab15fe16191b5c2b0b3e32a56a596931a7877160f1c265a0229a71d70bce64 SHA512 ffe46c6473a0f3d81555997b3d90569f90eb3dd467f8746430d7fac34832ce3697d2af68b508f9dcf44d5b232396ceca174daf5bcd71e7fd413f7007cc2bfe60
diff --git a/virtual/editor/editor-0.ebuild b/virtual/editor/editor-0.ebuild
index 775a6e2e8a43..13c56dd7bd8c 100644
--- a/virtual/editor/editor-0.ebuild
+++ b/virtual/editor/editor-0.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=5
 
 DESCRIPTION="Virtual for editor"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Add a package to RDEPEND only if the editor:
 # - can edit ordinary text files,
diff --git a/virtual/eject/Manifest b/virtual/eject/Manifest
index d838ea6bf8a1..918066b5fae6 100644
--- a/virtual/eject/Manifest
+++ b/virtual/eject/Manifest
@@ -1,2 +1,2 @@
-EBUILD eject-0.ebuild 375 BLAKE2B f89efb377ac663251e2bfc09a8c4d47655970759cf4018c22450f1854da235f4dc6721fadf36cd7af42fc820e6451deed32e56ac78025d7ba864954d7922449f SHA512 85d367ab417245ff86c3c7a2e7bb1225bafd91443af520b29573933b244f3c75bb09663ff2087afaf8a64612761962af50b5dffc00b8ca5a0db07ea95cdddd31
+EBUILD eject-0-r1.ebuild 363 BLAKE2B d08d3cd96275d79f7cc2e4232c01cf53dee65931e62b3966cf07b92609229e4bff8e6398e3e8ff86d11d5588ba1c2d59b725318d08d2c91895714ad6c91ab645 SHA512 8e1a71ac93a4506ec2c3ced4778394c5922008cc3b82c39d363f9bc71c605b7a6ace84fbcb4b3bc15df65fe4666405b7ee5c7b0d5e996dddf4e769bd14a11fe9
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/virtual/eject/eject-0-r1.ebuild b/virtual/eject/eject-0-r1.ebuild
new file mode 100644
index 000000000000..4b11168509ac
--- /dev/null
+++ b/virtual/eject/eject-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for the eject command"
+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"
+
+RDEPEND="|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/virtual/eject/eject-0.ebuild b/virtual/eject/eject-0.ebuild
deleted file mode 100644
index bac87e50b227..000000000000
--- a/virtual/eject/eject-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for the eject command"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/virtual/fam/Manifest b/virtual/fam/Manifest
index 5186c651d87e..c958a0279362 100644
--- a/virtual/fam/Manifest
+++ b/virtual/fam/Manifest
@@ -1,2 +1,2 @@
-EBUILD fam-0-r1.ebuild 506 BLAKE2B e422ed87b621df43d94267a230cf8aa9c7c8f3335a0ebe9aee94e0014c551a7edd800ca91992fd20cf2ebd9e71aabf1aea497c3927b568d78a25fd553ad5274e SHA512 1e0b50f030808792228927dcbbb60364d027ceb15c5c19883b4d1d0f811e1e496cb1067b89def8d5e5ea8617b4c85dde272fe7d0c734dae492e16dc9e175a6d7
+EBUILD fam-0-r1.ebuild 494 BLAKE2B fe1376591b03a9e6a8f35c68bdc978668b23b700d0ef0c80e776395326f9b715a05175babe9e3e84bd64befd4b6d851bdef8d03ce402d2799cccd7701f88dbee SHA512 74ae9d745fcf653b03521cb3b3faaf3640e5c970d075e10649d1f48e7c1e1407c12d02430621421265840318f933d3cbe1a17de708c37b6c049340220b816714
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index 8996e145a7b8..9190e253fd67 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-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
@@ -7,6 +7,6 @@ inherit multilib-build
 
 DESCRIPTION="A virtual package to choose between gamin and fam"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( >=app-admin/gamin-0.1.10-r1[${MULTILIB_USEDEP}] >=app-admin/fam-2.7.0-r6[${MULTILIB_USEDEP}] )"
diff --git a/virtual/httpd-basic/Manifest b/virtual/httpd-basic/Manifest
index e9c2faada3fb..3c456682ac0d 100644
--- a/virtual/httpd-basic/Manifest
+++ b/virtual/httpd-basic/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-basic-0-r2.ebuild 538 BLAKE2B fa838f225cb45a7efedad7131ad1ab5eb17bec91eea26eb8d1d952c9faa1a2ec185018e35c1eaa2b1ba84140aa398148c7f29090e0a580c5327c64611ea89194 SHA512 b36fea6c42269c7888fb9401bababe3af71c93fac98a546834079b929739089246672c8bdf37e521b3ca10d4eb8e11fa7d39d7435d5305fd545f2372ca54a986
+EBUILD httpd-basic-0-r2.ebuild 526 BLAKE2B 1f3b76a8fbe6e10e26bf202262c756a05805a94ac1084734442340aa1bdb20d79686962310aac3415dbbe67936b1879117c3226ee66ff12680e0a0fb21d7c9f5 SHA512 8127a808ed0ee23515f16de8a3a8aa2abcd8afb13009c146892063109fa8eea62704e90f5fffafb2388c7ce46afe718b98f7502b06f036a6b2695eb7d772f4a0
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-basic/httpd-basic-0-r2.ebuild b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
index 9caaaddf32ab..b7586aedf7e3 100644
--- a/virtual/httpd-basic/httpd-basic-0-r2.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r2.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=5
 
 DESCRIPTION="Virtual for static HTML-enabled webservers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-cgi/Manifest b/virtual/httpd-cgi/Manifest
index 5951bdff35c8..c86e421453f0 100644
--- a/virtual/httpd-cgi/Manifest
+++ b/virtual/httpd-cgi/Manifest
@@ -1,3 +1,3 @@
-EBUILD httpd-cgi-0-r1.ebuild 572 BLAKE2B 00f24dba6b1be353db3b2b1ed053dca9e39ac9999bef6d3fc8a70511f37e802d10b9d6c1ab2a78f748d4fcc2c78768452589667bad80a426507c539c7494a17f SHA512 185fd749d20de9a2940768f92f0d8643bdc04ba1e190bfaba3abfbc1bbbe462cdff291266825549b325eee8302c124cfe53898ebe2d17a8eac4fc6d9cd990731
-EBUILD httpd-cgi-0-r2.ebuild 594 BLAKE2B d3071b1788fcb21f9b6b9099be569a873a9d9f2fbedce07c26108c6f867cec09b2d3121d41b39b194bd7039d1c57dfaedf506fbe53e3168b19b8486cb718b27a SHA512 5c7b03423e4974b9ab833273c461064eb0ff6e2f51a28a5180473e71e48f1d3cc7f0332e00f32332434d3f1f82b852f7ae9a9d43b9be7ac5f8bdee80def03a9a
+EBUILD httpd-cgi-0-r1.ebuild 560 BLAKE2B e009878d1bb954921267cc9edeecd2a41452d4828e19689cc5956fae8ddc60b20af51cf1f2de194348b160ddbde3a28dd458649fe060d2f98c4039f8b3c4fba5 SHA512 c657a5897bf227f4c37bed584cf35bc3fb04e22a21b5146b291cba6c589efa91d5216871130a7a49dd43abbb550b88e026093f08353fa733b31f6bcb0d542629
+EBUILD httpd-cgi-0-r2.ebuild 582 BLAKE2B 1531fbe4a0f51b9f20764aad99ced6ca0f4055811764441d79b0654b1a9b2e0ea005f38582bd486858fe8ea2601c70a60ff620c3cd012ff15551464e4deaf95a SHA512 f3e510af26bf3242184ff0871206f205173c991fab07f8f2dd9897e6c504c0d23abeff5395babe80f0ef8dcc4dc0b3b27319f1d711485661911ff943a9ed2679
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
index 5bbb47ecc84a..dff223f59ddc 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r1.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=5
 
 DESCRIPTION="Virtual for CGI-enabled webservers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
index a7b2e73b3539..8a7d940cb014 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r2.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=5
 
 DESCRIPTION="Virtual for CGI-enabled webservers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-fastcgi/Manifest b/virtual/httpd-fastcgi/Manifest
index 94499cd6fe70..8fbe2f427c1b 100644
--- a/virtual/httpd-fastcgi/Manifest
+++ b/virtual/httpd-fastcgi/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-fastcgi-0-r1.ebuild 417 BLAKE2B d4fcda6ef5622bc4d2885df5cfc9b151708ef4f23dba4443aee77d3fb3742c7c34efbf7c01c1445148c2a24aa632a0cc78a014ae85bf9ec11860f1c517f42fdd SHA512 fa9af2d46497b73bb3e86935706e248857d6a9190eed4a70ab74c92d12c00639cf33d3ad0c224eb8aa5844e138d167d7563e9a3b4af9e251c76db1adddb7e218
+EBUILD httpd-fastcgi-0-r1.ebuild 405 BLAKE2B 4711ae4735cad93b4a577026f536126ca03be11ad2d833486d12f6c93ffe8457b6a6eb3c7dcba3595e0e510f48667d3dbcebee58649515ba113eddef7c34a15a SHA512 df2bfaad4ed50cf979eb0997558bcd5d53eb12e19ccb8e2937d5fdcac6b135769e233e906724c661ae5e888492ae034aebff324eef7c68df1dce606fc1e96790
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
index 0bf0c5b989c1..7c0561bb174e 100644
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.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=5
 
 DESCRIPTION="Virtual for FastCGI-enabled webservers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND="|| (
 	www-apache/mod_fcgid
diff --git a/virtual/inetd/Manifest b/virtual/inetd/Manifest
index c44a5bfaf9b8..67ee53c2db23 100644
--- a/virtual/inetd/Manifest
+++ b/virtual/inetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inetd-0.ebuild 501 BLAKE2B 7d5b1b3bc9a7e2914396131278b488106e50eaccdca6de410f9803c86247a46f4b6cc40816478e6442dffb7c3d307964225c10a16171abafb3cf52517da07605 SHA512 4cf5b17c265c9301a5d90635a5f3491d4acb09995eb48d68f0be05966b2f09bfeb6209b48dbf0eeb7981b6ec202840df2b957fa3f6a035c4973df7ba4ead6d55
+EBUILD inetd-0.ebuild 489 BLAKE2B 15b91574d66a2ee3219bf4a0c2cc822d41c0e2772934b633593f5cd15d9f13c13c91e0a0c21e9ab29b2c05b08a6a116341b1f289f675f7272875cf4d65b73eaf SHA512 8e1fb3cc1e088c4507b7699e13fce12851beb0e45cca5ecf9d6d8defe1dec7f00eeb023a196cb22d59b308c34e317446013b10bc5ea7ea4c93de97ee40045535
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/inetd/inetd-0.ebuild b/virtual/inetd/inetd-0.ebuild
index 05ae90f32072..35b3fa31eae0 100644
--- a/virtual/inetd/inetd-0.ebuild
+++ b/virtual/inetd/inetd-0.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=5
 
 DESCRIPTION="Virtual for the internet super-server daemon"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="|| ( sys-apps/xinetd
 		sys-apps/netkit-base
diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest
index 9e057790af32..3b1d7a1ac220 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,3 +1,3 @@
-EBUILD jpeg-0-r2.ebuild 680 BLAKE2B 9740d545c0aae08b412bbdd2f81cc6aa4be9a504a14274774ca1faf64b1d8680d12f62f66a9c7e6231e7779e61d4575c626d5df6fe6a7861b6ea1c62fd1f4ec1 SHA512 d93d2642556ec0fe42a405dabd8567f6ed4acc75ff6694a523b0e10c68c9496a4de7a209781c2591fab22b7ed20f4ccd5e47b545235e84184cf52dc60d53b704
-EBUILD jpeg-62.ebuild 608 BLAKE2B 3fc7d0baf2f7e5ec7062ca747f587c9c928c16ba49f9ecf0cd47758db180537b81533d3f3e97c3b5834b013442c226e0d290621a34edf1261fd4eb80b4c4c27a SHA512 ec0d0e7e3996ae1c775c5b20fc303fd633c0871b30cffb3c654d6a997cf2a0e2167a5b2f96dce709cfb6ec836eeaa831fb0f4f51e08a32a7e091485bdb5a10f7
+EBUILD jpeg-0-r2.ebuild 668 BLAKE2B 5ae456044d78f757807e19498c71ef197c2cd20fff291ee4ed787c8fcabb9a8e326cc059dc36af97fb6511b8a6a5171ef080506a57a1fc3604a03474d84f649c SHA512 198056915f968e5cf64837d11238b3049332b0ba95cd7d3ffc4cb15cc1c94107b53969a4a9dcc38cd0b1b55c951ff82f9af97499ecee4958c43bd6683c8decb9
+EBUILD jpeg-62.ebuild 596 BLAKE2B 1bc8b57501910a9ce92f28ae85fb06d62f94f8098640698d399b4123c9247e1835a94ce24788ea033ba02cdfd5609fe9418c202f1f155dd66ed8506af5fe11ce SHA512 61843aeda1fb4fc122e6737fd29ec58b60a9f34bab71eb79c9c44cca1e0eca7d575c11c5be49652e917faae7139024caa5a47d2f2c216451630c8dff3448080b
 MISC metadata.xml 478 BLAKE2B f06a20842644632f99e96760fd86828c19c43eb8eeebe63e3d33270ff0dbf2691a4308e6bc02287c986ccdfde72320bbab98b978cf33063f8f009dc6ae29dd64 SHA512 0caf26a58a2888bc999a1728c8cb06a913669913633afa381cf9777d44cc46a910d1fee9ff70228c84a1cecac2aa0146e9dce3a04f43697c6db42e8dcd348bc9
diff --git a/virtual/jpeg/jpeg-0-r2.ebuild b/virtual/jpeg/jpeg-0-r2.ebuild
index 66fbaf1652c1..b8d1dba4473d 100644
--- a/virtual/jpeg/jpeg-0-r2.ebuild
+++ b/virtual/jpeg/jpeg-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=5
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="|| (
diff --git a/virtual/jpeg/jpeg-62.ebuild b/virtual/jpeg/jpeg-62.ebuild
index f18efc288741..0f597765fbed 100644
--- a/virtual/jpeg/jpeg-62.ebuild
+++ b/virtual/jpeg/jpeg-62.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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
 SLOT="62"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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"
 
 RDEPEND="|| (
 		>=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}]
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 3e6a866794e9..1d19d7585a39 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,3 @@
-EBUILD libc-0.ebuild 721 BLAKE2B d7889bd1d9a5b28154b56c29e48d88fe383cbe9912573930cf58a6361f05b69b6a3add20078b58d7adaf987af95acf4718b7fcd471f1445e6a909d200c950163 SHA512 f218e6abe127c001a6a021e6fa86a2d30250c1a09fdd7ea292dab6fafd6ba1a55263e5c1ee621a7fb089e164af4234d2917c70be751c300960e28cc6ed4a4a4f
-EBUILD libc-1.ebuild 826 BLAKE2B f0e9be609d2f95ce82869808a5f7361dd1c292c7e11ab86b6a0eb5dcdf569460ea81d3570349560316c60c38bd62d4fc1da12e372d6e2c5623b2106dc5232927 SHA512 9ef2c3d5d7b75afcb08324939e1a92c6cb30bb2ad2211dd7102aabbf987261d654fe7183bc0a897a083afbcc93787d5c07380c850bee9eb1a8048831b34b62b2
+EBUILD libc-0.ebuild 709 BLAKE2B 5d42c2234523e4ca8e2cbf1699635d6f9830c524797a0484c3ad5c3726a3e7fd0af35d903fec0eb29466a22a46d6d2e682ce03edb67c69564729579db4d9931a SHA512 566c33b397731694cac6cebf0c1f47d39f3a735a634f98cc1d7094b38481dc9b3507d3c2e091255bf912a2994281d0819442c4731bbedbf18594522b1f108838
+EBUILD libc-1.ebuild 814 BLAKE2B 737bfc3e1ef5ea3d23a0ac59286ea836568946d039b0c6a36d5a69bab2a4e9a41964123c2b73b667efd310c7fe42ebfbcc5f2fa77e33550847d3b79e9df0293c SHA512 f9009d4e70845bc0e6ff5c0a9bcd701f09be90f56bccb5260bf134bb46ff548f574ef475ddd460a01a1d8bc6213d8e047035a373cc51704076f13d856e3263f2
 MISC metadata.xml 464 BLAKE2B b702a3ffcfeda49ee9c7b760bde3f4b23e041f8ce69ab905a114f49b95b44f40a37d132487e7d31fdbd7295d863a0793b8fcf5995e525b37328c530d9f780b61 SHA512 e968aea2bddffd7f442c1a9a1ca8064e49f12382fd38ec6f60cb031851cc401bea7e52be437f4bb0f7b76ffbc3484cdc8134b63b5a8094b5589de85ade7c2310
diff --git a/virtual/libc/libc-0.ebuild b/virtual/libc/libc-0.ebuild
index 924c79cad7a0..c3364d1d33d5 100644
--- a/virtual/libc/libc-0.ebuild
+++ b/virtual/libc/libc-0.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=5
 
 DESCRIPTION="Virtual for the C library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # explicitly depend on SLOT 2.2 of glibc, because it sets
 # a different SLOT for cross-compiling
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
index b5c3e8db38d0..56aeb4ef0e63 100644
--- a/virtual/libc/libc-1.ebuild
+++ b/virtual/libc/libc-1.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=5
 
 DESCRIPTION="Virtual for the C library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # explicitly depend on SLOT 2.2 of glibc, because it sets
 # a different SLOT for cross-compiling
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index 31cb7a6c87c2..b39dbdb1be8d 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
-EBUILD libelf-2.ebuild 427 BLAKE2B 0d88f78103cb6b4b5484a441aec6aa6406ef8ba5b4e7c49e4c75cd330c21e5b604bc7cc9f9609e3b4a49834a0f0aa9fbf21f71ced9bc2afd27583b99f1e3b4d9 SHA512 422c6502d6799ad61f27977d730eab981ed029dbd85d46114d5df064093aa598c92672888e1d69d5b676a9175e7ef7261b706128ae1f4affa0ee87885182c67c
-EBUILD libelf-3.ebuild 499 BLAKE2B 35447349d5fe033918867a5b19ad2caaebd379f9a2dddddc186d17bf5096bc497a1d0772549c057f2dc8118f7eb5fc83a21d1e5c2a023ee766fa775ac4d3f955 SHA512 471047197f483cc41d166a32ac898c1b656d726e908a981b8090881c3a5e4527d80b634b15601e606f52adee3b2f28f0fa184568f557f0532b9ad07480fc378b
+EBUILD libelf-2.ebuild 415 BLAKE2B ec5e17cd6cc92d74ba3552affa471d16db5448b9d1628ca6cf269f0a9cf93a75530db6cb4162c9ab6ba30e0f835a197c5156a9497745d87937ea4d29e182b33b SHA512 6ca054e33f8ae413322c6f2774717c6a3b50d21e34bf2b37656633d0111997b43d927b20d9a92244b2535bdf572ad6b656552fc4b1fcb8cd2fba62027a49df07
+EBUILD libelf-3.ebuild 487 BLAKE2B e67abf24a952c33cc10b4e35ac8900473eaf53e98be74e2f15a214ccd2e4db841a20f28ac90b715819b1723bb7744168fd2ffd8ca4982b2f7eefb3e10868465c SHA512 f1a0cf399b7c4fdc2a3cd3a3c507b24c6b6617a47e1eaf6cb647bd08a338e65fac01877001bda2f1f6bc394c8aa6b77365af4563431590b8e3b02e7652537a30
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2.ebuild
index e26bf68fad8e..dcd9caf6d31d 100644
--- a/virtual/libelf/libelf-2.ebuild
+++ b/virtual/libelf/libelf-2.ebuild
@@ -7,6 +7,6 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libelf.so.0 provider dev-libs/libelf"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3.ebuild
index 865575c7ece3..f328d41728eb 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libelf.so.1 provider dev-libs/elfutils"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
 
 RDEPEND="
 	|| (
diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index 8ddb7683d600..b8b420b249d7 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,4 +1,4 @@
-EBUILD libffi-3.0.10.ebuild 612 BLAKE2B 650ddcd28e4cf3de4109d993ddb94554ace889db25a4befb7233a22786cdf5c6b3d4b1150a1b3d9efe544bb0dd6572f13123c89d065db48a20b44bac7da4d887 SHA512 28f6fa7a0606d9cbed5a7289f45306e309380cbdd0c346fa37e09407c06e17f03457605fe20088a9a37caed2d8ea661adfd69dde36b5de9b465a983fb92482fa
-EBUILD libffi-3.0.11.ebuild 624 BLAKE2B 3ceee985cf1aa1d36d10d418c397773c36faf3c2fbe82a5dd702842ca16d3fb2cf648c397f606286a977dda3eb3ec596d3da3322068766495f5f9d2c4f0ced80 SHA512 faeb500d4d01627b374487fc5c5b7969b7f6f76a61eb890cb078ad1009113564719111d95921494e8b84489c7490eac40c4febb630ae5df0c591776fa27d2f19
-EBUILD libffi-3.0.13-r1.ebuild 699 BLAKE2B 0e468aad1da6577182bbfd72348629f32cd4c5911aab7763662c36e46f3a9bd67c57f9ce549f05ff91ad48119898d17b1d35b86a21f479883fb6c93cffa0d35e SHA512 960ac1fa890945083b932a64014ffc9963b472a6aacce60642c3e35b2c40627581aba7f683f2ac8d793a43e6e79b6f8d024651287c3740adba5105d015777edc
+EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
+EBUILD libffi-3.0.11.ebuild 612 BLAKE2B afe1c80855b449d3053f276d93fc1334e7843884d8a278130e05503f358f450deee9f37fbae76c81349c022f6095440837e6ae1752e3a73540c18d0e67a5979b SHA512 853fce947069fee42a60324ad33a1ef87eabf87d6c08592356633e70b8e97bcdaa557fc43f98535ea15cada73c9f8145323663213b14ff41ecaf9bdf502d751c
+EBUILD libffi-3.0.13-r1.ebuild 687 BLAKE2B b0338680f1ffd4d3a8e364014be5ddebd5f653c0cca840e9b122f503706f2829b733079762aac76ee902722807eb58691d878386f7868b48ccab5837ef9c2eed SHA512 8c5fcd86b13117e9c282de6fa76c8d72ed1b1345fbcf5c31ac6946cb1117ec55f42875189cc81781757dd74488fb146ee4d898167ed336ec20139d1844da00d6
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/virtual/libffi/libffi-3.0.10.ebuild b/virtual/libffi/libffi-3.0.10.ebuild
index af0704ccceb4..3ad31332ea43 100644
--- a/virtual/libffi/libffi-3.0.10.ebuild
+++ b/virtual/libffi/libffi-3.0.10.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
 
 # The purpose of this ebuild is to provide quick fallback if and when we need to
@@ -8,6 +8,6 @@ EAPI=5
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm 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"
 
 RDEPEND=">=dev-libs/libffi-3.0.10"
diff --git a/virtual/libffi/libffi-3.0.11.ebuild b/virtual/libffi/libffi-3.0.11.ebuild
index 4566556a94ea..21aaa7351ed9 100644
--- a/virtual/libffi/libffi-3.0.11.ebuild
+++ b/virtual/libffi/libffi-3.0.11.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
 
 # The purpose of this ebuild is to provide quick fallback if and when we need to
@@ -8,6 +8,6 @@ EAPI=5
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libffi-3.0.11"
diff --git a/virtual/libffi/libffi-3.0.13-r1.ebuild b/virtual/libffi/libffi-3.0.13-r1.ebuild
index 3321a1108ff0..b14a31442f58 100644
--- a/virtual/libffi/libffi-3.0.13-r1.ebuild
+++ b/virtual/libffi/libffi-3.0.13-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
 
 # The purpose of this ebuild is to provide quick fallback if and when we need to
@@ -10,6 +10,6 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libffi-3.0.13-r1[${MULTILIB_USEDEP}]"
diff --git a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest
index 78b67fc5f32e..727d03157ad0 100644
--- a/virtual/libiconv/Manifest
+++ b/virtual/libiconv/Manifest
@@ -1,4 +1,4 @@
-EBUILD libiconv-0-r1.ebuild 757 BLAKE2B 63d8d4ce08e22155c65bdccd70db43bf05a8ffe6a63f52311cd24c6f43858edfa9d7e1551b2ec18c877d673d61e716d2c627878e852a1bab23dd5fdf77e7fabf SHA512 5012d63ebe15a54a456d7b49f4b492a5f9b1e175c99a7d6db73f90ae80f5ae6e8002fae36a970a0c8f8f2160d19c79e5b854b9a3f35407063054d6239f2f4406
-EBUILD libiconv-0-r2.ebuild 827 BLAKE2B 8046e5350e25a98b9940ba19c75642ac342b5b374d733b87c843c5543eeb9c1ccfb2f3944484256687446fcef424a0f71e0531ca84184909b67d8ce408a8c299 SHA512 867618cb6a92745c1cfc86c8d1c975135fc3f4dda372f06a2e52d008a4bfc72a626589cef142ed8debd42f8663c1002497f703e795f5bc320fd0c07a4b77936e
-EBUILD libiconv-0.ebuild 669 BLAKE2B c6f1188eb73a68d96fd53331300af6ded7aebfe2656b03f16564b382303d17c3927e9dc8e3b1118f6343b72f7a3f39c265c61afeff284d23cf305cb4ea49f149 SHA512 1f5005ce02232e94aa923832c124e7ed2693404fe4663ce142bc03575472e979491e2eb49727a700e5c885ff2332c9b65caad27d16b1c4932d36e693376e5c4f
+EBUILD libiconv-0-r1.ebuild 745 BLAKE2B 033f55117fbc2ddcca5122ff0c4b3c0c681358d606dd00d03117b36e89331c2193e1c9955495d91f3d81aef2c8e58ef65dc2347ea784f1db3d7f8a9267569bcf SHA512 598453606f766f63abe167b750a0219dc7c536d0d59d37689fb5614f816a7d25404efbe26fdd6021ee50f5bb51d89b92ac2f5baf6582bb3625b6c025ba0f139b
+EBUILD libiconv-0-r2.ebuild 815 BLAKE2B f9c2c1ce3c8444b627542c892b3b951933ccada113f31230811de32ce84e644a41afc3a8301b5b8f41be2eb1b823dbee97e20da8dc16988faa40ea22e8e76591 SHA512 6d4dae5d862013160233fac9f68616e36b0eb5a3e3751bdd0ba4a5f0012cfdc57def7ab7e605e8869de3070d89dee96cb3a29907f65363fa80dc25c6e1010d49
+EBUILD libiconv-0.ebuild 657 BLAKE2B fef234aedd426904299291979f3eea4191ca8a5e6faea3b72677c72e2c60b2025fe0b078b266bb04857482c82f2234e22f2555c41b660351478d0fde4c35094c SHA512 068f53011e25f8345880044b54d78fe5614d7011eb882835e4a8f1d536ae0954e6c9e069dd3d16c495ff1b67ebda990e73de2ec30c8122e69386de31d2dc25a7
 MISC metadata.xml 237 BLAKE2B 938cc6a9647a554a53f829bb0dd4eed5a9f7a7ac29ab29e9f6cc703e7c445edf90d7ff88c2fcd5cbe5674b781ae156d26a6dad15073cac6e41b1362fb69b2f69 SHA512 13cc664af65a9f211ed55992c72a6163d37cdbb142d5ebf88ad14849456b4d4cfbc7bc0f888ff9760cef2515bd8def7481e7cb6d5c00de7ef60de3de85b6ab89
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
index 40a909906729..fcefde7a5872 100644
--- a/virtual/libiconv/libiconv-0-r1.ebuild
+++ b/virtual/libiconv/libiconv-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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU conversion library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index 50c97b8b229d..6ad2f7016c2f 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-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=5
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU conversion library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libiconv/libiconv-0.ebuild b/virtual/libiconv/libiconv-0.ebuild
index 3520b4e91ebd..85e474c66a99 100644
--- a/virtual/libiconv/libiconv-0.ebuild
+++ b/virtual/libiconv/libiconv-0.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=5
 
 DESCRIPTION="Virtual for the GNU conversion library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc elibc_musl"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/Manifest b/virtual/libintl/Manifest
index baa25583ad9b..37d4a34362b1 100644
--- a/virtual/libintl/Manifest
+++ b/virtual/libintl/Manifest
@@ -1,4 +1,4 @@
-EBUILD libintl-0-r1.ebuild 752 BLAKE2B c370752d3bff0fd835593648f80abe8284033660f62e19628ad4402cfb2f7ab0bf655ee4430d0a4717106efb280a62efb3575e342ad26206f3f269b96116cadd SHA512 61c9f0b6a788812a7bc8ce147e8321006e8994ef687a29cb6fa030edcfa39c59b5145d12dac687f866833d6cba69c42926b03d5ed5f9b7006ff2d68e094a8a0c
-EBUILD libintl-0-r2.ebuild 763 BLAKE2B 2b826452f8fa210276d44a32f5a7dab588e449667df92aa16e3ec054663d387b01b5f0bb41e98b761c5a97b7f877a2d4e1d9fa73f7446d6e8202d2e88cd36eb4 SHA512 8653ca36399efa2b1b71e1f019f2d749783c9f75fb4132087c5c2adb52069baecd76e9831e9a18fe7330e785624714610ecf367672992e02892cc565652991f8
-EBUILD libintl-0.ebuild 697 BLAKE2B a07d410500da05095824dadc4ddb3230e5041fad987d5b57efd89aac68801fab1fad9dd332f2091d68043aa7d6cadc80b9e7ce7a95bb63991cbc84c926d298a0 SHA512 9190d296f96c488a7d16ddf6db6894102622e1713b60ae748ea8bb7dddd323b5b38391a824c948d9152ce8498c810c98dfb7398e15e7dec3254613f95f3c1f25
+EBUILD libintl-0-r1.ebuild 740 BLAKE2B a46dc091a4a2cd5bffd7476928ab9f3fda93951fef1f9f42476e15551bd7970a98c812151813c28d5619450d9b254a5b38adeb99d2581fc056022b5ce1a45853 SHA512 3b9cde2a0aa0fc69044fcf9e6081f5d483fef54cb9bbdb231e4453b744e538e214c0596067a5a5822e728fb6be5639a0c7720c242f4fcb3174cfec920395e79e
+EBUILD libintl-0-r2.ebuild 751 BLAKE2B d1f6cada8a29fa86b04e635e6cea67c9a8cfdd394d75a3eb7f928805dbcdf044e368c03ba090a86e377af21b8b4829460a50256caa5ea05e3092475a39ff3c7f SHA512 dccf90f9e5992f018f635050d9f2801d091fecf766fc3b952a973249c959aca8f09c9014df6fd739b73b0f5cc4b1c4a6d8ae8fe34216610bd63593feb77446e2
+EBUILD libintl-0.ebuild 685 BLAKE2B 85d4622e19ce70a205fb5df9e7824ef21bc6fbc6561a348d1760e560dc3aa7ba201174cb664845417e16ac6c0c7e0f0dd18ea17333404a076bb5f919d104ab33 SHA512 f5ad49f5e0f9c96ca95fbfad191dbdbf1b6cb60285adcad8a0d1550264a41fabf0e08b3ef8e1db985bc0195f100f1bf9c7b876edec96c3f97aefd8256fd50e28
 MISC metadata.xml 237 BLAKE2B 938cc6a9647a554a53f829bb0dd4eed5a9f7a7ac29ab29e9f6cc703e7c445edf90d7ff88c2fcd5cbe5674b781ae156d26a6dad15073cac6e41b1362fb69b2f69 SHA512 13cc664af65a9f211ed55992c72a6163d37cdbb142d5ebf88ad14849456b4d4cfbc7bc0f888ff9760cef2515bd8def7481e7cb6d5c00de7ef60de3de85b6ab89
diff --git a/virtual/libintl/libintl-0-r1.ebuild b/virtual/libintl/libintl-0-r1.ebuild
index c3467fefe9fb..cae2c2163014 100644
--- a/virtual/libintl/libintl-0-r1.ebuild
+++ b/virtual/libintl/libintl-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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="elibc_glibc elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
index c1d489860f15..00759ac53f7e 100644
--- a/virtual/libintl/libintl-0-r2.ebuild
+++ b/virtual/libintl/libintl-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=5
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="elibc_glibc elibc_musl elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0.ebuild b/virtual/libintl/libintl-0.ebuild
index 852e45d2fa6b..5948e34090ec 100644
--- a/virtual/libintl/libintl-0.ebuild
+++ b/virtual/libintl/libintl-0.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=5
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="elibc_glibc elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libmysqlclient/Manifest b/virtual/libmysqlclient/Manifest
index 61c8ecb50088..0f38a400f183 100644
--- a/virtual/libmysqlclient/Manifest
+++ b/virtual/libmysqlclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD libmysqlclient-18.ebuild 879 BLAKE2B cb8f353a7e5b29be6ed2a82f254e03a89732f90786183344b191a2ae78566e1f72f1df6adf910e61e6dafadf1cc0330c9d0c7ce4aa6263a2cb885964f16fc75e SHA512 3a90e97eed00194abdcc86cd173fe496795edcf27a91b17c9696308f0b1bb91ca5c167e40552f9cd452222ab05052b75d2985ff9dac87439969ab18f7f514afd
+EBUILD libmysqlclient-18.ebuild 867 BLAKE2B baedcdb7f5e833ccd255ee42406f95c685bc68572983ada145e04c7e3e275170e58858c8cfc23111aac8ead839b00d2696f69f54844b510dd37b5d667e92589a SHA512 368303ccfb944b259e18182f2d5bd4e57b9389107760415f8e6e817d8c8b5829bd79846dd7403a8eaa85d589492c6164cee445bb270e84960707d7ca1fc00b46
 MISC metadata.xml 249 BLAKE2B 7ecbba6fdffd276328b798bcb6efb0a7444e1e5b70f14364c229d989853afdf0665cf804143ba732ff84f6f97216e8cec5ed2ee83cb0e1231c176e0c98662280 SHA512 916effd7bd6976c7ca956f9262ed7921a9fbeac0be2f60b80c3f8cf78f16b12cefb8e06ced95d693e4682d4c5c71eba87c832da9a21c4804e1e1c7d35028918c
diff --git a/virtual/libmysqlclient/libmysqlclient-18.ebuild b/virtual/libmysqlclient/libmysqlclient-18.ebuild
index 2d29ea5514e3..e07d45bc89a8 100644
--- a/virtual/libmysqlclient/libmysqlclient-18.ebuild
+++ b/virtual/libmysqlclient/libmysqlclient-18.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"
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for MySQL client libraries"
 SLOT="0/18"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/logger/Manifest b/virtual/logger/Manifest
index 737c926ffc5c..01624f772431 100644
--- a/virtual/logger/Manifest
+++ b/virtual/logger/Manifest
@@ -1,2 +1,2 @@
-EBUILD logger-0.ebuild 632 BLAKE2B cda41820396e7a6fddd1d04d5b4f2f1eeb9dca06750ae191b6d7998493f1c98cc3c0bb43fdd01c12db9f68c4ea531aa886c726b2d4f79e67ad8c414d333b4a07 SHA512 82e96c8e1243425c664d9a8c4ac56e0c80c3c9ed06c2a27d9ce9707f603e7c589aed531f4ba90b1c2a7e43981a23d4840a5c682855186657a628eeab59b00bad
+EBUILD logger-0.ebuild 620 BLAKE2B 40e487d23f98d31e8068031ffbee1567e20ae286955be45b166561b887d853c3bedadcfe3a0677ca2a79352dbcf1fbf8ec43a0ec30754ac5d1e583e56d697983 SHA512 a5fe7072b7d6c2656fd522e4c02f6c8b87c4336ae9be75cf646017e8904a21ea3dacd4b93fa012557b1e010065679da9b6de1b68fbe16a6f41a9138665a0c3df
 MISC metadata.xml 369 BLAKE2B 29642895d74d819ff7cb00b91809f80d01ef37a4e0df40ab3a366b898de2d7b99968bf02b6fbeb42d0b7867451920529cb6ff1bf69bd7480d3b55e2bd3abadec SHA512 a43e7a7e1fe1b62d12129442e43a1c1099fa51b0eea790c299dadd628180e2ea46412506277607571fff179f4860896685fae00f8e0b9e2a9d5c5753d2ade82f
diff --git a/virtual/logger/logger-0.ebuild b/virtual/logger/logger-0.ebuild
index d04cc83da7e3..4f547ca25be1 100644
--- a/virtual/logger/logger-0.ebuild
+++ b/virtual/logger/logger-0.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=5
 
 DESCRIPTION="Virtual for system loggers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 	app-admin/metalog
diff --git a/virtual/man/Manifest b/virtual/man/Manifest
index ddb2d728c9ef..641f1b66397f 100644
--- a/virtual/man/Manifest
+++ b/virtual/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r1.ebuild 476 BLAKE2B a7f6f28b67748bb399e346eac9843e8d0249098f7df907af60327ac9215a11308ba589da5b75b4a218c5b8553cc7660675c90c5af12bd1cd123da41b9e5f5298 SHA512 65ce42f9bba11fc1ec31652e753f45e32395b66f9f32724328bb138d61cb11963243c6ac224cc54dbc61928da749580dd4e6debdeb8fccbfdc8e9d8dda4d5efd
+EBUILD man-0-r1.ebuild 464 BLAKE2B 5476f37d558d283881555d092692ff6e74bd7121c0fc0cf9edaf970dd2b44a0f9af26c35f4aa51fc181d86bcedc40629f66cb47d894e21899adf83eff6c8130f SHA512 ae606809733933f34ce83006606137e18ad4b9f09b6c6705fc109a51345921d8fb104f3ae4fc448a9618bd1e41b5ba6f453a0aa4cdb32d14f334485b37dcb83e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/man/man-0-r1.ebuild b/virtual/man/man-0-r1.ebuild
index afc77bc1fba3..d755d3d8602e 100644
--- a/virtual/man/man-0-r1.ebuild
+++ b/virtual/man/man-0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Virtual for man"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( sys-apps/man-db sys-apps/man )"
diff --git a/virtual/mta/Manifest b/virtual/mta/Manifest
index c44c93b45fda..ccc8ddd1ce5c 100644
--- a/virtual/mta/Manifest
+++ b/virtual/mta/Manifest
@@ -1,3 +1,3 @@
-EBUILD mta-0.ebuild 826 BLAKE2B 15b3a41ec2f38586c66e5568253cfe829b6202130e9345a9cfa558509450396eb6aded26559635250c533b8737e7616708ba88de35df78733793cf48cc153fc5 SHA512 9b90f04d52d41a8a709be8f66a06567f6908aabb3596a85a9187f3274d6859d994d623817f7eaa89ea772e0dd063ad334617d9afa54ba1c841ca476c0550a928
-EBUILD mta-1.ebuild 763 BLAKE2B 7471c663e354ad8b48164f63562762ec5c6772646657d4d672078d8a754a24ff0efdc87733f73a3eb35d3786ceb66a80dd07c726a31696a846bf390f6ba760a8 SHA512 86f43fee05f9dbb1fe14f77477e1ea0a31efca7b2abc39c52be4d08726bb42e1b6c112556c2193774cd87bbb223a35da907c862a97f96c88886d0e609186878c
+EBUILD mta-0.ebuild 814 BLAKE2B 456b99a597dcd8f3392030ab6736b8f39705ce60c651bb9763b3df76d2c97bebe38b0f7c3ebc752cfd1e485f425ad8d2e94f766a7994fd643813bffb22e45a08 SHA512 e9dbb720fb0ec3c0b3859ef85af986160657fc464797fa4d9cd798bd50cb3d8ae2ae3c3b24ccdab48617f9ddf3ab64854c7c65b0a891925dbf30c6059215055f
+EBUILD mta-1.ebuild 751 BLAKE2B 59bb21ff2f87948424f0b078364055a07a90a75c74fc268c1e4e25b552abe995d2b3d97f64813b7061c3faad858710c5eb1cb39323b211e9970a0a919d6f2b3a SHA512 94fa29f350ba05879783dc935fbad05a595bbda047a72c9ea1edf61db4e5e6387de84cbcb65941bc1d341911cfbbb6beccdd2a3e4057842dd610ce1cee42aad8
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/virtual/mta/mta-0.ebuild b/virtual/mta/mta-0.ebuild
index ffa29bb1a076..504f56b71548 100644
--- a/virtual/mta/mta-0.ebuild
+++ b/virtual/mta/mta-0.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=5
 
 DESCRIPTION="Virtual for Message Transfer Agents"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # mail-mta/citadel is from sunrise
 RDEPEND="|| (	>=mail-mta/ssmtp-2.64-r2[mta]
diff --git a/virtual/mta/mta-1.ebuild b/virtual/mta/mta-1.ebuild
index 3dd6833a81c5..25872a656f02 100644
--- a/virtual/mta/mta-1.ebuild
+++ b/virtual/mta/mta-1.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=5
 
 DESCRIPTION="Virtual for Message Transfer Agents"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # mail-mta/citadel is from sunrise
 RDEPEND="|| (	mail-mta/nullmailer
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index a1e3c8174bfb..f4c8b150eb5f 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,7 +1,7 @@
-EBUILD mysql-5.5-r1.ebuild 623 BLAKE2B 0e10e1ce6c72efe85f4b8ed01ccb40419be8648118c0bf33735013f9e8f40eb0b627aeee7abf1380e1f68fabac5b9c1c57bd50c9f16aef9c748b95cdd6744a08 SHA512 f54d9a9faa5e792d2fe657c4579197911754dc83b56e51c58b86b1e505d7f1ce14496b067506ba38895232c1bf24da774e8c2f8ea84c4f11afd5758976e5bb8b
-EBUILD mysql-5.6-r10.ebuild 879 BLAKE2B ae92141f6030f791a08c632b9107a9ee2df350aac1ccfa3dc3dc6c2512cf7ecda52a28a7aa68039ee7def667d59cc1c704c559798cc0a4a050551ea6f95daeb7 SHA512 7f1c7881a253e00d4c194bbae53e11008c8860058398dd5a918a6e45d2b90c7d45f151df1beb9fe1c84a01276e72dcb7a90c4c4c14aa33c26745d343f27eab0d
-EBUILD mysql-5.6-r6.ebuild 1197 BLAKE2B 58e5dd9dee5d90e607aa0d35dd787e051008dea013fbd26f5e15953519dfdf61aba120c79dd520a792e26e1eef35a8b7b40610f5781089013778ed599f5147d5 SHA512 32c86e2c3f280305028f3b88e83a7ea3c7a362676d426143a7a72236e23d051d983d81852b89764c165284686c8c6db15406e91ae2c2546814d6bea0a5e62472
-EBUILD mysql-5.6-r7.ebuild 1215 BLAKE2B 6451edc1ed9e51b7ee8b84c6b82e255d83e9e7acab665bcc57dec3734640478020e33d7705278357b5eebbfd4ad89bfa638ebeccf516a09df9e5f1d57ac604ce SHA512 8ff4874af79a70f7cab5933b73ed9c415a89b3e31982bd81b828bd15c37abddbdbcda2264f503021db3928e774ca28498c7b9926bb88c854a2dd339b71934086
-EBUILD mysql-5.6-r8.ebuild 734 BLAKE2B cdaacd2a54f109849242eedc23e017eefbf9be9c794fe663134f2c8694a8078ffaf1a6dc3635f217dc51eaafb716075d6dce99ca7abb20ec6189a1ffe4c37017 SHA512 5c4b2a828e9eecd1da524895b1d471a7725bdd4fec042c6af4b63d84ae479b7a542f970cc850969d70c63e726c4c96d2e3791084b6d031b64719b18cd202cbea
-EBUILD mysql-5.6-r9.ebuild 790 BLAKE2B 3837d3777bdec6712cacd8f0cb54e8fae4fc8ff517fa443ab9937c8519ccf8fb86b2828f3fe42d843a0626d23cb28a21becfc6cfee1b7eb8b654efe909cbf93e SHA512 b4e612a08bc566a9cd9d469b86d65addb828a04ed2fd18c474f29cdafd0f06d158550389343e1cea1cf316e728e3eca0496df9382e85e0095d608746be01ad30
+EBUILD mysql-5.5-r1.ebuild 611 BLAKE2B b2cd08cc8368c43c80d86803fac7bd5ab1cb7a57113f6268d2c658475c4526e828568595d8e8800b7593add848ff6369b824fc0afd2e8a71f812330c88bf5dea SHA512 8e7523d8d90cbfd11638d4ef354324ce83a6e388693e082fd366e1ad0b1cae6c7f5b5743d69521256296f0943e777523fc72378714ca7cdb64a5c4969a8c527d
+EBUILD mysql-5.6-r10.ebuild 867 BLAKE2B 9feb6d3b7b6c9d2aef92a154c70ba96ae8d4bb9642c35102c3215c3a80c57cec31fb41b5d6698774667a40949fa422b0f73ff6c10a157f6d332840c3e0aefe19 SHA512 63b2b6425926b89a394bb17d12001d921f0cfb7b3bccd816040876e5978037c240b995feefcdf877e2e9e0c5e8d6211b90287bc593f63855b31aa700c7f950ab
+EBUILD mysql-5.6-r6.ebuild 1185 BLAKE2B 51bc2072ef39ac1fd4c92a2078e2b8878e9bfb9b2d6ed4a06b12fadad53f1f8d80d1ac0a3912f4b766aa0c4224fa9eee873823a852dcc01b9cce44111f563f74 SHA512 ad8525120cabc4ab3fe8feb52784eed4abcfc288c4df43a1dd3ab920a6154d4e02d29a56c14fee4253c4fbd4d08c0aa223f102b87cca06b2587bdc19fea12e0b
+EBUILD mysql-5.6-r7.ebuild 1203 BLAKE2B 4c072e8fd5078d647b68f60d886dd1f5e33531901ce614f6bd7d8a667e1463b37023d22a6923628273832b3cda0f3c27324099a6efe3e18f552a4e94ac63d1ae SHA512 ac867e39a127fc6ae922c953e252bc9806d5c2e464646e86f42ef78c9223a25a670e0a46029ea6399d6baf6ba9e7fd568ef87511127edcc82b4902ffae037df8
+EBUILD mysql-5.6-r8.ebuild 722 BLAKE2B 40482a72afabbfceccb94d20f65216ce603988c8ced8ef0028a878dc564321afd14dd0a8ebf5f269108aa42a758256651a06dd2a4570466dea2b33f080005c64 SHA512 03fb564df2fa05cfdad1fc41fda882b57dbac9fb254c7db3c6e933c9b68c96600e8554e8b27674d56a709d934de2778acc5e9c984fb2d71ea608f6d936d2c882
+EBUILD mysql-5.6-r9.ebuild 778 BLAKE2B 76fefc1c28f88ced91da09cd0ce872145120020a655470f86a8b362144cf41e644133a9515e6c76e3e80c88d393e6267702b2251394f76e6fb77a412b09be388 SHA512 4b1837d9a422d306d7de884e078ad71fe43aa8794f349d69649f6543312775e94ad0b2a74fb8cef744fd450c019e5c51ecf2e7d47a70cffbaafa71abfb0fa332
 MISC metadata.xml 386 BLAKE2B cc1e000793240edd0df36c1b83d13c8806ac631fc5d476d574aad80d347b5d37f3e5c46be124ee6ab9b6061e05bf78340625ddf75857c9ea4d32019334c23405 SHA512 76ecdfbd7f00cc8ec96d0c8d98bf88b843bc51b77a12869dbbc778517d1d4dd95ae01cfe56718a0fdef74a111ff20d64154d53470cfae836493215c031504451
diff --git a/virtual/mysql/mysql-5.5-r1.ebuild b/virtual/mysql/mysql-5.5-r1.ebuild
index 642276c6c344..254d8a3c3b4c 100644
--- a/virtual/mysql/mysql-5.5-r1.ebuild
+++ b/virtual/mysql/mysql-5.5-r1.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="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded minimal static static-libs"
 
 RDEPEND="|| (
diff --git a/virtual/mysql/mysql-5.6-r10.ebuild b/virtual/mysql/mysql-5.6-r10.ebuild
index 297b3997ba2c..7a5b6320d955 100644
--- a/virtual/mysql/mysql-5.6-r10.ebuild
+++ b/virtual/mysql/mysql-5.6-r10.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"
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded +server static"
 
 RDEPEND="|| (
diff --git a/virtual/mysql/mysql-5.6-r6.ebuild b/virtual/mysql/mysql-5.6-r6.ebuild
index 8d9e780b395f..c0766fda8bf5 100644
--- a/virtual/mysql/mysql-5.6-r6.ebuild
+++ b/virtual/mysql/mysql-5.6-r6.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"
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded static static-libs"
 
 RDEPEND="
diff --git a/virtual/mysql/mysql-5.6-r7.ebuild b/virtual/mysql/mysql-5.6-r7.ebuild
index 3ccf8c0f0f5f..4291f5e07905 100644
--- a/virtual/mysql/mysql-5.6-r7.ebuild
+++ b/virtual/mysql/mysql-5.6-r7.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"
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded static static-libs"
 
 PDEPEND="virtual/libmysqlclient[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/virtual/mysql/mysql-5.6-r8.ebuild b/virtual/mysql/mysql-5.6-r8.ebuild
index de10297e5443..f18b5d48afb0 100644
--- a/virtual/mysql/mysql-5.6-r8.ebuild
+++ b/virtual/mysql/mysql-5.6-r8.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"
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded static"
 
 RDEPEND="|| (
diff --git a/virtual/mysql/mysql-5.6-r9.ebuild b/virtual/mysql/mysql-5.6-r9.ebuild
index ad96d5222183..4a0674dc8887 100644
--- a/virtual/mysql/mysql-5.6-r9.ebuild
+++ b/virtual/mysql/mysql-5.6-r9.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"
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded +server static"
 
 RDEPEND="|| (
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index 2d729b35453c..3fce3f9d14a2 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,2 +1,2 @@
-EBUILD os-headers-0.ebuild 661 BLAKE2B 517d10782e7426651f3d647110c321ac643fb44d8d36f5daf61043b7ca02f2f12c1b69d7e3064ec1040ba990565114a17720a7ea573d940822433579dd5d4c9f SHA512 985a7abedd6fc3e805665b35a42a6a5fa0ea22d5496d779ce86ccbe99dbb724ce4524e2536ba098b6838dd0e49cec29783fd1f3291df7177dad433b089a775c1
+EBUILD os-headers-0.ebuild 649 BLAKE2B 5f28d3539549e8ae66ea967280175eccbcd62765a9dc58fd4824a752eb2f94fe0fc0060846b1c729d82e0e026e0061d3e5a5295b9c00bbaaad34590330843d7b SHA512 0d8a2399d57757013ad5b0c29156844712fd6bab5f69b0cc2e0d32e59b5ca8266f921ca1a5d8b9178d27cab207e604eb85e88c6251738aab6b04d9bb362b5c14
 MISC metadata.xml 356 BLAKE2B dfdbe957c17aa00de768e659f3406001e0ea7a2e20dcfdc3b737f591fa489737224ac04444060e2993e64981b039ebceff9c1083ed3ed1b9597c253cd2b3a872 SHA512 8771efbd53a5bce7d929691b5e0954eddbf9cdc0aa51922efef0ea7fdedb7aa1197def3a65c8603906b36ed7664f55ea05f99e874a37cd522d1ebf4753db2ed0
diff --git a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild
index f0d914465558..caaca3d0dc5c 100644
--- a/virtual/os-headers/os-headers-0.ebuild
+++ b/virtual/os-headers/os-headers-0.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=5
 
 DESCRIPTION="Virtual for operating system headers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
diff --git a/virtual/package-manager/Manifest b/virtual/package-manager/Manifest
index 47b4e669b148..e461449b2a40 100644
--- a/virtual/package-manager/Manifest
+++ b/virtual/package-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD package-manager-0.ebuild 518 BLAKE2B 5ce5a3424b6a41f87263438515f553fa7006a1788fd6bceb2846d630d50272df1b24a4c36e515015710cd53a0ab5448c51df87160523a2f86a8ae5b4b90d5a8f SHA512 6f5e7ff5c3a73bf796805421e7f5f3964814365153f45f8acae27b623f5545f2c3fbc74789606de9e17457abfa279d51772417a4adc8848a9bc9ad7df35726b8
+EBUILD package-manager-0.ebuild 506 BLAKE2B 9c2ce4a1b3a6b829ee26d0c45709a5eb22b793a9cd24ee81200f2fb8a949093f38294fbad63dafa3113fec7e063ddcd3fac3e3579eed742ead4f24c846d59a27 SHA512 5016687018060cc5d113107b5578a384b12984a416b91aff22b4fde10a6ba9221691292cdb8e8d0c556e48d1b07cf06cdd615f445d7ab3f782dab49b9b6e2672
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/package-manager/package-manager-0.ebuild b/virtual/package-manager/package-manager-0.ebuild
index 51eeb848cc70..0deadf86721d 100644
--- a/virtual/package-manager/package-manager-0.ebuild
+++ b/virtual/package-manager/package-manager-0.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=5
 
 DESCRIPTION="Virtual for the package manager"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( sys-apps/portage
 		sys-apps/paludis
diff --git a/virtual/pager/Manifest b/virtual/pager/Manifest
index c0dfcdc56cff..530054031c4c 100644
--- a/virtual/pager/Manifest
+++ b/virtual/pager/Manifest
@@ -1,2 +1,2 @@
-EBUILD pager-0.ebuild 578 BLAKE2B 7cdbd6eef654bbe8d47e26dcde46b648b27b6a51eaa085c064f617689fe9d4999115cf9f4d98055b4695849f8b42aae5c202a3932337c051b48723aafe879ebb SHA512 f002e5ef54e1259d9433430dd50aa370700966a5eb88dcdcb23800bde591cbd362f4968d02d499ba8e8fd901b7c6138e9f861f43315a7a9fc2ca6ae50ae36440
+EBUILD pager-0.ebuild 566 BLAKE2B c1f38cd7513cca4c431349196c8fd0ecc80e109068b69b3dbef8c9e28ee33dbfdffbe06f45ba89560cdc8144a55474160671625d561de32262ef2460aa7045e8 SHA512 cb73babb5d10ebef94aaf1241326bc8b5372e10e8fe5aac8e4141f8e052e042155494ff6938fee07534a3d194366f629238558ab28d348de228bb4de0f780656
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild
index 10885e8c52a9..b4c998241723 100644
--- a/virtual/pager/pager-0.ebuild
+++ b/virtual/pager/pager-0.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=5
 
 DESCRIPTION="Virtual for command-line pagers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( sys-apps/less
 	sys-apps/more
diff --git a/virtual/pam/Manifest b/virtual/pam/Manifest
index 259fe6fd0be0..ef88b0a8369d 100644
--- a/virtual/pam/Manifest
+++ b/virtual/pam/Manifest
@@ -1,3 +1,3 @@
-EBUILD pam-0-r1.ebuild 474 BLAKE2B 090ab01be17e4fbec78f08330c792139f01d8362794a802c6d101eafd56c85a507dd38776541f46eacd414be72295bed7fa711a28f01de2374b67ec58720e702 SHA512 e10ff2a327aaace18733c28c9d856a98624ce379d221d223c40a308dec23232d221cc50f382ba6d398ce0af10a6762e4d415eae33e1d5fe7fc0994fb163b1fc7
-EBUILD pam-0.ebuild 387 BLAKE2B b00e5003453c544f222902dae4c846e657758aeba4af6b4df5e75b48bd1b3d078b175c2899066cac80df53693766fbaf1d7b3e3b761a19a6651eb071fbd7c576 SHA512 75d29196317d6f87505449b83cee2a5776b9eccdfad0dd6ddfe2702748ccab04909bcec76f610b1fb42e4371df32694343ac17bcddea5059601d9732a8503c78
+EBUILD pam-0-r1.ebuild 462 BLAKE2B 46b3d96c2644be031e64b7cb7bfb6deb1cffbb4923d5545fd27d829ae035aacf702ec86db2743e699a39db37d868f357a7067802ebb7e4e8e8b07f8be1b21723 SHA512 7a897f07df117340fecf611c382389d104a0fca566e51bd603590ae27c9993e277e9c8056dba078f8ecfe9fed5e3720813aecc7b10f91c1dc037c8fdcb6514cc
+EBUILD pam-0.ebuild 375 BLAKE2B 4f6d9d8ce3aeb9d23a70d5d20dace4d443a71b8ae88379b5d7bfd9ae42bc4d9da1af25893d1bd7553cbc702c32dd94530298c67c5119804bd461d9a355cb9e7d SHA512 dbd299b4035663f664d066a900862c97877b19b5753627a642a703dcaaba9d450b7dfaa617906f2a5e140dc14881ec1b0d93a4acdc96abe70f0cf3c03920456d
 MISC metadata.xml 218 BLAKE2B 56f47c590634b26d19b53090a64e5949c6033480438239a582e2b46caf1e24c6a0cfc5865ebebe3602c9be473cbed1697035986bd108df1d1361b2c2f6092d2f SHA512 7be455e43575c72306315d52cfbde10ad9b4168a5da4a0ab7b9bf6c526720d0cf1eb2ec25592d0822c3cf792b185fd0a1b88902bc52cca055dd279c1416ae9bc
diff --git a/virtual/pam/pam-0-r1.ebuild b/virtual/pam/pam-0-r1.ebuild
index 9183dca12fd4..4dce7cefb980 100644
--- a/virtual/pam/pam-0-r1.ebuild
+++ b/virtual/pam/pam-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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for PAM (Pluggable Authentication Modules)"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	|| (
diff --git a/virtual/pam/pam-0.ebuild b/virtual/pam/pam-0.ebuild
index 716bf60dab16..cc333af3c997 100644
--- a/virtual/pam/pam-0.ebuild
+++ b/virtual/pam/pam-0.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=5
 
 DESCRIPTION="Virtual for PAM (Pluggable Authentication Modules)"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( >=sys-libs/pam-0.78
 		sys-auth/openpam )"
diff --git a/virtual/pkgconfig/Manifest b/virtual/pkgconfig/Manifest
index a0e43c89c53e..0cbb46c10c51 100644
--- a/virtual/pkgconfig/Manifest
+++ b/virtual/pkgconfig/Manifest
@@ -1,2 +1,2 @@
-EBUILD pkgconfig-0-r1.ebuild 684 BLAKE2B c6e1708d9361f03409f1d72f1dc53d777eaf284d6861b99fe737e4b742aef4fa9e517af304a49f1058963647b949f58f222ea4106ae70d4d34d3729e68db06fb SHA512 d672d9a0ef7b83c62a35d40c5e86753b8fd13a520be4b609d1d6ecc3613275cb0c313c55a570b54f535dffd068232ebe7c7d26b9db6b27008a1b7c0b4999d0a0
+EBUILD pkgconfig-0-r1.ebuild 672 BLAKE2B 7d04ecb4921e0605573ab7cb9c2615fd8157e2726a752070553b8ac6e1a0779fbb657fe9cc871271d42b05a9b2d026cd81ec2015a11675417e4e8cbb59b95dc4 SHA512 aac58335e56bc37969b1e870128f9a3344e095a5de2e31091446295ab86b833ee82ce3e7b14a71d6309d348e967416e3f2f5f3c5f6bcdcd9ae94d5dbd8d5764a
 MISC metadata.xml 374 BLAKE2B a03324d45e07a57ed30c3396a4a2d7b18b2bed71ce39f1e40472532665601882163a11298726b917fb080cbb9a5e9c8bc83d095272439c28a76e8c8519f4caa3 SHA512 61d5f5e569ceeb1e20e809e7f34bd70c32e304d57c5ca6f2260fbe8435cb7a870ec13b0aa8c6c4aabec379d0f7f7478fbc668fcfc0778762efe0b1655bbf40aa
diff --git a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild
index 8f631ddd4a0d..b1fb4c6370df 100644
--- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the pkg-config implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/pmake/Manifest b/virtual/pmake/Manifest
index 5b009169c464..2b3f4108bade 100644
--- a/virtual/pmake/Manifest
+++ b/virtual/pmake/Manifest
@@ -1,2 +1,2 @@
-EBUILD pmake-1.ebuild 395 BLAKE2B ae12d709054b3ebb9fa057a8f84c8bd76ac1126f71be19fd09189c3d9a52f07350eeddc27a604b1cac2928e98f7ede7ee99dd73ec41e4cf17f29bb8879ddf89b SHA512 3da61ddaa5116c9f6cc0264f33c16ae6385063ae2069a811ceaac1eab5dbf93b15555996edc16b5dabb9b69fac149bf4a732c8d69ec76e53ec101a8a287c0c30
+EBUILD pmake-1.ebuild 383 BLAKE2B df1b230901df92678cbc1768a4f912e0fa021cd085f3737e0071172263f3afc916416a90a3f37ed1ea5dbe57341721d8a3b6daeeb84c4ddc1d6279f3b437a858 SHA512 db00b198cbc04aa0c35c57e22e05cb801081ed3e92b632b9c54cf0abbd904ceffd33714e33c2d004d21ece8ef0874619031e56b4545927dcdfd73d04de3dc0de
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/virtual/pmake/pmake-1.ebuild b/virtual/pmake/pmake-1.ebuild
index 5057856c369b..ecccb9f4f7c3 100644
--- a/virtual/pmake/pmake-1.ebuild
+++ b/virtual/pmake/pmake-1.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
 
 DESCRIPTION="Virtual for BSD-like make (to be used with get_bmake)"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos"
 
 RDEPEND="kernel_linux? ( sys-devel/bmake )
 	kernel_SunOS? ( sys-devel/bmake )
diff --git a/virtual/ruby-ffi/Manifest b/virtual/ruby-ffi/Manifest
index 0e36220d1d01..328de480d516 100644
--- a/virtual/ruby-ffi/Manifest
+++ b/virtual/ruby-ffi/Manifest
@@ -1,3 +1,2 @@
-EBUILD ruby-ffi-3.ebuild 605 BLAKE2B 98dea4b070ecd23042bd4337fa5fd74b3dd04c6bc003fc59c424b5f1fb663104d002e5be9f1357420e992d0ce03abc21bd0d702d260f02f2c643ad299e10d2b8 SHA512 3989673c982d1b5b668a9a9dd46c5683e6bbe2c19003937adb3c8ef61cea4db37d1be0b3f82ae3340d79bc2f0233e4c74f719c51d4e234a46b6ca4647f503c97
-EBUILD ruby-ffi-4.ebuild 740 BLAKE2B 66a99d95cc30bb9f5447f52e4f2b52202bf1bd935cdcbd62954b6f1c4ce9999900d49f9a82c43f7c689e4b229507723c847c33a74c68c93542b2050ee49a83f5 SHA512 df27f8b5ab54885c0dd796007927726bbf2e1078a9c350ba0ea1b3270f7c4efe9759e03edcba4933c07fecc04b02a7b615f45a5e9ad9ba07e572c7c85a2bde1b
+EBUILD ruby-ffi-4.ebuild 746 BLAKE2B f18effcb2bfbb97c7ef5391c9644e654a665c778f00107f586e8240cf628e458859673208469da27cb3c4bc106ea4fa21629b5d1a9a97b075930ad2151dbbba9 SHA512 14df5265e03ed8beb7b40b3a9fa5e64b310ff5905dc572ad3432f13185bd9fa39da2e2e746bb87747b0797c41f75e5b3a51711aeb9c37aaa0b39f6ae427a1283
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/ruby-ffi/ruby-ffi-3.ebuild b/virtual/ruby-ffi/ruby-ffi-3.ebuild
deleted file mode 100644
index 0702a58af2c4..000000000000
--- a/virtual/ruby-ffi/ruby-ffi-3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for the Ruby ffi library"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] )
-"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
diff --git a/virtual/ruby-ffi/ruby-ffi-4.ebuild b/virtual/ruby-ffi/ruby-ffi-4.ebuild
index e0364280740b..23cca3ec77c1 100644
--- a/virtual/ruby-ffi/ruby-ffi-4.ebuild
+++ b/virtual/ruby-ffi/ruby-ffi-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=5
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby ffi library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] )
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 9f6207b514f7..401b989f31e1 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
 EBUILD rust-1.15.1.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
 EBUILD rust-1.16.0.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
 EBUILD rust-1.19.0.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
+EBUILD rust-1.23.0.ebuild 310 BLAKE2B 9d9fb8b54b45a2db9d33be543b168a679594507fd4b2dfb9c5c1f5961b6ff0f51dbfc2f9420290c42750db54c2abf099f4d7670eae10fe30f6f15d8ef8ea126b SHA512 a80e69a26823bc72cdcbcc1192cdd0e6ba0237205e65a05b6e68dc197390613551af8fc00022d23116dc05f94ce7fbd3f49fce0db5a9f666f82aafa13a0bdd9c
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.23.0.ebuild b/virtual/rust/rust-1.23.0.ebuild
new file mode 100644
index 000000000000..92f092c7e35a
--- /dev/null
+++ b/virtual/rust/rust-1.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/service-manager/Manifest b/virtual/service-manager/Manifest
index 476f5f2f5303..e22656368279 100644
--- a/virtual/service-manager/Manifest
+++ b/virtual/service-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD service-manager-0.ebuild 668 BLAKE2B eec31fd18b879a92e360132c4dbf04913038994a53cdcefd1668dd7dac5d5d0244b843c93690ce6a6a105589d2b1367ff37430a26fbbe4b56ed49da87d96e96e SHA512 4e24f69a8c1a5ce10d2d19146c08a40480a448e9994efd77fec0935cd3a073de49fd810f1821c1f42ac4211b431b253274b8ec46e2c878d63d2fe66e9e493964
+EBUILD service-manager-0.ebuild 656 BLAKE2B db95880353cbfa8f545bcf0b72757b23c97af91956e55f9083dd96f079f2584904925306f8cf7fa4af415efa99455fb8d43b75c937d3732f3608d43bc325473a SHA512 27beec2d5e615d09fc4a31dfa6fa103179ed0b1fe41614001814201bb99f43681c5a0708656c557dad30d0eebdeabc001d985d6bb9594422e35d26ccfe9119c3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/service-manager/service-manager-0.ebuild b/virtual/service-manager/service-manager-0.ebuild
index 1a8bef6db729..b955ec1aeab0 100644
--- a/virtual/service-manager/service-manager-0.ebuild
+++ b/virtual/service-manager/service-manager-0.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=5
 
 DESCRIPTION="Virtual for various service managers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="kernel_linux prefix"
 
 RDEPEND="
diff --git a/virtual/ssh/Manifest b/virtual/ssh/Manifest
index 527590d789af..40b536824d0e 100644
--- a/virtual/ssh/Manifest
+++ b/virtual/ssh/Manifest
@@ -1,2 +1,2 @@
-EBUILD ssh-0.ebuild 594 BLAKE2B f7fa150a5d9f867492a1657b5044a9692fb683b89dd0929b6c1769d2912769c5cc6af843e89334444ef4ea46614484b2a22ed5460f779c3b017008b09f37dcfc SHA512 d46e98a8d362297a479251a164bf3833bd3466ba3accd0c9a0972b6280fa68478e2613cd8d85bd8f23f152ff6a786bfdfb3ab57a5ea487cfe9f8a8a9d9693048
+EBUILD ssh-0.ebuild 582 BLAKE2B c5f4a681e2873d6015eeb6533d515316627298a2b963e54899b5ec0a6f29de03c3cd1368b6a809ed745b9e58316c803ec16fb0ec902d15df64fe2a1cb8def906 SHA512 b8446da3b9fe11b496a09e2f76b73373f14f611de1ae54ecdac826bff267244ea283b605a67dad11699f564be4baba1f112a53ceed6af80df445596fa304d409
 MISC metadata.xml 488 BLAKE2B e57ebdf4357d109eac78b03f0b1a815188f80a598a5a51f9dba3084ec3b9b52a3c3a26f137b8f273f3734b9be0fd14b71480ca58c87a8f1b635a23d6cacb96a1 SHA512 9b86ff6b58eda9c228c06de44c99efeddecb0c2c8024f044525f006ab067c3747659e607aed3c9ad08e292948e9d2245537d435a31fcb3e8b59ed93d1a31e19a
diff --git a/virtual/ssh/ssh-0.ebuild b/virtual/ssh/ssh-0.ebuild
index 5726c6fd1819..f20655995e06 100644
--- a/virtual/ssh/ssh-0.ebuild
+++ b/virtual/ssh/ssh-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
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="Virtual for SSH client and server"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="minimal"
 
 RDEPEND="
diff --git a/virtual/yacc/Manifest b/virtual/yacc/Manifest
index f4325848f62e..465bd0089846 100644
--- a/virtual/yacc/Manifest
+++ b/virtual/yacc/Manifest
@@ -1,2 +1,2 @@
-EBUILD yacc-0.ebuild 525 BLAKE2B 6bc31c939815505f1afb89637100da050d46492cd99d5a6b55fec9c37c7a557b5f5ee07b2041e47d9b5056b2ed927880e994973a076f14c773ac15b42483e243 SHA512 289ac0f2bb3603d8df4ebc265d309e0a9e7dc245fd0c8835fede56bfa8f913ccd6b81c9416ed6ea940fc1815ac9381231614a48d484aecd596fa1d5fb92fc9b6
+EBUILD yacc-0.ebuild 513 BLAKE2B 056b500aeb72aa23b9a48435d359d91d8f07a50a3044a4b853c99ebab6992bf34a8582d0585211627c2262892dee68f3c321efdcbdc2f9ae2c4083d8a5332c31 SHA512 2e27b1a9e6551fa30bb79c83fb85d10c5272df505f199278a9cc519714e4c81a6a8cb9e1289dc7ba1853dbf0afabee3bbaee019c20b2896473a2a948642f1c2d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild
index ab752e983d04..fe329ee89ab1 100644
--- a/virtual/yacc/yacc-0.ebuild
+++ b/virtual/yacc/yacc-0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="virtual for yacc (yet another compiler compiler)"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 15869c9cf9fa..3bedc9710b92 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 242c6f7218a6..c16bbd2396a2 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,8 @@
 DIST icingaweb2-2.4.2.tar.gz 7180122 BLAKE2B d3018ab2bbb9cbe501c638208d7546640b83775ef86e340b61c9a83bc8f250060c34a7dae74cc983252ff05747d951107ff5c7857aaa44dc387ce513843c503f SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53
 DIST icingaweb2-2.5.0.tar.gz 8032968 BLAKE2B f0fab047da90ff514f715a8ddbf51d97beb1cd052513a523c63fbb97a424ecee8ff7b2c63a6e432cda3d70bdb1283641702d3ae1ff4146d084b312009ccdbe5e SHA512 9946c74033550accdc7077b3f77ce035931c72645871808ea488113d3545f8082460c1b8a4dffcb08f01d452fab54fd425e90e77cd006a7783b426132015498f
+DIST icingaweb2-2.5.1.tar.gz 8133540 BLAKE2B f5f9d2131f87160f7df5b34cae7e9b1036e14994f3b739607b26ba676e6cd56ad95ed5688c873df3232fc9782566b0bb5c2054aa04dd272b389a1eae8501af88 SHA512 8e76347f76a2b2889fb9a61c000ef7865f40b2ea261f59bfbf24bb8d0e4e7e2977ff283d31989f6892e371f4a9a4d4682a2cac3269070b2036cc37ea74af1b11
 EBUILD icingaweb2-2.4.2.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
 EBUILD icingaweb2-2.5.0.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
+EBUILD icingaweb2-2.5.1.ebuild 2551 BLAKE2B 26e99debb6314b95d285171683ef789e0b0d3d7a6368c0c29c6e182d4179f2fbeaf080f4807710c7b160a47088fe969bb9d374ea81ce31d497514f25b32d36e2 SHA512 fa11545bb44db98cb2ca1ff33ad1185990c8d5ee0a15a26db86a47cf77564099576ddcd79eb21467846d46554c8b29024d41bba06325adba7d9bc5854a6654c2
 EBUILD icingaweb2-9999.ebuild 2546 BLAKE2B a5a883a093e6a88e99d357b65a5d7367719d40fa98d7d8ab530147631448f033ec0858481575bb5a981f0126bf650d7862ea5c283ff9add93325ec640b28034c SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
new file mode 100644
index 000000000000..f3513d784a28
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		nginx? (
+			>=www-servers/nginx-1.7.0:*
+			|| (
+				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 342a6146a16a..2dcbee078159 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-coffeescript-1.0.1.tar.gz 5206 BLAKE2B 7f67794efca76ac32230f1e8098d19b9b197542f5bc781c6a8eb80cf024caf3a8cab6c3c07c8470b58b09194ccfe7dd28fc4897e6708d5407b67ba245c72a66c SHA512 88c73c2393dff2b9dc8aac2329f6e669f98c66c5d1b7ee2a4dc2236608197a3bfdc07bd4a67832c94f4059e4c82212b2b14c4f37b48957e4b40c9d2449c7c482
 DIST jekyll-coffeescript-1.0.2.tar.gz 5042 BLAKE2B 1a08099b940118e15f5f2310671efe1cc61fc496242c94a3351654870518095d62f576922f1bbf882a64f7bbca6b9b00e1f692f00684f0a5c60005a5fb86c69b SHA512 cc8e3fc21d9ff0b4c0fb00652e8a8011fbb535f6c1b51c0c380637cb124524282f6ef5272e82976f964c5eae66a8340bd11f516f6625732d9ee51ef6c58b3a8f
-EBUILD jekyll-coffeescript-1.0.1.ebuild 802 BLAKE2B e3dfb60edfd8d28fd303d0a57698f3bcc49b1301ba5d03e09308eefa7c6d799a030b2df8d08426848890de40a33e162ff862439cae2f941aaefa318ac8fa51c8 SHA512 a0d3dd6c935e0cd02ef8068291a93b97af00c4c8b37d8f013e443b3e72e10772a9ce7f8ac5b9a6111d3b4af6db45884ec7bb99adf1878a5da6b374a8a43c8997
 EBUILD jekyll-coffeescript-1.0.2-r1.ebuild 855 BLAKE2B a5b431c54dc590e943f785d902d71e72427defe36d4b204abf98b16e07e3150d3799d1d14839c931cba007b58fad2cd5286046a87e99a8d8634178abbb109bda SHA512 deee794f3b9b5c09e93243959976c5bc637be2b4753b44a5690594c37c5d07fdc473ea65316fcf1374cb45234d6c75e959d77cb1a2ab16ee744e2c1fa3bc0c6a
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
deleted file mode 100644
index 1b1c70de2aa0..000000000000
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A CoffeeScript Converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e "/^RSpec/i \
-		require 'jekyll'"\
-		-e "/^RSpec/i \
-		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
-}
-
-ruby_add_rdepend "dev-ruby/coffee-script"
-ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index b52e49bd1c89..a87eb8906dd3 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sass-converter-1.4.0.tar.gz 7986 BLAKE2B 2198304c0f60fce68c60699e04556fea5961b771122bba54728b5fda6bb521915c6a8ace94aa975b7f91508b7edd7d728dfde7dad144b276e3e3affc53467f30 SHA512 2ba7a10b687aa1cdd193c85c70efc15b9ff97987e29b7c591382c706a7d6a588c376995858ab0b1aff38b118eef9fd71c2175a1e6f9a3bc396966fdf13949d1b
 DIST jekyll-sass-converter-1.5.0.tar.gz 8516 BLAKE2B 78b4c49f2d49f28f1c7f02fe808ab98644cb9143038c179bbdb872bf8b8d45cbba84bd73da924a61e661d7d22ba26f2715531146ec8169089729046f196be403 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52
-EBUILD jekyll-sass-converter-1.4.0.ebuild 597 BLAKE2B 1bfb30c94a43f7b5b43e215409f7848ba4f15abecd26135c1a207ebcc1a717c074ea7ebe28233e18a3d764de8e68600e768cc2c39bbdc4ada7d7272e406a91a4 SHA512 e2380e6780cda0c7b49ce7a78fb4ba643bd6d22867ec5b7c93ad0cb4ce96e8e0cabe0794c30d4f9074456ebaffe4cf556bb0290d1888f6f3e54ecc08b99b10ec
 EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 8f8ed5094888b162e964e89849c4d60389f475471081b979a31977b63b4b60b29c2b04015ecfe1decaf78d7366cff3ed7469daf8f36dbb423377d7f37c6a7b87 SHA512 0e20ff537f10b709ad3546c3265832e89d0f9418aa6a74e460f3e959e5a2f19834514a74a4a3febaa181b05baf02e5e033c4b5a32c16f1eab8d8be52e274c605
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
deleted file mode 100644
index b109b85567e7..000000000000
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A basic Sass converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/sass:3.4"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 1ab6f08ddc9e..3889d1d7ae04 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,3 +1,3 @@
 DIST jekyll-sitemap-0.11.0.tar.gz 64238 BLAKE2B eb3226d344972c82d328faf4149886d760bf240da1be36b878c9e9334a30b4b75954c0ea35acfe1d3fc0e638630376287ffe4c37dcbdbdd198632f280ff2959e SHA512 ba1bb162586b8383b1ede68e86cec73db023400586e373572aa8e7c3e26ef1024d313ce59aa1f7711b2b34ba08220be99d5bfeb0ea804e1a1091c0953f8de095
-EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B 99fdca4841c7c332201fe0f51c6c42bc37987ea744e9be255349e214708a4d5ac6313135adb8bcd903d77f5d33c7e59c50e6dd54352f1e056be79009857a9de8 SHA512 5835dcbb38496198e35fc20bf9e980f7e7f24701ce078f9fb6db00f2174ac2b90961732c5e078d2becdd3f390aaf635485a8ebb1621e98cfa3d71cd7665f5296
+EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B 4cd63b306b9d8164115ed5755399fa27b32aa7decdc3a3cd0cec41a8a8076459309d972c3fdac74f5abf0d5afa3cbe5933d7db267a97a281aaaefc707b23298e SHA512 55bd43adbc04d14f9aada76dd798e9fcbc90e90c851a77f7640fc80b11cc48a937a7b538fcb810cdf6f1cac4c2bb256d7dca23333fc1f3938b8165dddc8f8c50
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
index e9a53768800b..ac5b7cd2617b 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 2ac667571020..5cac785b99e2 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-watch-1.3.1.tar.gz 14735 BLAKE2B 273d7418c2d9d001c6fcde0dc1430e8c8dfaa92556305578b6f9597701467f28363550dc504402206e169590f927d63fb44259d49941ce7ff466f55ce809665a SHA512 ce54f4367cd2c5a63ce823b234584a84798fe0234165cb038f3af301b7ddef39ef1a983aad41843e51d1af9366e495a83112f6b55bd58127d1c95eaf5600eee4
 DIST jekyll-watch-1.5.0.tar.gz 15076 BLAKE2B 1270f309fed8e4aff6712fdad1554b9ed6e4d0936512c8c80a6b1d77977411fd74c099d361a7c7a3ce785e794beeca7d865e17f9fa25f0b4d889e861614b5c8b SHA512 98c9df7f92c214b0047cf266e06c48350615836af3b7ea69e1f77b10d26e4ed441fdbbdc16e557ef2293fe5ab1314ed71bb3e0e65e3f1ad4c4224f71e1255c95
-EBUILD jekyll-watch-1.3.1.ebuild 671 BLAKE2B a8763780250d9689f8517a40edfcb979fe8ea552acf8ac494e86fb71089ccc8ee530cc34c1f3ccac2b091499c31dda764a3b2c7e6bce989bf68bfe8cedd183d0 SHA512 1f09a81007da1bfd4c698a189fb04c5a421bd372b0c3381590cb21f09ce442cd8b401bc9e27081aa08343bb1069ad8e64ad118d68deef13c3fded4af6b9b7828
 EBUILD jekyll-watch-1.5.0.ebuild 671 BLAKE2B 9705a331e0de3c2e660284195c9703a45fab18217a1a35dd5356702a279e2d8e9cfe4728566613f1b0d48a9793de919a79c216079200d6c146ba29caf61d40ae SHA512 38a1e258fa088e7e09ae02fb8342cdb3c9820d5a4b48c5a7071fbb8d5e2afae1de7f54bfe4de9b581c9ca128a1ba1cea619a2acec4c7d42c127c682681ff8fd7
 MISC metadata.xml 331 BLAKE2B c43bc1213adee987e9bd55089f8f5fa00f5de2461fe584b8715332d7ace822a5b0ffc47a2af7001e5c134ff20d9a3580d2225dacee73e4fbdadc1735cbe806a6 SHA512 53a2e135c948ee84fdf2f7ad1583d658636ea1077b80b6e2ab52c10615ceb5a30ac4a400c213e5fff5f4effdee0acd4afc8653adbca80178815f1fdfd3620004
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
deleted file mode 100644
index ce293cf48f3a..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/listen-3.0"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 104ad1823c2c..62bd9ab956be 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,6 +1,4 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
-DIST jekyll-3.2.1.tar.gz 1010949 BLAKE2B 1efb4fd56c147e6fc30d8f617d55dcd02893c67a961376f81ba3c971a3e46495ada3f1af8445e682e07a48dd4b1466493fa3e137731645e799ac3e4f949c70e7 SHA512 36360e852b8438ae12a64320514204c7b0f8bc53d6cb04f6024a25d5294f562c37c1464fc0e632502814d8e2dd0900877b48c3ccb0046d7c6a145bb1dae37b48
 DIST jekyll-3.6.0.tar.gz 737199 BLAKE2B b823d794c5f4e0fb78276d2af28821a7ac67b13159832cbda3a691ad0f9e32c2228da1dde22a0ee33890ffb8384ac6d92adbb7b47629f98dda1d92024488475a SHA512 87c17c31cda44d040308079aacbcdba1e704186a69d64c1240a44960f7a79e74b35bb230be7c14419bb89843cfbf48ecf3601a8018df2255deebc0afdb4fcd86
-EBUILD jekyll-3.2.1-r2.ebuild 1591 BLAKE2B 4f99af1539470337ce0ceafa0cb3c20837c7057d2a383706ca214afce0480f673c1dc438b0ca3d6680e1c29f0d16a82fb0d6d6a664d90903e21d948725c04a85 SHA512 0580069c7f6bc00525f62d38d7b6bf140aa9582f7a808569da8488f3b5649327594048486b86de6d6f752c720de5911ca6cef78376073b40689eba5c197b2f4e
 EBUILD jekyll-3.6.0.ebuild 2060 BLAKE2B e4cc457be60914fc5ed7a2c01367026a8101ae3993b5596e8c0c9692019291ec4bd271437880057b36b78d5b953d2d3e614f0fed6f34046caff92a729a3818f9 SHA512 1d468fa1ee943368d07eeb8f2d303a4cace987838e501d4b5e773cf18782a0c44399611cd7ceb351b75aafd771ccebf7281475e6cf388da940a9f0fa516a06fc
 MISC metadata.xml 325 BLAKE2B c29145c8eacfee5164b55192ebd77d0b4134179380ac4c5f0ac29b1f708dc0cb1d91748ad68aca73380466451efcfe03c1115ebc706c16a70b527b2e3360a7d2 SHA512 02b93ff17a615bde6a2074bed7dc0d64c0cea0d11002e48fe5a132b3d8044c0329a5a69f62f917eadf8fb090ef1ea7ce99bd78496fd738a1d327599dde7582e2
diff --git a/www-apps/jekyll/jekyll-3.2.1-r2.ebuild b/www-apps/jekyll/jekyll-3.2.1-r2.ebuild
deleted file mode 100644
index 9e1b4a117d46..000000000000
--- a/www-apps/jekyll/jekyll-3.2.1-r2.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
-USE_RUBY="ruby21 ruby22"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features site"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A simple, blog aware, static site generator"
-HOMEPAGE="http://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/colorator-1.0
-	>=dev-ruby/kramdown-1.3
-	>=dev-ruby/liquid-3.0:3
-	>=dev-ruby/mercenary-0.3.3
-	>=dev-ruby/pathutil-0.9
-	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/rouge-1.7:0
-	>=www-apps/jekyll-sass-converter-1.0
-	>=www-apps/jekyll-watch-1.1"
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec-mocks
-		dev-ruby/launchy
-		dev-ruby/mime-types:0
-		>=dev-ruby/rdiscount-2.0
-		>=dev-ruby/redcloth-4.2.1
-		>=dev-ruby/rouge-1.7
-		>=dev-ruby/shoulda-3
-		dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,+5d"\
-		-e "1igem 'test-unit'"\
-		-e "1igem 'minitest', '~> 5.0'"\
-		-e "/reporters/d"\
-		-e "/profile/d"\
-		-e "/Reporters/,+4d" test/helper.rb || die
-	# Drop bundler
-	sed -i -e "/self.class.require_from_bundler/d" lib/jekyll/plugin_manager.rb || die
-	# This test fails without bundler
-	rm test/test_plugin_manager.rb || die
-	rm test/test_theme.rb || die
-	# Replace git command in gemspec
-	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
-}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 36978bc192bb..6ee8f9956108 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,13 +1,13 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
-AUX redmine-3.3.4_requires.patch 2632 BLAKE2B 8f309ae247dc6e063aa43463e8d1603a51ff8d8b6becc1ff87838b7e0e174100817e836d971f4cf619f5e06a3aac02ed5e11fd8a61885628aeabb7ebc48eede9 SHA512 737605cd5f8c8df9e8113204a49ce452908a75675d7c9682d4db455e9c852f881b5fa318e7f286727253ab56d7ced43c2b48b1066567ea2f6f1193c827da892e
+AUX redmine-3.4.3_requires.patch 3119 BLAKE2B 85a2f5d9aa8b3eb7467a846e9d56b8081d84fc4e08755474f3e5701a81afcb666d9cd8e5551f333b72c8959d022611c5c9e369e633f748605c22ad3b83a6299e SHA512 854d7e31be964eeea9cc3fd80dc246cad1713a3941f33ea46b27d0419bbc9dd7c017dfc31539542f65cf329ca72e6e278532912107e38f24dd9fab972d00a9a4
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-3.2.8.tar.gz 2323001 BLAKE2B e86de553bf5177470440dc5669914bf0381cfd31caecb3ecb35869cbed376599f39770d18a0f4a74a2bc9e56f58dec4bbc803a0567c39b6c6de4adaf78d2f03d SHA512 3817fe98ca61326c5e4f3c3fa67540a38305275b9c24a1d74d869d713d4a582974cb2ea983016aace3625a8ebadec9354b8f1e028ed6ade2ba3ebf18a33de1dd
-DIST redmine-3.3.5.tar.gz 2368487 BLAKE2B 4588052ee2810f276b1c639f22d41f70e627979fa46debe1eb475f9bd60162d677c208e930cc8398e66644793c12547f4a61383ac44e8052d4233fa1eebd6bec SHA512 6471429eda15b5788d3d46f114ba63dcd30adfddf8b58b21ef206fa65c39dede1db6f11c7340560cf687f14dd46b64a40d934914f9edf2b58ba1fbd730eb304f
-DIST redmine-3.4.3.tar.gz 2442818 BLAKE2B a93b9ba62b56a3ad5549d41cfd02f33e8973399ca5fa900f6154634504496256552730cbc8d7e2a8e55b33518bb30ed613c4b226842a319c9b4eb9566b36d897 SHA512 27deb85916eb0285abd51e847037f213ebdcb5f16f57a19e7ff1d58eaed71a5c69695c707c12f2976d8dedc7aacb68bdf349c2d527e8312ce8c1c54d7af2db8d
-EBUILD redmine-3.2.8.ebuild 6825 BLAKE2B 2f9130e173130bdbbcd048b4832fe3cb66a99844b121753777594b90df5680256e78478c59e0151632651c6220e2b0083e92def2a4b9ffdc1ff704d70ca88aba SHA512 40c49274f3c31c527c0bebb4188af799c7b1fcd17315659593afa65a048cb796583edd7e28d57710fff03ac5811e85b967563f145c96008de4cd6acfe2e23379
-EBUILD redmine-3.3.5.ebuild 6569 BLAKE2B 61d5e7bfb015c36087340024fc2980a36ac4ebbfeb911879ff319a19a9887766748490fb5d70b87f74c4d3d644c7db9eff249ef7bdc61be02e7c3aaede399d8c SHA512 9bf99a73c5334feca2048c324bf78e9562aa702915481d9e7abfa12a5df23cbaa840ad02b5d5fad444030522977eccba3cb651f6c443e8cc2b63c2bcbc5e6acd
-EBUILD redmine-3.4.3.ebuild 6576 BLAKE2B 8b88685ec856e801f1f95047f9c121549a59412cb1c08494634e371375ab8d3858d907901c73fbe08a7731e54831112621b937099d3fde9af739f7a17345200d SHA512 7999fd691ef975ffd686d7a92ddbaa95c9b3bbbbffc050c565ef07f09a72808dae0dc63247e1bf75480afb98ad94187db7a91c2c45a96b81bfb0b5694a779f92
+DIST redmine-3.2.9.tar.gz 2323496 BLAKE2B 16aea04eb8ddbe4e97c95f32ad62c6d4332001d7e8afd0b842cc76f9f1dc492b48e1dc11c8017d635520fbccda6e1044ced8be51435f76db24482bf11b5a70d9 SHA512 0bf52f245a08cfd66acd07fe849cfac7a460623cdd223806ee4c7c9c3d17753c1b2914b7bcdc950ac8401ba54c004e399f685d38946b1fbe2259943de5a18f29
+DIST redmine-3.3.6.tar.gz 2371226 BLAKE2B 4465ebf3d89e05a8c53f59b11190eb290a152e6a11fa08a210c471f31e857c3c21ce226e056be00dec7bb5b78172a929969e1cae410ce9fa4c03280c427e99c2 SHA512 124a74ccbe9e66460551fc0fb9feb5b72237c5b711463b467d665fd973c3f0a06f63c708629716401f9997cefc1c3060d64c73917d3791750b4340eda69c8848
+DIST redmine-3.4.4.tar.gz 2447358 BLAKE2B 1f5aa3c24e06029405c59e25c40c98975c98033658ee0a931b1fa95aac54187c7304f1fc0af4805226c4ef274f85d89856ffd39b0ae71b34337865d3e8f4a5ff SHA512 12bf58aade53c02df35b33ba62dd97091a5ac20fb6ef0f16f046226c62dfd06fc6cea5451f433e00f7d9374c158035dc5457d65eafdbc35a90199c5a407c7752
+EBUILD redmine-3.2.9.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
+EBUILD redmine-3.3.6.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
+EBUILD redmine-3.4.4.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch
deleted file mode 100644
index e4510839cf48..000000000000
--- a/www-apps/redmine/files/redmine-3.3.4_requires.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb
---- redmine-3.3.3-orig/app/controllers/application_controller.rb	2017-05-24 21:05:03.515966923 +0500
-+++ redmine-3.3.3/app/controllers/application_controller.rb	2017-05-24 21:07:22.629960174 +0500
-@@ -15,6 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'request_store'
- require 'uri'
- require 'cgi'
- 
-diff -Nuar redmine-3.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb
---- redmine-3.3.3-orig/app/controllers/welcome_controller.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/controllers/welcome_controller.rb	2017-05-24 21:08:14.895957638 +0500
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'action_controller'
-+require 'action_controller/action_caching'
-+
- class WelcomeController < ApplicationController
-   caches_action :robots
- 
-diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb
---- redmine-3.3.3-orig/app/models/custom_field.rb	2017-05-24 21:05:03.513966923 +0500
-+++ redmine-3.3.3/app/models/custom_field.rb	2017-05-24 21:08:32.223956797 +0500
-@@ -15,6 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'protected_attributes'
-+
- class CustomField < ActiveRecord::Base
-   include Redmine::SubclassFactory
- 
-diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb
---- redmine-3.3.3-orig/app/models/mailer.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/models/mailer.rb	2017-05-24 21:05:47.039964812 +0500
-@@ -16,6 +16,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- require 'roadie'
-+require 'roadie-rails'
- 
- class Mailer < ActionMailer::Base
-   layout 'mailer'
-diff -Nuar redmine-3.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb
---- redmine-3.3.3-orig/config/application.rb	2017-05-24 21:05:03.689966915 +0500
-+++ redmine-3.3.3/config/application.rb	2017-05-24 21:05:35.723965361 +0500
-@@ -1,8 +1,8 @@
- require File.expand_path('../boot', __FILE__)
- 
- require 'rails/all'
-+require 'action_dispatch/xml_params_parser'
- 
--Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application
diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
new file mode 100644
index 000000000000..338f627adb1b
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.3_requires.patch
@@ -0,0 +1,73 @@
+diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb
+--- redmine-3.4.3-orig/app/controllers/application_controller.rb	2017-12-11 20:55:04.942299001 +0500
++++ redmine-3.4.3/app/controllers/application_controller.rb	2017-12-11 20:55:17.285298402 +0500
+@@ -15,6 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'request_store'
+ require 'uri'
+ require 'cgi'
+ 
+diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb
+--- redmine-3.4.3-orig/app/controllers/welcome_controller.rb	2017-12-11 20:55:04.942299001 +0500
++++ redmine-3.4.3/app/controllers/welcome_controller.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -15,6 +15,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'action_controller'
++require 'action_controller/action_caching'
++
+ class WelcomeController < ApplicationController
+   self.main_menu = false
+ 
+diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb
+--- redmine-3.4.3-orig/app/models/custom_field.rb	2017-12-11 20:55:04.926299002 +0500
++++ redmine-3.4.3/app/models/custom_field.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -15,6 +15,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'protected_attributes'
++
+ class CustomField < ActiveRecord::Base
+   include Redmine::SafeAttributes
+   include Redmine::SubclassFactory
+diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb
+--- redmine-3.4.3-orig/app/models/mailer.rb	2017-12-11 20:55:04.926299002 +0500
++++ redmine-3.4.3/app/models/mailer.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -16,6 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ require 'roadie'
++require 'roadie-rails'
+ 
+ class Mailer < ActionMailer::Base
+   layout 'mailer'
+diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails
+--- redmine-3.4.3-orig/bin/rails	2017-12-11 20:55:04.986298999 +0500
++++ redmine-3.4.3/bin/rails	2017-12-11 20:58:40.247288555 +0500
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env ruby
+ APP_PATH = File.expand_path('../../config/application',  __FILE__)
+ require_relative '../config/boot'
++
++gem 'rails', '~> 4.2'
+ require 'rails/commands'
+diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb
+--- redmine-3.4.3-orig/config/application.rb	2017-12-11 20:55:04.971298999 +0500
++++ redmine-3.4.3/config/application.rb	2017-12-11 20:58:20.477289514 +0500
+@@ -1,8 +1,11 @@
+ require File.expand_path('../boot', __FILE__)
+ 
++gem 'rails', '~> 4.2'
++gem 'actionpack-xml_parser', '~> 1.0'
++
+ require 'rails/all'
++require 'action_dispatch/xml_params_parser'
+ 
+-Bundler.require(*Rails.groups)
+ 
+ module RedmineApp
+   class Application < Rails::Application
diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild
deleted file mode 100644
index c0bd7c7e880f..000000000000
--- a/www-apps/redmine/redmine-3.2.8.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="ldap fastcgi passenger imagemagick"
-
-ruby_add_rdepend "
-	dev-ruby/rubygems
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/jquery-rails-3.1.4:3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/builder-3.0.4:*
-	>=dev-ruby/roadie-rails-1.1.0
-	dev-ruby/mime-types:*
-	=dev-ruby/request_store-1.0.5
-	>=dev-ruby/rbpdf-1.19.0
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	dev-ruby/protected_attributes
-	>=dev-ruby/redcarpet-3.3.2
-	>=dev-ruby/nokogiri-1.6.7.2
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	>=dev-ruby/ruby-openid-2.3.0
-	>=dev-ruby/rack-openid-0.2.1
-	fastcgi? ( dev-ruby/fcgi )
-	passenger? ( www-apache/passenger )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
-	#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#		<dev-ruby/nokogiri-1.6.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	# Make it work
-	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
-	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
-		app/controllers/welcome_controller.rb || die
-	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
-	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
-	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
-		eerror "then edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [ ! -L /usr/bin/ruby ]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.2.9.ebuild b/www-apps/redmine/redmine-3.2.9.ebuild
new file mode 100644
index 000000000000..c3b226cd21c4
--- /dev/null
+++ b/www-apps/redmine/redmine-3.2.9.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.3.5.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild
deleted file mode 100644
index 80dcfc032480..000000000000
--- a/www-apps/redmine/redmine-3.3.5.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${P}_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.3.6.ebuild b/www-apps/redmine/redmine-3.3.6.ebuild
new file mode 100644
index 000000000000..c3b226cd21c4
--- /dev/null
+++ b/www-apps/redmine/redmine-3.3.6.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.4.3.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild
deleted file mode 100644
index d2e874a23beb..000000000000
--- a/www-apps/redmine/redmine-3.4.3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.4.4.ebuild b/www-apps/redmine/redmine-3.4.4.ebuild
new file mode 100644
index 000000000000..c3b226cd21c4
--- /dev/null
+++ b/www-apps/redmine/redmine-3.4.4.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 820145d4e352..538e7d084380 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,11 +1,5 @@
 AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b4e7541d03f32dc397f86de694de73c5d9d8910e30a7f7f49f59b5f918b75ff16f537f9fd0931052e3e57 SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
-DIST wordpress-4.8.3.tar.gz 8184961 BLAKE2B 47e6195c44dd203cdfeadae0a8427f1d231f3cc3ef4487b4f9e9fb8662169f3b592caca23e1139dcf8bfd8334e451de8eafd4aa27be4b681dc4613f0857bdd05 SHA512 696be1c24dec869d896e22b408b17009e8c482545237156f17d4b5f2d726876a17c3cc5c3de632126229747589d74f7b188c06d2a79878efc800bd6db273d709
-DIST wordpress-4.9.1.tar.gz 9638827 BLAKE2B fb80f5b41df3abb9e28ab492c645c368b1f62b46ba78fc255b4eaa77e54d7801c51f85bdded809cce27027592ca0ccda0a88d8ff67afc0ad5183dd510d9f5d96 SHA512 1835d8fd0df9931487489d2e67285e7c73ec1783df39621cfbfe52aa8a0b3cba05fd3b842c7fd67ab2b76009f33337dae650f22dd6a3c4aa71eae100541b8a58
 DIST wordpress-4.9.2.tar.gz 8807744 BLAKE2B 88c2c9decde312600548e03a14e3721dc82a3a57e59910f9ad85a323beb4ac8faba7de48f46bbc43c78e6862fb93c181b5b6bb690142f5e897c84dd621c9e58f SHA512 013d49b7a7d478888937e1acb49b6543b820c8d1c5b5a3bd86f9629d44640a4c399e84b2604a359c26986bc0e29836094c8444e152c4aa5bcffe9f7a4620f731
-DIST wordpress-4.9.tar.gz 9638753 BLAKE2B 98df805843f8f48c8678205e7fbdd5fa4d223ce0b772c02ff52d5f5d21559ae56f33023dd3881bdea244c46f8ae6c5ca31a7d6b0da75661d616f67d28253a673 SHA512 b7898730d42839406b9270b945c687e80bc1025dcf23dfa1455576f0fc9dffb3b8c082b6fc6d1b6915791ce33c7327c8ce28bbf2beafdc7154ab0e29660c4cc7
-EBUILD wordpress-4.8.3.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
-EBUILD wordpress-4.9.1.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
 EBUILD wordpress-4.9.2.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
-EBUILD wordpress-4.9.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-4.8.3.ebuild b/www-apps/wordpress/wordpress-4.8.3.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.8.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-4.9.1.ebuild b/www-apps/wordpress/wordpress-4.9.1.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-4.9.ebuild b/www-apps/wordpress/wordpress-4.9.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9dea2c67fec5..75eb06660038 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index feda6df28003..832339b856df 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,7 +22,7 @@ DIST chromium-64.0.3282.85.tar.xz 482224568 BLAKE2B f8650721a2a30ea7f9c651efab58
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
 DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
 EBUILD chromium-63.0.3239.108.ebuild 19852 BLAKE2B dcdf02aa189a5a184395d69a4e4d854d1860453a257b59e0393104a628c3603c1f717fab4803785b87a22bc4d9ea66c3de88cc9f5f3b1b44e08871f210b04314 SHA512 889e192997c46188590b5ede0b79c1a5abe9bff0bc7b4e1464b6cebad494d26158977d942764d143c36a475063d97aaee925d7d1155e5cfb74d654fd82fc348f
-EBUILD chromium-63.0.3239.132.ebuild 19998 BLAKE2B f919a386ed211971f8773d1a7310e46bc0bf5446f4fc3a2fe7e70bf7eaff46159e7892bd5510ee93a0afd9059571cfeeb2e3b8b33496c3615bfd211d4db65223 SHA512 f2149f8fd8e7930e4c1856fc0341d8e43916f1755f9a4873502b70959c2d0df35112641c6be300c39827db4d5b6123f5ee8f7738bc9e26b4c42590b19e1dceba
+EBUILD chromium-63.0.3239.132.ebuild 20062 BLAKE2B 5f3131a161c5993743a9294337ff5dd9a69aad085199367518ecfe461b92f51c4633a5e68ef9098b53121381e5ba28d9c8731871c54c5183f75bd5329e15b7a7 SHA512 b78f21944f38fa42883c51e2ffccbaa0e2ea07382b12964fc3104d9ff1a59511efd94b6954ff79f7025b535fe1655b4bde443ca794b950972e0682e5c431b37f
 EBUILD chromium-64.0.3282.71.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
 EBUILD chromium-64.0.3282.85.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
 EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
diff --git a/www-client/chromium/chromium-63.0.3239.132.ebuild b/www-client/chromium/chromium-63.0.3239.132.ebuild
index bc4598a11c0b..87915555ac0b 100644
--- a/www-client/chromium/chromium-63.0.3239.132.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.132.ebuild
@@ -439,6 +439,9 @@ src_configure() {
 	# Trying to use gold results in linker crash.
 	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
 
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
 	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
 	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
 	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 4442fcdcde47..ea8da42c1c07 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -3,90 +3,90 @@ AUX all-gentoo-1.js 501 BLAKE2B aeea18b92d4ba90f440e8b554e088d69098332b2351ea4af
 AUX firefox-bin-prefs.js 305 BLAKE2B 864d8545cbff81d9a1a7d615d3a244c9060c646abf0fbf4d09fad2c9dd2b312d0fedb97b0fae7efb60def0e5494069d12a8e9e6d1d638744d77535eef8ac4fcd SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e
 AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd310f3f82de2b0fe07412d9768f6be2f467e3e315d89f501b1fe2cc319ffa92f072f4fa6cf6e2af4c2d20 SHA512 409ec95a1ee449e2a0a915358fb9c8c3e4bcec8026cb503f1b7dcd815bda9ff5745158ed01cc190c9a0adf5b4e9d644efe5ee3e0232bd8419324c1b6600c863f
 AUX local-settings.js 129 BLAKE2B 8d6778900d4746baeec5d167bcb73476d36de38e4ba5a09904a66ba094ce3c003467a22de32113abf3fce80e7159d5faf501be2e2c45d2e7cbb31d1046f5ed6b SHA512 2ae80875251d0ea322acb64370a0077b10f2e2c8bd258cd4792c6cf7152c0a6f8786353167d71fc99607b5f15142af28eb565483a3115b25c2f040c06319ba6c
-DIST firefox-52.5.3esr-ach.xpi 427640 BLAKE2B 6577ad16d6d6bd52b1b45413e487268fecb72de9ca59513614886a189ea1d69b1c382940e629c88e70341b5fa564e096a4c17e3fb6026e23d7107c08462fdccf SHA512 2a0efe94e0492dde6747c4745d430258e5b423569738c30931effd7a37074608df9e37545f5f22055ab94c699b0033e51952f0f7873251139041a6108406d58a
-DIST firefox-52.5.3esr-af.xpi 436823 BLAKE2B e41fa1dfe18173d2cbff0356a16b8190afb6d9b221d68edacddc8544a70c6507a6128cc26edf5c8cc8f9a62fbed27eb88172d775840aa6d8c62cbd3913635fdb SHA512 9dc55fbd75ebb9f70f8fc0973c53db77790e74d1bfa105b119b0bfdde3ee88325518e5d91d29f093938e16082be498f006bd79b762ce86a9e76e37df59f96fa5
-DIST firefox-52.5.3esr-an.xpi 445142 BLAKE2B 7da66dc005583caf33ecbcdbaaaab1ddd0a87e1bff592ad25635bf904c7febb3de7f4c2c24403c09bfdff60e49471a8a15c15f18184792d78b9fe09f6ae4f164 SHA512 ba0af11f4e14786d01b16aa0434b46fff05850cb2803403df5cecb841ab7aa5446f5e36e165cfb22168dcf74236391a6eca458c9a9328c667c5dd67f3ea47670
-DIST firefox-52.5.3esr-ar.xpi 473381 BLAKE2B bb9d4a75af93679554c54db605e3627865470caa9e485bed14e52111abd2fc8a944cd19e87a9b3c39c49ec85583fb99483b946d2ef6a3397163931b264259994 SHA512 490cd180574935fb99b44a0a704a5ad2f52a051a9b5c8e8e862765cb353638fd0b8830404e85acbc9dc046771f97086a489dc48aca2fb2a214cc94c12b50c868
-DIST firefox-52.5.3esr-as.xpi 486888 BLAKE2B 9c272856d096d811c4a21dfff7a74b9e596270ad7892b7989f1d4abe19935d07ce5924e76232bf8839eb31a9fb6691256cb496ffa8a1bfa8a6e11e91cd618ae7 SHA512 f6b01554b66d3273a78cbfff5e277761c5ce122b6c57191d09a2b2effab171cd9ca42ed681716d11df63815e86a98ce902015fc18c303310487d716d34495386
-DIST firefox-52.5.3esr-ast.xpi 440033 BLAKE2B d5ec65ac60a144e40e7cd19601ad074ee75cddfae21909cb7408bb2ade76559363e7cc27f7c9a4b4e72e917facb4577eabcd2ea90ade40542b68eb926f5c3d2b SHA512 f04f96fd82453bc53d2dec90af2d3bbac05f91c4dcea12b380d735bb6d63fdacc829d9ec1d9c1f13cc015055571556ea165fb5b1f4cf85ea09fc848a7c01ecac
-DIST firefox-52.5.3esr-az.xpi 454923 BLAKE2B 3885eaeaa4714daaaa6b869d3cb6b8caf161fc42cf253f4fa42bf8009f04ddf8aec57238d64395b179212bbe7c987ca19e7a65d6abbcecfa30afbf5675a342e9 SHA512 d51fe8a0fc6f40441f230c2e88076642100b1b0594fa9c74e91fba0e7efc241af09b79e19f83dd9614a343ab9f9c7074134a254122326be817c0126bd6bf041e
-DIST firefox-52.5.3esr-bg.xpi 487892 BLAKE2B f87c7163a4bf220b75bd2bca4b32f8e42754104c4f38ac3b1a09ad8a6fd29a90cf03e3fdec36c0e06b03012b9bf2fb278fa7fa664bbaf04adf16d89c4169d936 SHA512 f6554a6b8954924d3a55ed884936588d92566af4f70a1124e7779f79c52b6865268eabf6a03387a4198a5827d1c881878d41e93491f35c746d357ecd418597f6
-DIST firefox-52.5.3esr-bn-BD.xpi 511995 BLAKE2B e84b0162ae0a2a1cfd00395070b6e94d36ab4e3aeb2dc7a17cf3aeb3edfb794be14afa3efd44ea1574b115af2dc1272588caaa7dfbff70a4f5da9ab23359957b SHA512 ef4fddeb5b813a73106898dec226f9481a2238816513412ed8bf9d9a7fbb5aab2291d5563f3173badd283ecda4abbdf6d0b6c6aaed1b6675bdb6f3a6838fd2a1
-DIST firefox-52.5.3esr-bn-IN.xpi 509375 BLAKE2B beb26fb776f12fac534048c8e91e44a83aaef0e117b84a2e1e804dffc625c034b3e2d72588f5b132f4f1092eae65b35f24c670c2cad799acc3c1fc4741922f16 SHA512 e6759728b8ec133becebb798c809fefaf9ea9993143f6930c5caee7f4c699fa924f4c6a66b59367c6db7b6b65b0d83c1a107c009399673a09396c8f972261272
-DIST firefox-52.5.3esr-br.xpi 435483 BLAKE2B 130dd959659675505a8ffb3d04a6fa1fd28ce8e7cd446c0fffa0c0dd611ddd3a6f1b5b9769629c1adacaad28cdbd3d53968e1b3c28419084fae5370644466250 SHA512 48b56984afbd641d5319bad60f325f3d8a71a4823345dd141ee395dcd598ef00044f25fd9027c60ec00621998b7300e088d66c0717696a4f9eba536e36ece9dd
-DIST firefox-52.5.3esr-bs.xpi 441783 BLAKE2B 7406c94c8ae6b197bd16665813d00f9613ed41f299523a126c8966d2d4b6dd32cfe6ef6ff33caa957b8a5fb90e663b8bdf85a93fa44c664a400377dc9aa248ce SHA512 23556767552646ea52cd8259574bc7e03521425933b03c03bf3b2921b81ced3887be7f657ad02601fbafd7160095c2150bea9e16dd2ba955897a4e8be46976f5
-DIST firefox-52.5.3esr-ca.xpi 443304 BLAKE2B 236e06d8d976d24f73a1c30ef937c7bee903c385f12fd41a389a6dee017fa914d7009a0533bb25c7cbc93b348ab1b4b364c3aff2e3bf35b13b7ac70f1729af08 SHA512 0c6c94857e254fff2ff27cd75cb2547fb445e5c45730a0328bc4db5813406bafedffe58629fc51712d4d467983601a80012be9973e2dec931a27e6e18a0e2bd4
-DIST firefox-52.5.3esr-cs.xpi 444075 BLAKE2B 2718e5d11f969235f6540d517392427571553dcfa6d49ce9788d1444be39a19a804bd3c68b9fa2ebfe237247102ab8f0a1213d62f3446b2b901b76b088b545ac SHA512 3257bea0ed9b76c830ee2e960ee4ffca2c5e01efe52b68949b050ae4f3a306cd24c841dbcb797e57be79c846bb12659a277fbd3cc8d8a97abeec93f98036c699
-DIST firefox-52.5.3esr-cy.xpi 436583 BLAKE2B 25f488e745761fc5b98ea16c8ef286c457f6a26596143d2059939285512e3948b1f174df4ab5ed1de05d9a29ef0dda75ba8004d0430a63c0edb4c43a932e090a SHA512 43acfe2c8f598ada46798a0231550e6dca1114dde8ac6de2b7a14c982c7152c6b742c277056c8b9871139b4229d09397f1af5dd927231108158f0716ea1b089c
-DIST firefox-52.5.3esr-da.xpi 424394 BLAKE2B eee90928260eef01c3eb6437ced918c770d12cf811816e112449cff49a61c3504e0f23892cf25edb9bdfc3b2a20c8b132fd20a0bc3ae0075b976988ace3250ab SHA512 2f3a0f9f7ab804849c0a4a75a721c94bacbd49b74a84158ac851eddae1faf47dad19919cd4c09390681bf0c0911a88aecb5a089c92adef2668fd105132e105f1
-DIST firefox-52.5.3esr-de.xpi 442479 BLAKE2B b321a05353fc506c8597ea5fb822ac7da7d6ca75fd09f3651723fffbd36f29a8795747fc294b9fb91984994ae788bce6fb59738485ea2e5e39e4cde167eca687 SHA512 310ffb7ad23799f880d6ce9ddc006256cc405fc03b19d63219493bc906baf3cd2587dc5852d88d10cc9c8b84fdd47314a789514cae95677050f6ccaf9c5a4cdb
-DIST firefox-52.5.3esr-el.xpi 516592 BLAKE2B 36c4216464c7bd1c84a75306577a3925db4694a84cce93f9142d9de209089def123bee751a6ee8906c895bc8b2cc51859f03e531b738101fb917e3fce6f0bf0b SHA512 2394afa2172839bcb5164016223e289097c207daf2927ae307eb263328fcdf7d12c2af9f750093aeda8e5fb5c46584325392a475a3faf09db84ecbe5a7d02b2f
-DIST firefox-52.5.3esr-en-GB.xpi 419324 BLAKE2B b87195be0f4ab45deca995477bbdcd464e617eab55c46a35032f4560c104d0723863bd2da4376b36c5faa4bf10cabdcb3d086f8d549edbd27c5924f8445fc5ff SHA512 5c270e4521c90083b21c3901dbd4b5df635eeb2c9a7384267b00eccfd4b9357e1749a5344d7e473819467bf1c5563adf89e7e519cf75767dc9dba8784a3daa74
-DIST firefox-52.5.3esr-en-ZA.xpi 412212 BLAKE2B c0bb4b2376852a201ea2e75d2f03e01bd050e84decda7961081c52bf2faf20e240419e8d1aa1d5068561a472501806f38c0e1f5b212d28a2c95701c3700bd5c4 SHA512 773a509aa102fcce675b128b57c92c6b2ca4edc6d6ef109a6062bfc86b768ba28de5d6b8e227539a5eebfc10223104cd760d2d5cbe01ccda8d98d1bd1678e5f1
-DIST firefox-52.5.3esr-eo.xpi 437474 BLAKE2B 2035865b12c4e25b92e9f733fbbdf324a03cbc4d13985f2382b5b53602ef8d165e96a92d002b366add81adcef7d7618cc616f3f108be37a83caeeeb9995bf1d2 SHA512 a116088a7f571ca445cf86b52b22086f7ab2f0075d8b2a8a9362e2591c1581a878d35e36271ebbe8858ed82cd75a4d7c0ae47a0683e27ac1fb8c09f73c6753e3
-DIST firefox-52.5.3esr-es-AR.xpi 445925 BLAKE2B b1deeba47c9aefd9ee0991a6c939a89f9e4d093db0a503c024f43517b3d4a9bf9cca7f3d17d82251ee34a4f174cb721e0a3744e94d6fbcb8052487b5fa7f1454 SHA512 a3c0a657270db7a48040c29c1c6caab8c5da63358593f5b342f7eea9ccd9f5981b933d1df0eb16e8cf989827a51d74c19c2789bdd5df34cee0ee11fba3760002
-DIST firefox-52.5.3esr-es-CL.xpi 445676 BLAKE2B 721dee6178f8fa55b2cecdecb975bddf25e83ab1c58b7e125b7aefb8efd5074c9f9d3953cf8e459f529b7de2f2ecc23edad0076910cb7b0d7ec063763375cd73 SHA512 5fac737922c53e82da3d1b3035765ed8b792fcd338c1c777cd00ae61dd1688d485fde397979c021d7af100336968756486419f14bd400c799e93071ce6132091
-DIST firefox-52.5.3esr-es-ES.xpi 344875 BLAKE2B 4d17ae9edd871bef84478ed7892446dbd6f44d283bd7679e4eb6f6413a9dec2fae696f82139c6aeb391b2df12c6fdd3e0c6cc50cbd41efbcbf39b0265d17ed02 SHA512 c124d991d5275296618ab82be06032ebdd85e851ec7a4df92b749b34668900cf77c8adf037a68aabdf0c20a9379ca1fce33becb64d10240498e5d4b4b033b9a7
-DIST firefox-52.5.3esr-es-MX.xpi 448385 BLAKE2B 5d4f37736ba3b4507dd8188fdf92c9d36188c71b280538b1b7fe2c02d13b4eea1a12d8b00923fa47a5ba1fa359d904e1678cf821efec2e8dc4931f378a060691 SHA512 377e2d019ec32b400d0c3e445322c1b4916b19de015872a26df3e61e4e485eb50dc747e50d65539d1a072b4badae523e7d435e8a9b9efa7c36efff69618b1490
-DIST firefox-52.5.3esr-et.xpi 425113 BLAKE2B 4e0c9ad7fe7b1fa5db7b307e761662ed9df75851b95192f779ba70c278c23a5fb239293197facdfbed899ac2aee451fce1b052353452714ab07cb76a1c66bb1f SHA512 59f1cac751c3b6130a0d5e2a20a7d85308961ce6707ffa26354428396f1b11c5d6acd2aa08655dd95e84d9e2f02fe5ab84e93572b5bb5ba4ee6402ccce0fc733
-DIST firefox-52.5.3esr-eu.xpi 438479 BLAKE2B b635bd31cd7f02ebd64b1bf03f476a30d525f4880f77748732277283c32a72660d760dba15a872cc24e275708aaab53e2131fa9d710a42acfa07af3762fd4d67 SHA512 4043d117d4d83722e65706dde27bd8153c5439eb2a384c0e2cf9f0a1551658e71188adad9748e46a9ab37805bd60474fc08156f8a211bb0dcdff874a982d4312
-DIST firefox-52.5.3esr-fa.xpi 491344 BLAKE2B b0b965090ab679bcbf77f827f29dd1e7357098ab9303d691a67d091e0f36bb31cf81a70728db4b2269136943b08ca3341edcface918308987396424be821fb0c SHA512 4e36a5a1f793f0818ee8c6166836a66ca2fa7fb5b461bf1bae9fdc8bc7caa86a713ef4988475bd0a9f48f0ed751884518a139140c22f37e1a2d7e393338a4a0d
-DIST firefox-52.5.3esr-fi.xpi 430061 BLAKE2B 47c016897f162f7eb10cc83978b10c168e65160b98aec68da219f4c169f3e55f388b8b7205f7dc9b87cb19e74677de1c9dba234ccf293a44a6ad97dececf1f92 SHA512 81971b4c310c6f9fa9df3a297a3c40310d730f2e0876f3e7388d5e6ebf50f6ff02e0ccccd7b1dfa09d7a4797b586a1bcf52943ab3f991787909bb861e091b615
-DIST firefox-52.5.3esr-fr.xpi 450210 BLAKE2B 8ac9332b60eedf45de8f581d2b28cb002a119011865ae58e33dc88e9a287623d6347628194c63c623f7a2a13177533c028069138b69b06b72a7aaa0447a3d63a SHA512 f6c5d5b05e88ceb4d5c6fc3520e2191f7985741e5ef701ed228587977ff4c9dcf9afe58075f5738c8eb8874247d40ceac0a7c1b5b35fcf9930a127478944b458
-DIST firefox-52.5.3esr-fy-NL.xpi 444974 BLAKE2B a174bcdaece2a2dffece353f16f0ecc6371e95d3ac0b734871fb5ef77b9d5d38d6014e64804593e6817b49accc9fa48ca868acac738b8ee6278900169b7a5083 SHA512 a777898744d7745bdc86432bc5ab76f21d92202496a915038c0c697c00d73a37ead569efc951ed35a0006c5615c57f92afabf2629ff351b1873a83ef308db2c9
-DIST firefox-52.5.3esr-ga-IE.xpi 458165 BLAKE2B 794989618261b3ee6d0bbd536588acd15f83af558c8858f7c295714d1366b8c7bfde6fb9972a08b449fa1feab4795314cb02abccab1e0fa1160d1e4c0dd0cf38 SHA512 5d8969904881b11d2e5514c5bbc4856e84b8cb1d63dae3b14176dbeb2d861b220d767627118598030ddb8d1c4e115ae82e62b87fac976ae7a0eaf6ed22ea0387
-DIST firefox-52.5.3esr-gd.xpi 447268 BLAKE2B a0211288cc0fb98f6f18fcc15f8dcb14373d2dd82cc3835ccf60eb2047fecddafb770c62063c4d51a2711fe728dd6f8a3e1fa7b4da5a41a35daeafa504216bd9 SHA512 5c98329dc58d9a5cf3b73956de7a79048098427385cb8fa91acbe440515e7780c4e52a2009e22246a0c39f47e69c69b3fc6e6ef6a34a537f5e58b3c658d689ce
-DIST firefox-52.5.3esr-gl.xpi 447295 BLAKE2B d10707cb8137ea4fc7d469fec4694a98cd2b23607e776d96f2789b5a2cf5f63c3a5c41f54ce784ed474ecbe487df70988b25974a0de479be5c4522c350533035 SHA512 f507b2c1a0ac97cfe8f66310731ee68a60101f4048e5ce29734c5c036df5328a1c082b3a3b82ec63312d97ad2a2d5922a82c6a7ff36168aba387ef703ee18acc
-DIST firefox-52.5.3esr-gu-IN.xpi 489365 BLAKE2B 4e8bf186d2af547d6435edbef75ea0e022fa637ac8f9140de6e4602a4c301e41a7740f271abef93a0d97c38c7b2dd16583c4dbd7e8a0d3289fc19c5a7d2dc31a SHA512 ef443dfde1a127f5f0c7ee227aa60bb3feca5c83b681df82c1380478e5b193fb3acfae054ade9e9e9678347247dd437d2a9ae306fc8f03fb85c8bb6669ceed62
-DIST firefox-52.5.3esr-he.xpi 455282 BLAKE2B 041efcab51b6dd36130fb5dd41ca8ec9f0a17f5b9dfd97cf73fef6ddd46f1873a384a4692c0d40f69d7c3846b6a7f8c02eb5112e4c9eb55cd7e234108a680a06 SHA512 1e6bb71e6387b37c48d97164fcd6f6765f63492b961b23b6fb081fb3dd54268f65304a1f4e51b75c838dfca1ea851eab5f66e5e83a019b35a1a2e5f001a01026
-DIST firefox-52.5.3esr-hi-IN.xpi 506518 BLAKE2B b24c30db7365997d595c5f4efdf71d61a66ff21e715fbb81c2e0f8d6fa35551726bbc37ff0f6ead746ef5d1c7e359a61cd5a1b6bbf57158972a215beb9adaab8 SHA512 c572e4856ae3b31b9d20b041aad0be637387d1dccb9e632b5d78fb4657c9baf057bb00e12a04a1cd98d2cbca73ffc22720810961d8b69a0d43a980dfb3f9983f
-DIST firefox-52.5.3esr-hr.xpi 447503 BLAKE2B 04e2c5344e01d2a552abfccdc4228a9cb23a4029e1fc61ad8c35076492e2348e5862c2749a3614b1d63f5dcd4b788dc0ce9dcf83f7360e7309ce25b6e98b27f7 SHA512 e2e25a029abbfd417ae93b2850d9b0ac6b6ff05fa4d2ccf4eb0fd56e583d82b469cd72b809bcd0ce23b07cea1973366cb168e2ab7a3a356470f1971f6c5f8317
-DIST firefox-52.5.3esr-hsb.xpi 457259 BLAKE2B 4622419ce34d40e1773b68a1f00b1dfbe959c5ddd902ecf78171249da6c367daa4367dba4c619b58459a03ec5e69595bfe42a24ba640d56eb96e391722da93c4 SHA512 ba27e71f8e88bae220ea45d04dd0d73b8e9d9e1b88460e82648ed943cc8ea2afd7419a17711fafd97ad3f9803c096265fd5750cbc469b205a15bf7b8f3dde022
-DIST firefox-52.5.3esr-hu.xpi 451496 BLAKE2B c1dce588dd55a3a1f1465c4d11d24cdf0eda51cdeb60e3cf793d9539537a3b4eca38d6c978a3d21dbaf96aef61d37448d101993f802e0709ce665346633dfa34 SHA512 99245a4fa5d7c9e717877c8e04441c5379f03a6b9f413189772a62699ce43d2678b935a6093e45cb66690b2ada1f04782ae2fab994fbd4bb982df4825b469c7b
-DIST firefox-52.5.3esr-hy-AM.xpi 495773 BLAKE2B 9900ab0888a3db5a3307469a67fe75a0810d3df844b608ae2cb798fd11aba3da5bc19da461f795f0ac5d0d2bdea8e89a9831382cb55da0c4b1da78aa086bc4a2 SHA512 1f6b87b1d1b23f46db439ae742f001faf7fe61bd48f3ed83e3a197215afb5268d925751f91eb9a01277a2a9d4bfec76e5b13414b2ad17bf5462d4dd2a6f99608
-DIST firefox-52.5.3esr-id.xpi 426023 BLAKE2B d2f662bde6db191017c5012f9bdb0820499c9d2eb471e0793000223a99cd89fcc42a6e545d0e4c4ea5c9b657d3aad1c99a3a16386422464f266b3caf27845fb9 SHA512 1f1751e748ccd52a00955018b993ee9f75b10417ab195255527e464c13966a2089899815bf73148becb43f98ef37a586c2c8e6bebdfffa8b28dde8b71018a45f
-DIST firefox-52.5.3esr-is.xpi 442693 BLAKE2B 54970ad0b151381b66053274164886c7091830a5886e4ced4f3b3d6b4954c87c2429f20d20db71816a4e2a92441dbc1ef79958605f25101ded7155b4aa4a7e43 SHA512 b104c783fa40b6550955227c9bbf4c7f2e4916514793f857dc2709b7027f008754bfdb5dea9faa593eb3fe993417aebc94f37b3accb20021f4cf18553c8793a3
-DIST firefox-52.5.3esr-it.xpi 339221 BLAKE2B 91df8a51474c7e675ea95775427c541c216ffe38ecf7be80d44acd0da5046b2be15c2564182797b26755a85e224304e1d3703a2a00a4d331cb1a9d818bd7a798 SHA512 5d5b988e819c66e31b34f04d0325511218f5c861545052a5d91e58b70c6efd01b4bfee03cbbbf02c62c6c29d8b76c4712b923bb197f6c1b3fc82518c748b3b1c
-DIST firefox-52.5.3esr-ja.xpi 488343 BLAKE2B 5a1c6f3807a59fab7e14bebf554545550aaad8d2ef0069dbb69cc02aa3bdd54531630ef53d3bb1243f12d134798cea4fe93f4cd0913f01638228e103924d16e1 SHA512 6f0c2b40d14fbf37e3f5b0e198ff5b67c1ec860393d413bcef5a287a9595e35a853151056ba8d149adeba3558e56ce4751415f8486b73205a30ab87a9d9cdcda
-DIST firefox-52.5.3esr-kk.xpi 496939 BLAKE2B fd2377808eaa142fb80e1b6855138233f6f8fecf887fcdf93763785800c06d809af465ec3123243a9cf9d58ece04f7192f4e934cb2b6d45874995967e5b60082 SHA512 bcb84be1539dda24637e6052b6a4afe759a45f970e042563470d95e42199dd86df7a56b3211a970228e38fa5d38937736cac7b675383a6411ebfb4738307202e
-DIST firefox-52.5.3esr-km.xpi 520343 BLAKE2B a2535c1b2e74bcad5f46fd588ca52362c0bb1d66f6ab5a01e0318e91eb502bf136b8710b0a83dc9704f2cbc33dd0f5682bfc27c16485945e5d0ee7a01236687c SHA512 5c9cebafa4a4d3b1e9e5020f7f3c77ef8a59398d6e303725a7d7db65d22e17d34c0d37bbdc4131cf9060628fbece3c677d695a7600bb4b7d1aca6c41daa25074
-DIST firefox-52.5.3esr-kn.xpi 519455 BLAKE2B 43efcbe67a8cef747aab59eb5b57a1af6fd22a026cced218314a5d747b1de3507009f75c7092fdbb4e3449030a3663c1af581b585951a465e56fe942ca3bd20e SHA512 df8c9d1ea0534dae26db07711783b649b15ad25bc6b745b68507f63c74a4f6ce25baf49c22df976d07b9367a77cb3e94108df3fd59c704d34962ceff6ac04129
-DIST firefox-52.5.3esr-ko.xpi 463630 BLAKE2B 4621cd50c893deafc69426cff212a99c00cb5bcabc6e661ac865dd9d0771cca62d95763ae3f4bba3ee7887c3c94a22c8573dd415125d6793ce17dc5b21c94e64 SHA512 b08b31bbd0658f4f19a175ee9a5037717434517284c79e836914563b153edae84ba23d88563fe1f52d3e2fff42180ff645dfe03b6a88360615f3b02bc02f7913
-DIST firefox-52.5.3esr-lt.xpi 452236 BLAKE2B 6c8223f51f62d738d445335061d5f807ad27074b89e5423c653833e119858598715dc964ca2252a3322ff8a29af53dee90bb7a39b993a09f9145f5d5d46cedb8 SHA512 3c1ccc1328d8c39c073ab4b814b409d284c43622ae3c7a0209b6e3c2d78134b3cd58feb750f058bd9843e5f467e636948d5e2e8512c2cd06c00eb428e05d18a5
-DIST firefox-52.5.3esr-lv.xpi 448450 BLAKE2B 1e3c9ddedf6ff12ea514a9268b27cce58a3fb93e4f7d8eff8b2759fad1cccbed2ce70b2d79f8897ece8bdd12b9412008067341e86b3aa00fb804cbf6f0a47d6e SHA512 20c599cece3513b844c5e4a7652431697a45d3532fd1beed60b4e21800fd46c919f6ad8099569ad0f14df3c4653d5a2a127e9df9f9593fcddb269e24ea91c463
-DIST firefox-52.5.3esr-mai.xpi 499841 BLAKE2B d364a8c344e6fcee277ab8e7621096b443236570d30f0248978a8b3b101ffd24d36b4c1c95d5053111963780ce5d929e2f9952b8c7d81b37a15b81f0179026f4 SHA512 e75f4651bb4c6da6a3788c3ac2c43f565199d7a7fb6f4294232002e18ba4457a08227225fccbf40f873c6d96c41d6d7b2a700462d2092dce309a5833d10e7ce0
-DIST firefox-52.5.3esr-mk.xpi 496200 BLAKE2B 4a74bea506a831de8d0afb2ca46fc2d250277a7cb4707dbf4f8453dd0254d8b6a4332186d275310047af294ac153bf89b3610f777c24f9418ae06f2aa6296f64 SHA512 d305605cee7fb576b97cf939e67a03f45b2e7e12ae730fd8775de1d311fde723f6dbf4627f20773ed56620ee471f358779fa08866fd46da3c59eec56ab717edb
-DIST firefox-52.5.3esr-ml.xpi 516486 BLAKE2B 07e4d27f40e3556233971836463caa7fa1cc732144a55f0544f13f2ace5aaf503acfbcdd85b0e29cc3dc977e5def4b996c8dc7ec39bfe3d33b33655673704d1a SHA512 c4ea9254c8dca0f46b2848bb6b2f0d96b0bc5745359b4c1b47f63c97b4cdeb89202f50ed64b177e9150bc4f91307c40f8f8cbd81e401220894744e4cc7aa2b40
-DIST firefox-52.5.3esr-mr.xpi 502431 BLAKE2B 1e66a607dc70eeda71b4016b05e74c9ad58b22daf0327bb0685f2d4eb06a4d6869f2e651b497a1fd351e66bc897e04dd043515ae289291626f6e1b905bc4bf64 SHA512 5eb58ee18c753125e4cd5cab2dc61334c3a4f30895547c18e84c3a20b63b223a4c1b5841b82135f6081bc5ab44b836643681bcc8804c5a53eb5a911d798f00f7
-DIST firefox-52.5.3esr-ms.xpi 435991 BLAKE2B 80bd746bf13caff074598930fc3313598ef417e4a70502ef236ea987ada883ad508480bbc3bfffda5827da8af9b857a39dc9b27eac697e88465371fcd6aab2b4 SHA512 37456e30a6b5f69896e62cbe9f9898d50d4766dc07e20e19dafb65f0d80a70826f6ce0199ca109031ba0a6c46ac3f3d62d52a48ef825e3d07b4bb489b5b2d7d8
-DIST firefox-52.5.3esr-nb-NO.xpi 434412 BLAKE2B 86eb69168539c7f1b9111e5046d26fd32664efe8b1d7990508affe48f0e011b51073fee73b1cee52d2b8943f5531f512eda54af10f193fe3c5cb39ea216c4f23 SHA512 1371e7df45b0493990778cf43ea0bfca62c7e202a19b1339f4a475f3268206bbc13f9ef180520260fdb7d8ed2d7c615764da5768d266f49b4e18277b02d19f20
-DIST firefox-52.5.3esr-nl.xpi 432007 BLAKE2B 07c5c32dfb1a67d6c9488dcf5473ec3199a6e02a932f36e804fee94b54f2537a2c937ba422bfd167e4d8242490ec629262a9a014d14131d722be341ad92596b9 SHA512 3d7bde0d16c872fdb77c34e400b9d6cdc13968aae1ff2cfc579778cfb748013ca98351f1dc48dcc470ab94d2b22a77b499290c759c2ee8ce794426566ef9a72f
-DIST firefox-52.5.3esr-nn-NO.xpi 428645 BLAKE2B 14c72060fae97564bf3d9345d89b7861d03a826c8c5bc34d05eef6c220e7abda3f751671be45564a2aa5f4dbdffb26c694c2a76ea61b0f027ec585c813dbed2e SHA512 455fa426eac80bf91871b597af8642cb9c722de27d912984dfb6f4fa2c95b6eb5f0975161516327c2cb0d443a2912c44940a9d2297e0e93c48f3e1a2699d1875
-DIST firefox-52.5.3esr-or.xpi 496917 BLAKE2B a0a47c93cc1fda9a04475f0ef231e837c6c1e19605f8833e904987313f4561aa53d211927a4d5376b9bda1735e9238504c88ff147f092a8fd0fe74301fc4756a SHA512 92e2daa032b8a237a9dc6830e022dd840c16ed43c73b4c6d6c22ea1ad6447ca2c1406cb81c0df51888833e93982da3734399e62d15d1a9c2b65a2db856c6402a
-DIST firefox-52.5.3esr-pa-IN.xpi 476587 BLAKE2B c2abc99e4445452aaec946fba86470589bd7fb1cd773809061377d3f1d42f11a0673df3ed23ec31e98006cefd021028fa8584d71fc528b02f106500f22c7f144 SHA512 4831b996da11de19970a1a2cf1790a6014f59db5fa77d7675be30b46ec53591e051e3f26c7c1dc48add65d5c557c963e0a5376e7ef07792a7cb56b74628191f3
-DIST firefox-52.5.3esr-pl.xpi 352851 BLAKE2B 0f0ff1a5dc0a6f7fb6c59c5837fffb8f3f9f6cd6b64927a25fc2b80f4465725b537798976a92ca5f75aeb524dbefc17a285511b3de6c1be829bcaf888bea77ab SHA512 1c8fd4bcfa02171066f6b14be1b43e33fc4071b502641acee7cb35b8adab27fb4186d855e09ae3e3c96902d5f92c47d642f603d4afe1f6b5e3c393de740dc42d
-DIST firefox-52.5.3esr-pt-BR.xpi 438170 BLAKE2B d642edd7333e6e7b7bf7ba61d2c18d12926d2e3de413012b4956ce0c9dbb50b43c2b2a61d23761a27213ebcac5e72887f7fe1929caec4c2f057f56013909834d SHA512 85d0eeebfce2457897cd257a189356a54c1bc84f72273c43016865b0a8b6995480106e2a380b1afc24bbd75f0d4a931b9276359c79c25b87194457db6ad901fe
-DIST firefox-52.5.3esr-pt-PT.xpi 436728 BLAKE2B 0491ee9b672a496d49bb011732f7a185b61641f3c1746bdcd034d8d7e553ca6bb2bd5fbf45bfe0284750428ebf7c6ca8cf46f0b7c930d50a3e80ef9eacb84e7f SHA512 a6a9666a4487b0ac1442840a8a47a2acf4984314e6b6f4c840df9f395a5731f05cd9e74e3951fb77d5ae6dc3509b921363056930c5b7d803051541bc4c73edf3
-DIST firefox-52.5.3esr-rm.xpi 434608 BLAKE2B 98db123c4eaabc333d7594d8b9206feb5fe1b3a69c6efaf9c3fa83f4068d4884efb82c4fb45010a09edd45a12cca310a85a5d891116afe63f78c84cab3be3716 SHA512 0938b89de72fbd086fcfe10b5c172263a89ab40d49834ae3839702ad60066b8e2ff1e90eca1a1ed2a3eb8d8baeab9e964caf17c4ab83ccd977ad9cf83aa20c17
-DIST firefox-52.5.3esr-ro.xpi 449938 BLAKE2B 756e5d71d971b0eab89dd64c7febbe07c3dcbc8d6fdeefb87a13e9c708c076008905ac1770e400fa492b6cf33eb3aa99a2b22c7ff01f9186759421eae6c1d13b SHA512 941e6f8e8ef0eeb3ac0d1a9d1d9813889ed42e4fb8eb056720b5d6b872d18b4d621dea8f76edd91f2826f0ac602de4d3a5d05df16c0bdf33a7643989645623f8
-DIST firefox-52.5.3esr-ru.xpi 395364 BLAKE2B d0b5bf1492e8392758f41f72ea400cf3d04380de73bbd02daf391f56e8057241634321bcaf4aea36c338361faaa193a46ccbf907f3ef752cf8e0567c3002feb4 SHA512 856542587c315151ed013874ff6d30f606d6a4e24c818a4adf134390f54e659ed9c2761b81a64f711e88deb5d4f016f66c2b7be95a63b993f9e1aa39fb38c525
-DIST firefox-52.5.3esr-si.xpi 491958 BLAKE2B ed04768c91172c801312218bc688326ed289e3a666d3f4c55e32bcb8588b25165c7ce54c9ec8f24b4dcd476c8519142b17ef75cc5cab23d582a38dc9a6031987 SHA512 be598913c090ef156b01626f43fae513b567a882a55adc6eb0bcf5048509404fed010f4831c7c148f2e6b3dc984d89d89cd87a6a9061462d9f16876f6378017b
-DIST firefox-52.5.3esr-sk.xpi 455820 BLAKE2B 97a0295614349bf463bce7db8aa0d2c30f93acd9e27885f876410dc6e6844d002584fc9ae483a32679c682316d8f72fb27e5700a42ecbdec07419251c655e198 SHA512 1f6fbbea1aa05abd960ebfea5d44001983d745b3e24787d157c79a2dbe8f4e5576e428644385b9d079dc3a1bb14d421e92421ede0bad224fd024cc940560b0bc
-DIST firefox-52.5.3esr-sl.xpi 433482 BLAKE2B c0d565be9e25a9f96edfc0b6715b72e6f519ff66c937454331ce7f40be62a8d74394fd79941f8a1d1759a29e64a36b48f6d924461bc3d193340d1361c0194689 SHA512 a932f037dc301adc71eb8c30f5382211fccf06ccbf551030ce718891b5999438206de77635ec1e9c31adfbdb1475e2120b3eaf72440ea4432517cb2ec97ca52b
-DIST firefox-52.5.3esr-son.xpi 435127 BLAKE2B e2e6ffb5296fcc07562ea8dec12be7c8a7ecf925dd3b6e422851406ca76154f228c53c3c74f9ee0265ba28897ac7e5c35b0c346babc95da078b629afb82f8841 SHA512 dfee8f311d8f24d6cceafee42dffcfb7a664f13fc83ce6593ce07401d467ffbb842b3e5cf542caebb2074ca52f7f8d80678f8680fe58d00548c572e60a039f1f
-DIST firefox-52.5.3esr-sq.xpi 448155 BLAKE2B 1424fbe7f13b7699f22fcdb8c797b20f4a939727e6cffbc0f5699e882a4676e19aabce196d78bf04e1ca1e8a5f8a55fe42dc92ef8fd01f3fac60902d7cdef356 SHA512 6fa180821603540fba152ef4436945c5a3bf83a3e3947a37e71bc1a82908bc3edb73ed33291ecc6b316c09245cb39782ed8183ab71eea899e2f6454f447fa95d
-DIST firefox-52.5.3esr-sr.xpi 463394 BLAKE2B 01a56aa2d3f24f5c3c3f8dfb9461a715e3340d73dfa1acd1760c66db0f2ec506613a011d62f15101de9fa4b355e0ea3b74ba1675a7bfdb11d3f7da123ada0ad7 SHA512 7024ff923a81a2a362b536a17c30f32a723f52448f908ce89024bad1cb58993975aad5b1429df98c3f6d3e1c36e93ecb76ea2a6906756dd153b72f3765de9980
-DIST firefox-52.5.3esr-sv-SE.xpi 441180 BLAKE2B 146a077c5237f0d6e47545ba1b6bc2d45c04d010f93ec499dbfea37128e5190e35ba6cf3d453d37cf89c8a0614d78530316a748453e9202a32297a2f7bf02307 SHA512 899dbfc4b6915f9cebae5b6c2b759788c5cf4242d00c4f331784698dfe267e2c75387f979c9c8a076097cad62c2b72be62ab4bac062d8f75cd21d48709b7943d
-DIST firefox-52.5.3esr-ta.xpi 494799 BLAKE2B 1f03bce5b8bdf819fdf7f7c6ad0fd56db7beb3a5eb9d2720c5f75a891744f083551c27d67366cf41b94d818d6879b00424c99a211e1dcd06647f4a739b685b4a SHA512 59c066ff1314a4102c85fc48113744bdac3e2a3c0474f9d06cb5d17066d6d06b78ae386d246a3e4f59c66fdf8e094d9befd9ca89bb7829f846049934e60998db
-DIST firefox-52.5.3esr-te.xpi 515241 BLAKE2B b24a87487a3d668fd947cea190a8becb120b8f21cf7c23fc62ed56043699f51d4f6aa82ee9081589bffdffe53077243a7d2d4660e9ac0e3bfb771ea3bcc180a5 SHA512 9fd952b1f133b6b2b542320b640aca8b1661d456c1c4a3d38000b21ccfc783c8ca01377f7454aaf5fc936d9dbdce382c2d7a38f4de7d38e5d54051e75b6a2b86
-DIST firefox-52.5.3esr-th.xpi 489379 BLAKE2B 5741cb9365cb4a7c33b71de5b0feda79d107dfdb9710dbb52abd3996db01c6060ddf6fcd198b3881b59f7dab570ea9a194d262ca170d827dfce536e46e166cd3 SHA512 a6e0c3578f3fbbefac6f256ae9d228830a2ef899e5322ae090ced3c4e3aacdbf2ce580da8a0e26b33b15ff86fb66876559056dfb663cdca6b94aedd1bea75750
-DIST firefox-52.5.3esr-tr.xpi 443673 BLAKE2B dedc3902564340ba714d54a8abd339960be209ce3b9041344eea2c6e08c298ac8a67ce8feeec6415f55131b08d701e63fda20cb8a62b93e4b7f7a9aed6e20bc9 SHA512 081eebaddb1087435a701c5e2e7b749103602c9f953069f75c9f2f446aa65a93a6d891aa9b7b33054522d734e5d47fc79afe19d777f59ed3acd04da0747f0c55
-DIST firefox-52.5.3esr-uk.xpi 495095 BLAKE2B 8d76b816626838c26a35268b71ed7a834836358630b6e076e743420552eb02a33718f9f9379a3ecfeff6b6de192194ec879ef8a1da8443450cfc5da43b61096b SHA512 cb726c628b9c51201da8eccb7b054fa49a7b0d364c085430354a3da94d6400728bf230c5783c5e1d834a93fea51c1a103fd59953e73e2359581079a2cdff57a7
-DIST firefox-52.5.3esr-uz.xpi 447916 BLAKE2B 0f32179acd20763342f5c96baff18411de5d267d581ca72e5f1c25b6ce2c9942df20e9347632392c9964371e1e135bbb1fda40d750dab36875b24d289e3f6c59 SHA512 8d842a7092a334c314b3b3a0ed4fd515803b99993f8d109e8ae5d0e4a366ba39b6760e1fa74c76bf55fe1a806f95bb777780c3118b252cea8ad0d70782eb04b0
-DIST firefox-52.5.3esr-vi.xpi 450805 BLAKE2B 3e27c418b5e01e97ef5d1fc365a6dd8e29ee8d0649c44d9249cbd69d3bcd7adbc2c2546eb257ae6fcb3bf33da1387c27fc52e7695714dfcae92e0fed0e9c427c SHA512 cf910c2c9234ebdf3a75eac0934b0dd8d5eea51df370505fec2a1747e1b7c63b1b8e46aadfaaa7ea8becee9731bef352e3ba2c368e44154e6a32993c1f575f05
-DIST firefox-52.5.3esr-xh.xpi 441172 BLAKE2B 780cd8e2d2ded29634503243190c35816b8cfa6fc2969417c2a1e17fa3ef3e8f38de427bd2ec369f896d7424de5ce7c2983dc99a6a4d6170529f7427e81c2d04 SHA512 18f4c60bb998967dfcc59734caf4e9f5f0c3186ab58559d8c867bfa0daadb57738231848ed35a59941d55b86a139289584774528177d13aac8d8db7a13b33f7e
-DIST firefox-52.5.3esr-zh-CN.xpi 461694 BLAKE2B b1e5c61f7bdf91fe18610f00a1932c122eeb8809733b6386506adbc288ce4511023f94aac4ed7542e8399789f41159aae9e65e1ee437e15812329594a5211212 SHA512 387fa5e547ee3bab2a03d6e424249a49e7c7d6650b56c6a7d663347da9bf2b1a817e439c0ac7b710667ace9efbeff5d02185301e8e7c2058e7a786a4d4598d04
-DIST firefox-52.5.3esr-zh-TW.xpi 472534 BLAKE2B 8d9d7c230826db47d18c17b4ee2abb26d57081f65221789bacec6057466e76412374a95257e68cf71bc27f96fe627aa079495d8423051e42fc06856f0c01ec14 SHA512 79c9498de80127bce4514313c57dd4d02538467c84687981923a0b11e125906eec9e47942d71171b4e2ff6a87b6ff4f04c0ae890788f4a12596a8b81e28d9dfa
+DIST firefox-52.6.0esr-ach.xpi 427641 BLAKE2B ffa9599ec6019da8c8abf85a8b649e8e6f848827eca4d49923f1224d4c8c06716f51b9e06fa55e46d610528dda657e4bcf756d92b6bbcdf1c755ebe47b7e6cc6 SHA512 82686b3f39fa4969058b317917a02051088e08ec49ff87a607e339f699d6e5362a303ff2ba306edcf033e0325dda08748dd1938d26dce248722f1fa1cddf5e87
+DIST firefox-52.6.0esr-af.xpi 436824 BLAKE2B 916ce2424f2edd130beabcae3c25286c416bdeee33ddee6a58ed33b79954cde64155d3b9d8975738aff01b47cafe452e867daabe5760acd3335278b253a05def SHA512 834bc8deb874dcd67d5ee91d265d465d6cfa4e0db50a98b944220a8c060b3d4e09e7d61b98c03f6011b7d2cc4c7a08b7aea252c406cc416d25f4c4bf05822554
+DIST firefox-52.6.0esr-an.xpi 445142 BLAKE2B 770c04cb61bc060ee4414acbab8b86416668980ed91368922b9faf828067eb3704c5ba7ed57b5622171d8c4c565bf5398811cbeb7feecb00b54ebbad1e2ba8d4 SHA512 e4e314e73df570534e615eeeeea8d07162ddceca71b212ecbd96fde1eeeca8ffae106065a57a1ab4b36b5738b726f619c71d3d7cf6d37a0d8d579d558106d952
+DIST firefox-52.6.0esr-ar.xpi 473382 BLAKE2B 3f460e3bb0f377a58068534fb4a66c8555777d689c12203ff567e678a872ee1332d22d12b1bddaa325c7d3beb510a0df6e2f966b925b79bd744666b21af95da7 SHA512 247afab58bda0e2c5991d353ca2ec3864533dadbf854d339939e448efc8d6be8c24e1e9b6eb37a9d95f27d19c06750d529ccb86c202f75c5bd09696503f27a27
+DIST firefox-52.6.0esr-as.xpi 486889 BLAKE2B e38602d1f044ca324b58ef01725c3228df4abee485a7e0055d79cd82712bbb1e1649b2ee9e3ca6324602fdd8205163a1280f2d7d5eca5bde2a84501024ac9940 SHA512 a2122a1e8f23c56ce08ce150b162806a953c99a866b02903b388717e4dd4d242da6da2091e6d9860fba73524b75803d165152afd18866d1cbdcbba682950a8a3
+DIST firefox-52.6.0esr-ast.xpi 440034 BLAKE2B 6543493184b77fd4bde8ade9ef5b471b7e299eb5b9a4a20e3a737fcdd19b1c5edc6d088234439c69ef47011dc99a092057fa5fc8adef52e7b9ad562b332b9b88 SHA512 fdf83931e59bbc11dbec11de83bc8ac96bd6108bdd8b709eb27e1b108659b577ca72a5e97ed1254f4cb33025b1d4794bf30571acb1ae680ed5973c8e1f6415aa
+DIST firefox-52.6.0esr-az.xpi 454923 BLAKE2B 556b0de26b3805582ef6bcdede4fcd972d543620f3183af13f13be98c4832af92e7565c97f2a0f20190f994f4a067409269fb1ec2926552ffb3dff0ca44229c8 SHA512 cf13abae631203793ac4eaf0fb045ddd03b407f3cf7261ba032abe38bb03460d1747cd090e9f7c9db844b6d9e551415037265070cd1eda993aa14c729bcddc30
+DIST firefox-52.6.0esr-bg.xpi 487892 BLAKE2B 9418123e01fa98552195466c23043ee2e46038c64275357975017e60e04c1cbbef220bd5ff0c1828cf9678b911fbb2c94e6abb1552ed86f34f866290a3b37d62 SHA512 3cd3a24dce51b18588aeda0e36fd87000c287a2408c07a31a39830115cc672fc27fcd3d88c994ad85ab0f6cc3dbd7f47e4060a97b0fb44d9d6e48c27c3f80d9a
+DIST firefox-52.6.0esr-bn-BD.xpi 511995 BLAKE2B 8d04003c9290d06a9cfd36cde63c934f3d234776b65fa21127a3c44c1737250a9ce7f70d7ec468608f0115b5d20e7db3b9f405c7b0ec30ba806b840eae6f3c29 SHA512 9f46f47ad47b710f74372bed06aa892fca5eb3cc9dd30423c95a99ea3c033f274276cf7fd3c21193985c12a58a2f02d3f4046bcbb56af41283fa83d6ecc0ccd2
+DIST firefox-52.6.0esr-bn-IN.xpi 509376 BLAKE2B 239b3a74fbc44cc914175f347afb43fc0acea07b2d2bd818c222a53ff94937d3eca5ecafae13777d797a2db77146e1eb801a851c95c68b8b34e8fe9a6d5bda32 SHA512 720c17d3f66f025dec948ea047e8b6ee928ae602b1e9845ba6d46d611fd67929d63dce111545bd52a8381a197996cd7cf900360cd8b13ebcba330dde4c9d14ae
+DIST firefox-52.6.0esr-br.xpi 435483 BLAKE2B 6160786b6acfc8102c71f9f067cd9425554523d522ab511ae8db5fc71299f0e0a376b5f57413b4033f8419e2891440ba303abf6255bea2898c36dbc61d817d91 SHA512 42957248d394e00a0f32f84378f2afe1f82134e67e4758d16d42b325ccfe0811c8e609ea932d840b6831e3bfb781b6412414b62fcb557f74e113653c7e208781
+DIST firefox-52.6.0esr-bs.xpi 441782 BLAKE2B d25bc9b9f539cd41a6fcb439eb10d86f9a4703cf489f8aac6bd1d571c4dd8e2bd12c31f9df3d0e30c01b13be4bc3490277577bc6ae61618c7ee5168876b309d5 SHA512 53c9ab12995d15ea03c9a53c8ed911c503676161eab59aa9afbc2b83e5653e2db7cb66c79a1f61130ac58ca8b66c7a583a3ccb2e55a1660c4dd62723b1eb5e0b
+DIST firefox-52.6.0esr-ca.xpi 443304 BLAKE2B 46bcd1113b2d614b8b406d9e03cd0426ab01e429944dc0f9b7fe6ce67722a034fd00943c856df2ff0976ae37fb5f6e5e370838b2ac9024b0b107fddb076a46b5 SHA512 a53975e6f6fa3ab72ba757505b0073eea5263dbd47e5b02b8fdd919c86bf8cc2cc27e692c12ff27e959501e56558676447c7493ca5202dbb979be5c023a53b03
+DIST firefox-52.6.0esr-cs.xpi 444075 BLAKE2B 123563df18527779002ccd5a78ce744792a1a24b5797e167d653920d3b07a378b0f9273559b2b8096a23a7a6c5d0842f8b933140372465cafc6d8843820d8ed3 SHA512 51159330488174bdfd86fbec58001834508107a34279c70552abf4c8b4d10001fb93a8ec982829b304135a4a6992804b4e2bf4928d00f616711bd7a79d7d3a15
+DIST firefox-52.6.0esr-cy.xpi 436583 BLAKE2B f81acd29f07ce8422fcf703643731a569a05cf4d89db9b801959eff3c6937c99820ec55731bdad0730ba01e04849ccde90624c3dd920b73ba31adecf7167ec75 SHA512 73d3de2e601d2e340dac44bb63274b35df889cdea0dc28f808a2cccc4c545516d2f77fb94beda69b9090e9c0d7da9ef91e6198114bb1fd14e2a1fe9984b2d160
+DIST firefox-52.6.0esr-da.xpi 424394 BLAKE2B cb3385ecef4834bdbe764390df5cfbb915451904fe663b378980791978ca9fdcb718f5cb62951e8c94f117686f2dcb67245b6dc10eb67880ff169507fd16adfd SHA512 81bf8d491a601f8714eecff4d99cdbc292f5b1bd1466b124bf0248e2d4041dcc2ff139326364971f932df631c1b6041d93d952a08f78f0ed9ce2925186f7ffca
+DIST firefox-52.6.0esr-de.xpi 442479 BLAKE2B 5fdc755b537410fc9cf320d317e9f025282a275f5f10efa53c247b942e3bf57ae6d476ab926654e90cda236ef997be17ee1a7b8cd5149846d391c589a908bc0b SHA512 5516b95498091c14323f2b2011e7a772a29afb9382d2738dbadf599fe473677b38b23489e5105de7d8ce068ab0bfc80e7572c53c6264f42e3d8cd15956a6d4a5
+DIST firefox-52.6.0esr-el.xpi 516593 BLAKE2B 49130b1dba0a87740ec6d165368e5f5290033b081f04c5a5ce71a91b3e85a41a39f4b265eec55184eef2b37d1d75af3b43ade5972cd583b8ebe8c314f632ce98 SHA512 b1af201b65b35f733583b942d72cdc116192e94f269fea4076ce964d047e3a77a486dfe6567ce667931f358e7fcb017902ed40c859f07da4b2986d6119ee6ff3
+DIST firefox-52.6.0esr-en-GB.xpi 419324 BLAKE2B 7c102a0579891bb05752dfcde78eeee475d4ca815d4fa82142832b22c96a0989b50f97e90d93659e280ac3a8fd8c0017853c0aa967a77751fea63118428ea4f2 SHA512 5ac7a905e2071712e8a9cfcf19f5bb8ce67e3042ffb430c8cd60bb28880a91195cb4982f0faeacdf90ce610eeff12ecf9e1004b5c3aa063f95d29f2a2af085e3
+DIST firefox-52.6.0esr-en-ZA.xpi 412212 BLAKE2B 33829ad6623cab6865a091d5fed6b863c1ae5843f3d4aa1b678bea6cbffac65d05148aa3c28fad84293ffe9bec70ba6560a4341dc7f53162fe6d4c68171f15af SHA512 9692f10c0ff47dc197b327d9469077352e0fadfe4149b715a35fdef8f96b58d7e3943d0912336498227ab11a0190cfe773e25309a2235eddd20d7fb6e11a4b86
+DIST firefox-52.6.0esr-eo.xpi 437474 BLAKE2B e586958cd8af52a5d9ae6eb0f54da8b842ddf459d3920ec60506ac4eb2d1560861d9880fcee3130156658fc69f52232e4dd535d5baa4cff38e271d1acbc18c3e SHA512 57f1de291714df7746220e14c8f770f67d01ce518dade38bbc746fcc97467880ee5e003e24a78e553b4e597c12e5b17f2137a9ce655cccb140ca8a9e46171418
+DIST firefox-52.6.0esr-es-AR.xpi 445926 BLAKE2B 7869c2df9f7ffaa037196589676033a96d2372d506530c2da0674cfe139b7323119dbf37c6e7f4451bef70f1bb5cb14b8d63a8b106ddb1fd528bd2e9ba735f0a SHA512 994532528f171e0a8c76f1ce1a16b534d3e3c2ab55c834ffc5cf20cf592c0f2dee43bddd127f9f5cbb729ab9f6a373b724dc4377123137186bd090522cbbd421
+DIST firefox-52.6.0esr-es-CL.xpi 445676 BLAKE2B 9a6be5cd1781d8e38ebf97003d074071daec06ba57e30ab481dfa9be71ce01b7ad5527cfaf0993927259e362e05cc450d21edfaa645e0578984f491ddd501450 SHA512 f5fa920f2d4dd90bff34be44df78f23291820231506a0e947a7fdc7020fb6cb99e938800fc6c805d57e3937a5d1ccb1abf29f37cd2ad42352cd57e2a9d27ec50
+DIST firefox-52.6.0esr-es-ES.xpi 344876 BLAKE2B 5e868bcca8711717cb740cc920bedd5c41e5285d87d8ff7ec326bf58eeb73ee7eac4562251707b42b0283bca115a28fe713ee4243d0bc1ac2704da0cd8cf1a2f SHA512 09edb992d6874887d7ac602ec468c4a083348dd1be83d4ac2aa8c70fa96d51b9d0408adf567ba1c435f2ae2e113ce37fe58ae6416739b545a9fa5e92589b1cb4
+DIST firefox-52.6.0esr-es-MX.xpi 448385 BLAKE2B ac8fbe46dfb11e8d069a6c12c12a2e899558d58f9c0647d4a36f0bc163d12a052b177c46ba053ebec154f869b8917c2c5abb4b9795a8b978350e6a1ec44a6bd1 SHA512 2e692a386fd2aa999b7f93c35ed050d350f90773dd9cc0cd7d4b3e4b6939b191772a2a784d823420638957843cca5e88235d9bb3889a273f44878c343fe458dc
+DIST firefox-52.6.0esr-et.xpi 425113 BLAKE2B 4f79a770084790696a3d8df78775a258151eba9d1530d4d37a88d9ea7b1b49a82517a533cd1bbde760f4599d2a86c8ec9c17f3e0993baaa075b853b9c9195850 SHA512 9e3be03563c7d37f6d119ce15f6d1f646b62a39d3b4a296d89c38382549a209f1a2fb00d4e889ebb182e7354f928882ddc0e3c600d6e713b4b46e8bc19c4a25e
+DIST firefox-52.6.0esr-eu.xpi 438479 BLAKE2B 552dd08dfd2d87f0b24e0d08a9d4957b4c0c8f81b529772400cc7276e3baa1db4e1f15191aaeb63abcd55b6f732f9d381699be9be5c18db21e8fd3a662338479 SHA512 8ebc2213cd5df551cbff78f7556e247ef241234137881677105562e487457e1fb7178121c00f928a738ef461817ff7beebfaf0331caa349a976a6ab352c8b529
+DIST firefox-52.6.0esr-fa.xpi 491344 BLAKE2B 029e2537186977db8547b5df7db36aeb44aec32c62f30166305f738f5d91f04555e7fe0f588a1d63e06361d2d2f0f2b0939f18979fd44114a592732d25e87199 SHA512 8fcd0a5a3a28325109ed091f6774f0dc544d4dba84d38dd2adcca5a244f91d58fdba81ab2c27d26311a3e21d7a7d302b72baef6e2eaa9a13588ebd3e3a798aed
+DIST firefox-52.6.0esr-fi.xpi 430061 BLAKE2B 4fc30f36fdb424afc8fff4e5c18d032c5f9922545e866f5a628ca42e722bf450a17c540580cfd31a61dfe2159187b76428276f632d769429ee86cb625b5819f1 SHA512 0bbb46abd343959f75ef3c41ec42fa8652d41fcbea46b336ed790d83b4ea788bfafcac9681b2542599de44215f6fdfac348f2ae9b629c050479f88e6b4c28291
+DIST firefox-52.6.0esr-fr.xpi 450211 BLAKE2B 7a9fdc85aba49d697d13d686272cf9e62769939fcb572bd66a8a8e595f858a77a448d57ff38e9d81f5db50338543dc37a7fa246de027b0be60c5fdfa517ddaa0 SHA512 cee4a09ea9684dd13e2e9bf54dace3a1a5f2ea94997bbdd1ad35a9717fff370ace200d57b078f7af9b2b62f107bcc161bcaaac27b387187631ceac12d398a929
+DIST firefox-52.6.0esr-fy-NL.xpi 444971 BLAKE2B 177c6364a9e5d45c13460905373023b6c5b477e07579b223a9da6262239b8c8d17fc415aa5f0f65e98433a7e50cd402725f1444492e44b8806200f6766c87507 SHA512 a7aae0dd77cf568c8e05b64cf689b0893e0e465f37711925845a58766e969369137fd9489df5acb504cb1ef26e3aeec0ccaae2b542665e9f8c5f31d285efa6dd
+DIST firefox-52.6.0esr-ga-IE.xpi 458165 BLAKE2B 55857c4780fe82c2de82754deb2115764a914344eb44c041eef3b9c13e28fd944c7ee08eb0619e070a342bffb32623576bd92f74530e5fd29ff7f6d985ccaf35 SHA512 094ed54635b19f57928dcdde7a54e7d60d24391ec906fed497e83451f6e38a7fbb70d5a850ed3267960ad1d158c356a6f13881d7966dee8d7052c3787a3849ab
+DIST firefox-52.6.0esr-gd.xpi 447268 BLAKE2B c920d98d755f9ea5c56fafea332cab36b28a3ef2371cc2de8db38d2d55c2d9d0cedaa2363832a2049a5ba0dd8f3c22f11a2cc0dcaaa7c8188e8ae2e6a1384f67 SHA512 6dc4b2fd3bfe4411709d94138dd1c274f4418a8fd3d9acf34188fd4d49a192dc3d0b641dff6af0a90e35c42b165189dc23f0d1ce19db1e25e802d1e10159f50a
+DIST firefox-52.6.0esr-gl.xpi 447295 BLAKE2B 30409485e8e8505157c643bdd48781baa7e00c1acc38cae2e1a913aff54b36a7f5748c587ddb088d37e029716f5689d402f632e7af9c3495b9443f3b31e6bcd0 SHA512 1152515d529233cab5d1daeaff0990ed079ac558a04267b00e6796896b083f07bf4744a83df5d4fe4f8ed64437c05c7d6f5b1165c1f1b1ee00780cb1f4ef8617
+DIST firefox-52.6.0esr-gu-IN.xpi 489366 BLAKE2B 70df24561543493ab90b1047b5cd04e36aff23ed1d6522b530b73baf744bc686019a5c2ccdc80941081e810635f4ab546991500fceffd5ccc1cfcf2b974eed10 SHA512 39ee56f9c8e4bb98acb7ca84f820120bfdfb0668bccbb643b00981284fac63118a2be292e4c36dc2a9ef0bc409e8f4ec96f5d2b5499da7c3fc6c7a6a2c491ac3
+DIST firefox-52.6.0esr-he.xpi 455282 BLAKE2B e01ec8850e11a74e55247c1a2987ebf0d66df6922df95f46d64906907152987ac8d4bfe07e3f022c66c245d2fe4459f406d052bcd6eaf363ab17f62c5858d512 SHA512 d8cc9aa1eb81934c388c035e8ce0b9c86c75f6a2d647b46ebb2f3c158253d341748eddd08533cb4e3b7782bf60d9a49552d346de28f758e3413c67e793120e86
+DIST firefox-52.6.0esr-hi-IN.xpi 506519 BLAKE2B 620caa21ec4fbad2fcb1b4843e114a7b0af47c201d0d330722f0700251ef0ca9a04a7781e873760420b5c9fd0b11adaf4f85a20dbb5f0942b1d2f64dc89c9f49 SHA512 ecad6c85a0159ef62c4e9364b741b8549f2ffe1b850264df9df0fdd5fa6294fb243c29144442f30311515fc0a5a45770f218eaea4796e50857a25ce8d8ee53e5
+DIST firefox-52.6.0esr-hr.xpi 447503 BLAKE2B 6e01baf942c10233496bafd1f268272d1ddd1eb341595e994b10ecf1fabe8ebaaf7273f2b1a66363f28c2dcd9a5ec9f01190ad7fc30094b84c3f6813cf405aad SHA512 10c7963b53d507cce28ab81fe29dda4db691fe65e830b136e84642d59074950c4ca9a0aab55b6656e48feea8764cfd224134f2eb5d2815f4daf5b103a16c1f5e
+DIST firefox-52.6.0esr-hsb.xpi 457259 BLAKE2B 59ece05eb88a67462567bb1aab4aca0b14fff112ddce786dc645d8bde78cbcd070ee7518ab13c929a929d886844084b27a603240724a0fd58ebc246e9dcd3a18 SHA512 a71a1ecee1ebc7532e9dc33fcae48796e461f4b553ba1534f07e2afe3868f21632e2557d827af003478c160f97b9afdcf49e3b057af8ec904a96195ac08ff104
+DIST firefox-52.6.0esr-hu.xpi 451497 BLAKE2B abea166dd39c162641d58e4d40529991e0b4071fa54b1f8a8f9b755ce3d380b2f461713a82cd74ee0332913a4af79362097362f21051baf3a592d1b3ef8e1d5c SHA512 d5dd8374c864e569aa9006a34d180142c453922378b5309bc99e17946f67a3644fec74ff0c41c9569897e592974f832cdd349e5e2e91881e032cec3bc0582c85
+DIST firefox-52.6.0esr-hy-AM.xpi 495774 BLAKE2B ce74029af00c98aa00debb04c627a6e800c9e67126b2bdf32653569d6e507060aa73c00d980c7df3d427f509c0708f6812548b622dcd13240689fe792a14a5ae SHA512 5001f4d451d3928efce180e6c2f9b0aca682d4823025eb6eb48e48a3d64a927131bf432b0d5628ef528c5dd684fd65b02e3a67cb4633d893914d941684c7dad4
+DIST firefox-52.6.0esr-id.xpi 426023 BLAKE2B f75842b5b255fd33f88db79f8378dc853abb4fd0abc2e6e4d11a13ca4a822b8d0e4490829a8a4b93aabb8d2aa6a80437ebd7d17d3ca2718d1c287da28584ea1e SHA512 9ad3bfa5502aebcf633f7592a41139a691e53ee518af0b2fd20b478d36c0c8cce55c51418356366e329696d8fd73f5262d4b559fd251791e3329c06dcf3db1cb
+DIST firefox-52.6.0esr-is.xpi 442694 BLAKE2B 220f9ad847fc81f68ed10ddcfba1158319b191c540b8ca31de5af495578fc548065de00caccf57bd28899b1593adddfd2f01840cf656e89a5668eb9ff8a189e6 SHA512 ea249a4e5c43e3f247e26e7cfbb0c6ebf859310015161537001c9b4d4c9084f4beec6670ead2c37d5f8ed26f3556dd3a714369423deaa9f8459de821a8f483ba
+DIST firefox-52.6.0esr-it.xpi 339221 BLAKE2B da9a9db4d35e3fff3342009b7d8b85ed8609d1151ea50010835e80329c47bb3aacb6f02b63814d9c987ae35a7d8213904a7ae714ece374cb1468459f6daaf730 SHA512 7b302cc938ab48978307c8cd6cb79401472410de8567f6154a9098af9923072898aa72440d11a99d3b1d869fea98af0585c755bfd0628ed5946f97ab76e6a287
+DIST firefox-52.6.0esr-ja.xpi 488343 BLAKE2B 3032f0cfe45e236577a13db6c36d4f801489121b0a75334e772d357e995dcf306bba38d9e9eee417715b6a4a6c97af94f9fdf3f9e9f4bbd6efc65a740c8b8f94 SHA512 e628518f75745049fb4f3e61002f6fc881bed861e69a938f7f9df71faaccac9c3424335cc4557e95a3ceef75d7401d782956b622e8ce8ae7d634c4c8ac9bb889
+DIST firefox-52.6.0esr-kk.xpi 496940 BLAKE2B f24951422b735cc0ba9c14d38312d1d3dc7f7fc9a71b140b8c7a5ff90fff8ef23827d722eed41adc8d010f7d60cbeeb9e0d125652acb3e24677c693d0afe9a7f SHA512 1eff53098cc4136c5927e9d5e1ff7e095794330b74de3f152e644c598c6e04c88f3180764a35353e33ee3524c22e33dc861a035c3ab058c3a2840380cb19aeed
+DIST firefox-52.6.0esr-km.xpi 520344 BLAKE2B 063f8c9d25b2041785878dd27923264f6972cfebda31d79998820da8991147a7c3e73cd494b20026a30413b2d587bfb59c38148544cf6b5efa68b322457f2db3 SHA512 1d2fc6f4084f69f48b15b631f0a98c43fa5c91fea2954c7fea4124e0943c9b6187e2f51c3c0b49d79f796283bfa81bd57c089088280f5574ddce281d4cb68c5d
+DIST firefox-52.6.0esr-kn.xpi 519456 BLAKE2B 884acfe3b65d3073d9a6edd2dad676bfb0e5f9a163a29092eba85a12125d6eb953e5dda1891692524124b0eebbf9ca4dbe558ee64fbde451b4c3b328f8148505 SHA512 c4b2abce72e1f511aa37e4623165512fafe1238787f75f4dfda5ca4f0be447868ab7608e996df78d84a3959e2ddddc2266edc9e157a06da5261f90d57eab9fc3
+DIST firefox-52.6.0esr-ko.xpi 463630 BLAKE2B 94ae991e13552671b79f6644cf84f4e1aea5b148137dd31aa40f924387b055b7bc69561952a80dad90cec63862ffc6b80336ef7470cbe6dec6a1d9450dd8da74 SHA512 388ddbef8fdb210c1560be8ec5aaba3dc96d531dc02101c541c1e5dd9f7c5ab3f9d249f3021d632f9840ba8ba730a65db361e2ae40e6c0f7b0c736daef466818
+DIST firefox-52.6.0esr-lt.xpi 452236 BLAKE2B 8bd3f415486f4d61f71be6d7b96833563f1585dd2e27fb739ba0999ce8a2e487033118d2c46ab5614665d2dca0c35dd87738e03d0b343e3d72b69303632ebd3f SHA512 00fdc87df3187ec1b118266bbee6132b1c8c50ef88a19e3c6d9016d5a49940537d5088dfce915a5d98e6bc02616bafe8fa7114fab167c9cc4efb0b263bb2399d
+DIST firefox-52.6.0esr-lv.xpi 448451 BLAKE2B 7d0d8064e8e88b2365b5b9e22744a6952be718f9165cd6ae31ed0f9b19c7228b5219a903163311c35839724f21e0b75c86599e4deff551b1e25233574dc82a58 SHA512 5c0fa4d2b2c0f75b25e8ed577b70b98fbdc7e21d31904ad3402de421bc924fcc5d65b0f560f3820bf2986a674fb5303d4081eddeea746c062675d393c25f38a1
+DIST firefox-52.6.0esr-mai.xpi 499841 BLAKE2B 21feb64e5667175ca626a7b5fb2d97c23821ac7c1d5b352f6077a4014e95e31a9034700047f8784d454bf54268f5bf13a7fcf04ad0fb7a9aae87f43c7d356e0e SHA512 64181879df16ddba4cdbcc5e806de0c18466b8fe6fc77f0abdb5a39b23eadbb85f91ad3e56ca48cf85ebffacffcbe28091ab846987ea9188acb01d29fdfda0c0
+DIST firefox-52.6.0esr-mk.xpi 496200 BLAKE2B 536ec0617ac509c7a61ce307739ad3a5a4a05f97c45b9197d067c848a6e24a91bcc86a6b87d0fca85d5f4a5ec63e26b0a45f6c7a2a7ae28320fd4dc059570207 SHA512 f0d7a2542db3d875ee29408fcadf2fa677cd19b523d7d8e24364b85faf03511d0c44f87bd00c82845c4e789ca75349b7b63673c8a296c4afcf273b1a53be2d6b
+DIST firefox-52.6.0esr-ml.xpi 516487 BLAKE2B 173783a4250225fd93647c3410ca5d56331a4f74099ad9d089cf0ab384ed7c4c05e704fa4bcfb182321d514d2005ea0eb56d9f841463b5ea4d5a1d426ae6eb7b SHA512 f57cc14eee4c197dbe71b8bf48d77e48f5785c1cb91cd82781b5c841b94c4e25b6357719fbaad3019f91118da255acb8b840453d127cfb36028564acbac263d1
+DIST firefox-52.6.0esr-mr.xpi 502431 BLAKE2B addecb8e3f6835eeaf91b18bb9e441fb207f0ddf5133fa98216bdc178dcc2f566d6c2b72c93af867037598ce18d5c6eebfa176218d55a7626f7d12bd346287cc SHA512 21beb02322054510e7398c0dc7aeca4deff96fe50b47429582d9c649df695a220d9b13bf158640db575a3b58b6bf7ecb4034f299b7af4e17e42cac8663a9d6e9
+DIST firefox-52.6.0esr-ms.xpi 435991 BLAKE2B f990e1d9458ddcd414c7ece8b78b39c5a0692e72dacee9705b64ff4bb409baffaaa1dffe195b1bfc307faa5fb9872c6a8063c01562b6ca51e11f3d00e312853c SHA512 c2515f1d20086f3f14422a95c86da98adfed6565115bab1bae8b5be485db59494101dc229e65f3f9e60cd3766ba6184e832442da20ad221159f2332db7ed7627
+DIST firefox-52.6.0esr-nb-NO.xpi 434412 BLAKE2B 8a5b1b05f97b017427cb9465ec9c3c3c0994f9f5a1fcd65b00264e6f4c28e1fac23d36cfff51dd88f8991344deb3c7cd7be72fac8b7936664eb059c709406875 SHA512 edb7d0464ce197eb4e7e042378ad51a89191c42c3a83738a9fa15523ee906328be08f986b213203961b7605112d98b1c220b12ef89bf0aa5007991bde974e972
+DIST firefox-52.6.0esr-nl.xpi 432008 BLAKE2B 8ae0537679c76c9cde7e49b3b89d69a3cbc65241327668f946bce0e92f718b7bdc7371c6c32ddd6805e7892cf95c9e1168f1b4666612c7788db5168fad6d80f4 SHA512 50489762dd8b120bf000d7e91310d1c453f66f60c21bf090fa6f28586e32cca7238cddd9f3d52e025ae4a101550a2648ce793153492a1c5ed2dd682566be95e4
+DIST firefox-52.6.0esr-nn-NO.xpi 428645 BLAKE2B 2ec44fc883163c572e07ac8427d3a57517b78939fbea1617e789c4102154048d07b73c5d8197abfb4ed282db9acb8b0c31210379bb532f688b386a7e66bc3c83 SHA512 9a1c40ad2ce9b0f2ae55eb0be9daa187b8fd1538e8262d99a493501f185ff3cd410d85b870b11c99e3b547e22caf547d202b115b418bf718f95f1fd99532ff25
+DIST firefox-52.6.0esr-or.xpi 496918 BLAKE2B 960f7a64ebe6ba0f428139350b865652d4f0956846608283375d32903c7a307e33d5a905eabf476bcc7a0bd1f4e8e8256141888b2f989f76dee8585025d2773f SHA512 a5c3aa33fc25e42381e603c66b04a44cab6537d00dcea22e3d482ebfd4b3abefdaf022acc7175513751697b9d323760ea530fdd094d18c563281761c16025fd3
+DIST firefox-52.6.0esr-pa-IN.xpi 476588 BLAKE2B a82f343841a5ba3826da9889e73804a863bb828f73ad117e341143da4d6cafa70f455dbd54b04cc13482b1dba188034ffd41bb66743ca5b22755c31b46e82760 SHA512 cd04eabec8c1cccaf68a6094e04ef48c8197beb13f0dba521f460abf2269b1e1e87f176cc98cfb2e9b15a1d86751c7552327fb0d3f7492bd060b82cdead13c37
+DIST firefox-52.6.0esr-pl.xpi 352852 BLAKE2B 218e2fd4a46d01c97e9d3239766c2de75e4f91fc930b4c56e79b073e06e1b5f4975c0c94f0b3b04384f9116e79ecf084ba78bfbaaa4ebd3658f76a283a0f4c15 SHA512 b779ce4234215a60d765a5a28008296f7b04a439727e4377b33eb595ccf5832d61cf1f5097355a844ac2f5b271627772d1ef2fc9a63b60cfac3abd7e85d67c30
+DIST firefox-52.6.0esr-pt-BR.xpi 438170 BLAKE2B f2d47aeedebb57603990376a45c8fdc3ae395fc73a1af6132dcb6f4cba1050bd32f2b32615e5cd56252cacef42df59291fe83a796bb2a592410f0f654b8b7ab4 SHA512 c4c00c37bc1e403e81acc60b9bacc8cb49c62fd860b396e23d7fae15646d58b79e1a4ef64a7d33ed696dc97c7baa5d915d97d92f637441918e10477e588aa495
+DIST firefox-52.6.0esr-pt-PT.xpi 436727 BLAKE2B 45453849c222f7b818b726ac4de8ad53c6a873199003c2c1b5dde63cb9c39381701a358f72f3ffb5af0fcd93996f532dc57928ea3be7c0b6b88e517339bfb79b SHA512 2362766575c02a0d56109d099fe2b7e324d37fd3f9b7ac05b8f0c843b7046aa9927eb127e1ca67833d75045c195b506d86706e2ffad366d5111f013b6044343b
+DIST firefox-52.6.0esr-rm.xpi 434608 BLAKE2B e74c3a4bf2fd6e1e4f54f1e3c5fb8a56859955ebcd938ffa18df2ea007f1f2f563a89b7b93224222d4c3e9c348ea2125b71c02c2a161a73e8015b88551f68ef2 SHA512 a0841377d40310b88ca349774ac96c0f5810be941ecd81634d9fc0800f493ac80c38fc2252c7c7924c7b049877481ad90646ac179dc842fa5ed8e81effd43934
+DIST firefox-52.6.0esr-ro.xpi 449938 BLAKE2B 6ab865f3cc4439f3689c47facf09c6fb938342db0cdfc7105573224d2e6469691e67d4ce08b75a6c5d2f94bc6978ce5e5e68f197a41de61d69fc8b928c97eaab SHA512 870cb64bed40ee1acdb75cd018040f32d22dc148a2e04fab14017b519dd19b2b5124ba044b29098f815b122aa6d6bd1d31aed63c71fc78163367994ff3b15cd5
+DIST firefox-52.6.0esr-ru.xpi 395364 BLAKE2B 080011c36d02c0bd4509da966bcc460afb510a4ae7a5194fee1d03d80e54af1ea947803c7f96ec8021e30603dc9a0479626ab8973f5ab83ff6df5d2b78abdd70 SHA512 44c08bc658c5caf7ebe49c3adc6d55846e9a0848dffc41ae5d02a4b5e07ba095d2a135f87ccb912a887c413ba2b74d308d6b736edc2bd8432011f02721cdf6bf
+DIST firefox-52.6.0esr-si.xpi 491959 BLAKE2B 8bfe69b6e20d50591873c285538dc58a603cd926eb8eb1365fdc802148dc1c415c4292cff7a705f6b1781ac374dd23af6210175ee778f8030250d74ed78c5af5 SHA512 0993e89d137ca7ab06395caa67e97fec462cdbaae4a05ca89f43d6f3d80561cf507ee3704d080f5e5607c6310c7587e853ad5db8d5b4a554bbb0a8e58aa3aca6
+DIST firefox-52.6.0esr-sk.xpi 455820 BLAKE2B 68f045d5290ce18acf81e8d70b6ded2fbc83cbb80dd4906a8bab31c89e4a97ea0b8360b51ca47c49c5a418363246bc6f3fd94ddad6e5c9b287db237cb942f75c SHA512 604bd1bdf31194f675ec3437279a026936588c938b6edf73014060ff3d0dc051ef967f73f2cc58369d0445ea18ea6e03aac8f6bdcd0bea68f9abe5dce57a842d
+DIST firefox-52.6.0esr-sl.xpi 433483 BLAKE2B 15dc5d51360ddfa0eaef7ee7bce1f1ca441d0170f3e74cd88709eedffe746c71115f2b733a45ce295a5db130af3ba90d69356968e9263c3e44c3379e9d1a8ed7 SHA512 9687f31c4831c250b7b099efab215d59c47354a13fae0527af961331766443b401e0d00d87fb7f82143db1f8dd6ccf9515db228360ac572f672ff5f159ef7248
+DIST firefox-52.6.0esr-son.xpi 435128 BLAKE2B 58cc65627e3d8591f3e049e885a8b257ac1a976d56002c4692ab297c741cf47f65b7fb66b8695dc6d84d197b3b2927a4ce6b03965c4e9a06846d087d6fc94371 SHA512 01fb6a1c425475d67444bb2fa0353d457f73cdf7d76bd175dba896fcc7b77bda79a7f393f11f4d4d12b4f492c519842844a5b5087b745df642c672de3cc904c6
+DIST firefox-52.6.0esr-sq.xpi 448156 BLAKE2B 1f9c1b4b03768d4a868f00056072bb71c5b47790b954f624b17793504f3b8b951a5478a0e236d26a582f2f08f286d87e6c9fea443f1295ee3876122370b5db6a SHA512 a373f9c56c9bdfac8594bfa479aed123431bdf2d576b3240a4dd896d8983b3ccf46ac3a9a3304a1396662af9f8065fc5dfdb00f5454abb066adc18eaa7221a39
+DIST firefox-52.6.0esr-sr.xpi 463395 BLAKE2B d613b6b5ad626b03bc6f9a66df06be4cd1974ceec5e1f825a25e610adfdf6d68d3e8cd65ba432949ff4301c30dfbf180ae36717c63f1c4afd4a780363580aeee SHA512 fb29e41f8629fc33988b878d2780e1862807b07d939d8653a698adc15978a47bd54b4439ae75effcf7ff2aa4a9fe2939ceb08bf15f97ca53c3a4108dc2f0fd62
+DIST firefox-52.6.0esr-sv-SE.xpi 441178 BLAKE2B 3ddc887266c39dbd7c6f5576de6b7c2d25d105120d664ac6425916340564aa9ea1765e620490b0f1b45e52ec8de98191a2b09c3a2ca66b2310a923f8c5575816 SHA512 06b21536f74f8cfa95b84d2abc53e19894ed95300d1c0064807ec15fcc7a06ccd9aea5fc7b31d1ce63ba3b462a84c377c30d2ce4566e50fcb1002e3ebc10b592
+DIST firefox-52.6.0esr-ta.xpi 494799 BLAKE2B f19064c103fe868a046a11c8297a896d367e3db9f58a77531a9e85e8d6494388933c4038622faecb341030fbad3eb30bf7893d7746c60800d532f1b191c62954 SHA512 8e9da6fbf4f27f659c11c50d875525517a677748c7e8826bfc008a6c58c87e09be8639420337734c1aa22ce52ce38d2b7a6ace1191fd7ef89006060a386c36e6
+DIST firefox-52.6.0esr-te.xpi 515241 BLAKE2B 57e5f566a4d16638a80e0232c18d6542652659c95a8a184ec2f982bbc692ef0f89fb2bcc7fbbdba0be32636efeeb4e42d873a4fb9edb29953eb7823cbf012bf4 SHA512 cb8f4a552acedd71d48728e0058a6c6583c5371c226e10884268588f7453b61eaaa896fddd569cc5f9fd5d1bbd3f3e6ac90cacfa979ca4f6389435944ba61810
+DIST firefox-52.6.0esr-th.xpi 489379 BLAKE2B 9a4796cd7d2ec2143b23c42fd4dbc900fd4d02108534cd6df22dfcfa41385d9cdbbec04225ccc3d272ca36a275754aeba08b9d30eb88b8e75bc56e3be01929e9 SHA512 e15190ccf4bb9dda177f6a60bfe3e28116aaa60c19ab11b8d37ecba8e52b5efd6ee9165fc2472167bc834a249d668f0f418a5e00be4fa76aece2554f01412f76
+DIST firefox-52.6.0esr-tr.xpi 443674 BLAKE2B f6909ccf40863f1af8270d4dcd44d23539c1ef7eff6bde74bcc3f2b962d097fcdd50920f0a64e90d397802831779f621d92c53687c161b4e2735ba861592a1cf SHA512 74c9e01ebc45f1b7f73d96de6057823017fc828204674c05f87dda5e69545e04f29b26612575f0a10ae97d3976ae3e2b41a4175f99d096d6cac20ce3d420019a
+DIST firefox-52.6.0esr-uk.xpi 495096 BLAKE2B 478164867e46401c39bfe981b25162af0c7304f92b8cb13b6a4bf1707e5de3d9c000c0b096d81820aa277b0b1adada6c892c08e8cc800566c1b3e851d7be4e1e SHA512 4c0af07963689bc685539305ae3417e923c55673e8e540c04f7c988722edf2d35b42c3ce16e5ac2caf4d6f8a70c524526752cfe81b4fd26a0dc73f43445240e8
+DIST firefox-52.6.0esr-uz.xpi 447917 BLAKE2B c0d3da701894ecd92f1409cd9b740421d047419dec7601f5f17b016506485f3f71cd6c981457fd4b3793c939a3ddbd1e8e9fc82b1a22b2889675dbacd9cec35d SHA512 42577eeb175a1dacf1b926267c98ae2d0f71bf500c36d0c2ffef85fef4ea813bb9935c43cd22cdd590591096f0401e84ca7afe11273e93f47c4d13c8a223acf7
+DIST firefox-52.6.0esr-vi.xpi 450805 BLAKE2B 23ec47e0c7fb0e025343afea6af688da2959089471fd388fae3acd5a0a6e6cbaa4d2ea117695917fd71f1c9e779fdb763fdbad437216783b88f6302265c65a1b SHA512 d31fcb15f2f9f86f3254029c19fc80fb7dd52bdf65cb4f499ea169fd1f3cc83cbf396d1cc1066548819fbb76eb4ce405ebbde5738aa8310f7638ab6253f2daa1
+DIST firefox-52.6.0esr-xh.xpi 441173 BLAKE2B 46e1aca430d16508af759a7ca87c66a3f065e881e7bd421934b6b29dffaf0b72b1c76ec947ed3601e5362124b35f26558355d2b991c9c8672a6efc08739c505f SHA512 d6b590fd66cf8317de729a060d98f0ea31ea6fad25eb4374974257a6357c74257384bd23dc17358d86366f2d051f344511c4d00ab872a73dd71a0ce5613e4878
+DIST firefox-52.6.0esr-zh-CN.xpi 461679 BLAKE2B 743cebbd66a6fa81b98acab5f24bb19706c2c483aa66de6b95769d84d0a069d6751a6b0cc0da9211e32f197a5b4fc29dd96ba75f057aa7d51c8059041c87928f SHA512 70c112a99b048dc77d843a39f85b45f0f47822f4eb860f9baf2d61022ab211cc95b76d692e96f768920665c7480400589d6e0b0143abbed8415817bfb9113c1e
+DIST firefox-52.6.0esr-zh-TW.xpi 470063 BLAKE2B baa35635f306bb01b2ca3d149aafa37540a48436dd170e5432ffaf0828b95740e3ca8c38485e1e0b1265d334dbc694d0928d4ecb4000f86d7c6410b7c226d8d1 SHA512 eb29346f308268a4f9010697233fc54d627d102441a854d766b0544552935013be86610b948fce454aff311734e66a848df233f99c51c71f51a83f6ba75e3862
 DIST firefox-57.0.4-ach.xpi 441113 BLAKE2B 10940542eb83a3692ca2b9915192f9b0db28f78de7501688890ca3ca84ba8f26a6cd184f590eb5b796ea5c822d09ffc09b740938982874b63596889f3d4520a0 SHA512 1c269b5a8c98855f025e3d0d1df79803f633c79619b01b37b487888ce1ba96335c3117ed3fa11fe63a90f65e8c56eff142e9a1af1b76d1277ade42cb29d85b73
 DIST firefox-57.0.4-af.xpi 442206 BLAKE2B b05aee23bb88c225d72ebf3d1c4aecbc48216e17ae9a500d11870d04469c63a81a35be579db359d4daf872ce821883719432eb752e884084b14badba73eb70c4 SHA512 a62975f1cec946cb355cb35105cae68af104b70c6848e43bd1f6cd4f69ebe14d40ce349dbbfc3390d9181d0bb3eba12ac0b789cffa80939914f50bc4e72b6111
 DIST firefox-57.0.4-an.xpi 462778 BLAKE2B 969d19d3e81834c84bc2774cbef920dae2abf23548d659a373dfc0a938aba83b4ea72c96f7ccb759528d88217ae8b0aa2b0339a3ea7622dfde3359a4e3b4d655 SHA512 bdf98b67343515c9e0266eb0c6971dd7c2629a2062a76136616dda4933eea91ff71b9c730a42d0d9f6df05c5b9b78d99078e4b2f6e24ec92bfdf8637ad3e4f72
@@ -171,10 +171,97 @@ DIST firefox-57.0.4-vi.xpi 471320 BLAKE2B 1ff981f26985f32597d38d232f19d1b2c6f539
 DIST firefox-57.0.4-xh.xpi 464461 BLAKE2B ae75465ca965ba116999294563697d2b88b9a07734c41e6a1c6e38aa5192c46b1ed109e065ad01053017b8ba1a333bbd116a740afe526246680769e2970fe554 SHA512 cab336c5081974348341db82dbb053719bdc3f2547e8840c9e139afb8ebfefcc596c26ce692612b7d548429624e8a68973ff81fbdfe3a89764bd209957fc2199
 DIST firefox-57.0.4-zh-CN.xpi 483625 BLAKE2B 56f04e4b8a4f2aaebc33522ba422ff23d482f22008e10375455df480ef8e42e0d0d3ac618dcb84c362acaa750fc9f956c58914acef8bec553055632a7fe6d280 SHA512 4031b88d2fba17360abba9cc0cd4c88ca3d98a1a073bc94626c104559c993b3503a138cddb97ca285c6bdd231710dd60abafa8fdfb0e34fcbfaa1a55fd6fe86f
 DIST firefox-57.0.4-zh-TW.xpi 482348 BLAKE2B ca6cb3452682c0f5770660da22a77ec885e371fb6ab37276050d4fb506aac7e1f2c29f3b61e8adc76471e57b1299d565e7f19fb500e28ddf68d4683c8fc0357c SHA512 682316318346cb358dabd038815c94149e80d00d639ce5ede1952ac5b712165a7bc6e2b7ee33a79817915063ce5a02f595f85496e91fc1e172d1286453034f0f
-DIST firefox-bin_i686-52.5.3.tar.bz2 58548296 BLAKE2B b180ab3a316eac6ba74c062d6be3dda09e71bcfd62e00269f267a96c56c5aeb2f762d7e6b3401fff8982623347e28bddf90f8f457e556fa3e896650eafe96a0a SHA512 b1c380c17ed6e93d71eb5370855f2154c37f79e3da9331dd42cd5a3990474c3019a9d8d75c90ffb6698b2abcea73cda9e422374c38c4ad4be3f3651cf4ae2141
+DIST firefox-58.0-ach.xpi 445610 BLAKE2B eb6be1c533fd42d24fa14f3e1e370586a20ee05a1c6b17a83a95a1ea327a32d1925214a087175d3e4d22a289d8af87ecf83ed13598dc5e1966ce352a5f1ef136 SHA512 423f8e8a05f6bf8337c80f3229695281bcafee059b2d4a4b82a5093f6131da2255361da09daa4d03e6b6019cc39b5a25bf5ff591988200ccec25abb238457cf7
+DIST firefox-58.0-af.xpi 445013 BLAKE2B deb4e735c25cf74dc4f263ef2a67678e1e5e6c3155e94b8464ecf5f6d8e566aef488faa081bba057734154ccd5c581bec41e716dca95e910c99e90ff3371baf6 SHA512 2623233497530a2a415231a33c4c397b811d8dfd8449a5029f9555c385c5e807f3fd126c38a20a47903173eecce435a10b2ccd22c673758e0fba6b3cb95452c1
+DIST firefox-58.0-an.xpi 469441 BLAKE2B 70888a84aa9a359982167e6ed7eab01fe80f0d05206c73b7808adb17eba39bc3bc3a7c4ab0663f94310b347754fcaa04e9af656465c1323fa418e2762875c503 SHA512 4f802f2bfd34796ac6d4311a15e751d617844b6b5c32dba325c27e502c6eaca1e538066e1b0c66fd77b83d5e5be14a130aff42170a5fed87fbdaf31f91b12081
+DIST firefox-58.0-ar.xpi 494893 BLAKE2B f5b0a2a16933d6f139c9627178bd123e62c82cfae95b21f0d155d270a33a07f16365281bba80dbf7db54c68ff3b1f13a51dd4b2fb8b192cc8239146fc1931fcc SHA512 6761e9af26649c22740d50d36cf30936898df0ea704c27c379683c086cc4f02392bf467a78e823c31b5d9ccf267e0b4cd511a869cd4626a1e9e61bde56508b8c
+DIST firefox-58.0-as.xpi 492795 BLAKE2B 7eef16952b37ef8884b9a432b6496f2ef5d05e3a760d8109c07e05f8a1ae8f9000e6d5daea1ebb8b6590c56a278456846d1a43d1a4f37c68d02bf8e5a374927b SHA512 52ae415bdb63985104bd52582019e240b8b3820eceb025ac1781cea432a4a117639cbf62fc7d43179088d071d6eed7a886ec45ed0857ef490f6ec74c528d30d9
+DIST firefox-58.0-ast.xpi 462086 BLAKE2B fb5f35f46cdc765e05a7d66688bfc87482687f2c1245175ceee0ba6379714ca50d54a70a3fdeac55669b0d4a74cc381586628439d5a17e0cc9febbd602c07e03 SHA512 fcff491e092a66c1b994a10b25418317197d477cb94d1c7f2cf262f69b8cc04d38247988d2010e0aa2db1ae5a341a32f06b6014de4a1a244bcf21c403555eaf5
+DIST firefox-58.0-az.xpi 470906 BLAKE2B de04e9a0f5cda4e303033256fcc392496c70a5f3e99101cc0ba08391895084ebdf49fc06aa78ca92ededa19cf6bfdcdc45ac66ac1d51033b2100afe687b20ed4 SHA512 c2148c3092ecf6bb17900b1880c00907a461dc8042cfee708179a3ac146c3fe3c8521ada123064f89942a9e96cb10dd6d90bfe54d59a3c0a06f3866d1ae367a0
+DIST firefox-58.0-bg.xpi 517351 BLAKE2B 3c5f66410274686e416987bfddbdb8301f4dd59a9ed4929a7b344e8c36b2c8c6bd3d43841945414ec22e179bd1c3125ed96232902e81164eaf17c7b1229b62fd SHA512 e70e81fac1a796d64763714971f40ef68486a5c54b849512a2ae06725b92c3c5629023b09a68d436999dece2a9eab43f8f8460bd522e82d13493e38cc8833acc
+DIST firefox-58.0-bn-BD.xpi 533457 BLAKE2B 8987807107df6263013544e30249ec58c822bcef02539332e4ed349a3ef00973600a35e011d18a6aba0ec5fac86c806975ba72971eff5afdb3e9d915789b5df4 SHA512 51d19cc42293cec9e4372f4264e974afa3df75bd5d51e4d99bd25568760dfeafef5797685cd659818923c05812d22c04237733ba395d320a308d8a41142901ed
+DIST firefox-58.0-bn-IN.xpi 518928 BLAKE2B da34c59992aa19a02eb11405ca2bedc14e635170f64d256dd4ab79ca7a850a83a662938a39b61dc02a94d315b92bd3d18b84bae3ca08e982ac733111cca61664 SHA512 dc88518bb8d955eb7f0d97d143f5a89c36b89e89c720d6c3ff204ea00f230021504afe54f36d6f7c763e2c239093e9ad186121cff87812fbc9745bfb16637a27
+DIST firefox-58.0-br.xpi 457659 BLAKE2B 115c7dc64c21070ace97d657141b5f2f21f5597ab3c6a2797a7c6313eeba865c6339064ca442e81ac374c8c954d7f5a2bb240a64b8f06d4431a2a58efe755769 SHA512 bebcdf7ed33444ec34e2775726d1d0939d3cf1ce4f3300d7ce438b5c60957f0fcd69e5ee5d57ba4740af2a936511a7805a68963a5d39c973e7e21db897cafd63
+DIST firefox-58.0-bs.xpi 466548 BLAKE2B 22600ab0e26d084f99598cd4fc32389a699a443759646ba333df108bb9aa93fed37647bf682a269b72b870b9502ec1f8e9efef4f60e18af3c8a1f5f402d6a97c SHA512 134768fcea70e467c9fd1ef0b7a5e03f2d4b7bf4ca833372cb4fefee95d7a6b8584f5385ec7824c5f814fb97d873756dd1b5200bbca086e6c9e21d1628fb3c85
+DIST firefox-58.0-ca.xpi 472767 BLAKE2B 58d8ebcc81b74033e0b67f7628e44759627bcf970c3d8169e324c669aa2000aeb180ad5761d4c3bcdb323a5d896d6e79222d1631ffcff7f88ada87c8c403f9dd SHA512 ad62bdb1e5ab0b579069a951b295d7be87e030fbc6bbc91118727fc99416268199bde3cba88f611c7c5ae0603d55f0ba509dc02046ee03012fb4bb10c925a033
+DIST firefox-58.0-cs.xpi 479561 BLAKE2B 6e0b5f708dda4ba3888925b785ef96a389ff9438c145ad736d41616183f36fb40d4a8842f44b4824f54cb3ff669663cb11f12de2ada47fda1efe001626aba9a5 SHA512 31976b0409fb4951679a088142e45816a8f2c2ccb6d163fe6a00d4e3b9e31bc08473c541943ae1be203eaeb6f63a5eb4b146cfc3df4aa29d58a5233fb6181fac
+DIST firefox-58.0-cy.xpi 462228 BLAKE2B 7be8dcf44fa0727bf1986a7338097a7b563648f09f2ecd2897746f9a5bbecd775861af4b2caa6103483790f02c6ce916591512775279aa0cfa806660f327a50f SHA512 be0f1957e4a11fcb311dc6a91908d8121a5403de08cf4a39219b5edc63188210c1e6d5ff21d3b011f5101a0a4f50adb1441b557c12f9fc3bfb446327022c56ff
+DIST firefox-58.0-da.xpi 455554 BLAKE2B 86d45eb863dea5ddb6ff7a5205b7eeda1c7df949bedb983c9d7b797ecde01a66f176ecf4a581b9c12f2ecfb742a8cdce163bcc65fe2b8a85bd2b543d12245dfa SHA512 f8ea34cea0e8226fd178fea044fb0988d1bd827af5724a6a2de136998d33ecf8704bbd1f5a1f12508b10c21efae5ea7bf6867251d0a80b29eb513fefa01aaaa1
+DIST firefox-58.0-de.xpi 467224 BLAKE2B d904c86f96dbdc56f65edf0850104039a8c9bd0b8b24c235c54b501c4c939aae4976cab9215c5d6ee5ee55a19420bf86ed8c870bf1ba96cd4b22feba470fcff4 SHA512 6f1950a8e7ea4b96613920033ab95bad32920d80eb65c588518105a117535a345f95aa51a1193b8772a277c2b9b3659ed6053a26b9cec3a0105583df079821e0
+DIST firefox-58.0-el.xpi 540701 BLAKE2B d9da660153b2be2994d026a4fe2d0abf0e34ab7355d2de3d9036c91bc7f06a739dc48ea3e5bf43c7265c45da1c68b074c4f3e2522d94ed8a87fe786bd0593699 SHA512 ad489667b0563970e20467c1b3208c2691ad914721afa78a50a3038d9d4d1cb0b6518b781cc2d5205a854a4a84bb1b7fbf4919b8e546a51b09f5b615e72a2f4a
+DIST firefox-58.0-en-GB.xpi 443432 BLAKE2B 1c2014da170cd5681c47f32e370df243904e8610f76358c847cc537b3d16e217d44dd3f16815e8ea0765304c63e0bf37ea1ae8f9ae57ca9567c602c8c1353145 SHA512 b8d64110061d76d0df4cb2c86debf8b04bbff48e7b66f6b7c248bf31d112e2fbd1a246d29fe71517a3d67ae66b5bfd07c27f2be482e2cc91acf253ca07958d64
+DIST firefox-58.0-en-ZA.xpi 434818 BLAKE2B 819ef1ca5bd720e486fcba576a7c61c6c2d6f85d798d28c79eb0f585af09b608f5f0a22909a2e3d28dbc3da354fbb9ebd120253917d7203af2dcfc6581bc4ae7 SHA512 dd17620a9b1862d791633e641919ee5749849f22b0ed4767b33cede05494cc9d8472193cdee4144753a22ab761be237b19c6b6e5f785b3ec7ef44b781baf08a3
+DIST firefox-58.0-eo.xpi 461029 BLAKE2B 52248ef8d6315ba7b77eac0e252cb6de9ba5ea208ff4beb216df60e3480ed96043e4ca046c02af6aa4f2ecdc2d43f28f6e0067abf8d0e0d467c2832f5eef026d SHA512 9cd5f5d0a0d45af3cb2981be2727d49476c99a1e5d224675c9878b96d3c0bdf7b40ea8d8e5e7271c735a9c64cab7b596a50fd3b0537258b909e7750fcacaacdb
+DIST firefox-58.0-es-AR.xpi 470707 BLAKE2B 74275677cd2b8040ac2fe5f53bf88e89fad784abdf392632633a24b0726eef7104ba19392b5bfc3a829ead6e5d0fd970fdcfef607f177060748f54705f88550c SHA512 0659fa7e443363ad23fdc81cff0b066495777e093b0e82d143605ebc4118d49d7a4bfab34a57f98b8ed13198e036432dc1b1542390cc9cc335bf0282bc877661
+DIST firefox-58.0-es-CL.xpi 473175 BLAKE2B 0c75a2eb9fe2ef87de1fee7b8d91ffe9fe2bc3bf99285bacbc75b0f706e0492615d6a19164a2686b6e50595178244376e6ee05739f2a7abf08ac7943fee68efd SHA512 090baf4e79fcab234459114cf22366c4ad1af13d94f6b65cd5665a1c4e79d10c6df8dc2053f075f224346fc0e55033359941294c90b57f9678654ad83b0ac568
+DIST firefox-58.0-es-ES.xpi 357313 BLAKE2B a7ec72e86233907ea3ef7346da06c99ad9f4a228bf3ec242d210aca55e06a19fcf7b5e2cd2650e9fc66e37c9abdb5e816dedfeb137b7f63479b8dcda1c96f43c SHA512 b302303fb2246518a082aa0eee71cd46ec68f96c15825406ced33dc4375167faa2929af558386da8b6898f8f2327d2a31703c06aa073a375d7a46e0234a5539d
+DIST firefox-58.0-es-MX.xpi 474513 BLAKE2B d0ee17b1b3a570927f0150a682187d2b07c85e8b4bbd58d79307790d73c737e1dc822bc0c262e8eb2b3844aa222eee122de96e95290ca294746ee8ca58be1682 SHA512 43ac2f0a6852d0e8687712b9d39957aff7664c344b6a89db3aac545d321873663df245b09a0c37cf734c5a32e98677d26641bc36eb44cc825298ade46191dee1
+DIST firefox-58.0-et.xpi 450939 BLAKE2B ffcfe4d46a68d740c64508b20aac96a550dcf1e257185e6a2841a0dd19bdc1ec33be2409ce8ee294e27fd05a0d07101ec82390d16b30411949858662a33d3f35 SHA512 7f71c9c10aeb9d684f52b783895e731b6c3d41b66e8d62255e28693033f7f4d50aa346711abd4b5730e9925896617076f01535a41fac29f166994a57878b3b04
+DIST firefox-58.0-eu.xpi 462882 BLAKE2B 0e92c06430028a8195805f40129983aa2d8f38a2287c63ab3c724c3b62e17c4098e3ea560bba192526dd4ba41ebed176b72854fd312b363a3feda253b4b7f44e SHA512 549b404499a96a0a761273d547b97dc043f9aa85e244b66d43c4c441fcc164c7d58ee4d1dae649c228620207196b117f6df1cb71b5ccefea2333285143564657
+DIST firefox-58.0-fa.xpi 517077 BLAKE2B 693c6e23541b88dca21331790cc11a5642330ad1f5e006ba170f191b46a672be8d2e6fffcc38be4fa04bc2d4ce62df4527ef2074908a7da44904f1bcf3322b1b SHA512 ca5cd9f9db7bda1b21e727f94805b473df11bf806e600a824edb2520ed97f49a7f4042fddb5e651487e4794e185202b2da8f044c6f3e38d5e68a43a85fc09c41
+DIST firefox-58.0-fi.xpi 454069 BLAKE2B f8b2c800640c1a26ec7ad66221c3ca5e99cbe1d9eff87dd00ba853890e11c78aa0832f14ca45aa247363dc5a1d53bf20b8d6205ad6ccb8c2c704f6fb79511cc5 SHA512 ea3f84554d00a9a87e12d11d1bcb2f48651a077017e55d340be55a34854db081199ff70e5571a73bffb1e16ef6e4942e3e24cad366dc2d1e43640c0beb152ef5
+DIST firefox-58.0-fr.xpi 479100 BLAKE2B 5fe89298d70240a6e04ca78165403b0a2dcfd086fb860aefffc9aae8329fc9dd3a73e4de1537b98edabfbec2f889a1616696bcad9c2ff85cea2a3092f2d907c5 SHA512 6053c86795270cd723d8b5dcc75891b30227d2009385adebae77ad4de2897713b75333dfd725381bdbe88bc873bc336620f8b2672fc326737c2cb5ec06957a1d
+DIST firefox-58.0-fy-NL.xpi 472088 BLAKE2B 8ea293f4a85c25457124357b20ee3809c38597f76ddada9ba568166febce5750752ce4a8b95daca8c950967b7e709a9bc4f9ad4320a9318a8480178ae345f515 SHA512 6eb8778ece5b169bb8aad9deff8c065be4e32b1d39a49d00ca954cc0e381525a64a7ba81250fd244e71a93930980371d32d011edf9b21779e381173292205e2c
+DIST firefox-58.0-ga-IE.xpi 479798 BLAKE2B fbfbf3d08fc9f58bb068206039e809aa21c549abf8ed86773cff49e8cdbbf7d2dfa01e7143c2ea8a6c91952a87655c9ad9d8bb3254d35ef1fc88fef61da74885 SHA512 fb859fc43468ef2e950dd7636b0b9169da5e9a317487f25ea5615fcc9bbfb99b8285bd78ac7895002e81aed064ba23db0e668bbc02754b0a400268a0a05937da
+DIST firefox-58.0-gd.xpi 467538 BLAKE2B 6f4b049a6ca87cf67545f9d9b39931d347b7b57afc7cb1971da81efb91638d5f6009d1f55f89ac1dff01970461e284e3266eb7eb4c8df8fd5c20e6b61e4cd6b5 SHA512 b5026657fee1033c052da32dd774a1517676f277a618c16254465bfc98ddd3b87dbd88f9c686635be45c5392305671c6ee86cd60d627be0f7c5aada2d50e0492
+DIST firefox-58.0-gl.xpi 454324 BLAKE2B b3599a56af330ff734607aee1b800b30ad1c0f576bbc4a01d652572a7fa89315fcbee22a240ec5dc8abe378764beea3c702d19ea2e9fefc054d72166f4c6334d SHA512 8b1b7d6832cb782ee58145dd1f7ae13b46aabd862f3637a734eaa24a3e8592028f61ba50bebf010fa7687195f49e943cf492d48f90f17e8c11a804e09a4dc8d4
+DIST firefox-58.0-gu-IN.xpi 523534 BLAKE2B 038863597e22600b1bcde964a229e716cb5768f1bf3a979abdfa06d4900a674bbe0e4b611c7784acc740622c2aa639e688589a595d9fa646fa3be6cc84444439 SHA512 34c0b897a27ad1f3537bc807c36892c4c8993715779b615345a8af49f177247307222ab0041fd1cc2d2c0e1eccd829f6e564a504ece92bf6aa13fafda1160cd5
+DIST firefox-58.0-he.xpi 480618 BLAKE2B d9725c5885847f1df4442ee03aa66a1cbd1f32a2624996ff8690076d05013d29a8ae6ec8eee0b518537e1299c56a3b23579dcd0a2810c182d6b1bb0f5191c806 SHA512 ef860ffdeebb96586aaed3d09db46c4b5ee052a692a2b5f5800b8a0ea9e8469ff5e2043ac6d447b1c4c1f45c0665132860896291aee0f9a51d8e0beab8256196
+DIST firefox-58.0-hi-IN.xpi 532362 BLAKE2B 7ecb5389e53ac9b489ee43269c3959ad2da130c94cd6a4158df4382e563a41300146669b64823258cb7dfa6f0c335ac0cba7c3f03f4b83e922642339380fb74e SHA512 a16adda73fe4dc99ca4275586354b2609005d75a3f0c50d90005618dbb04e1578d67f99b50427b020347e30e53558773819d956f9934d894f6b3c092153e2fce
+DIST firefox-58.0-hr.xpi 467250 BLAKE2B 5a8c4b8cd359238b62604293bbdb34b178c00657422e6af142fcb163f8b488d6c6507859ab1924f1b2dc0d1cc8b3ed36873a33669f2d07b0025aa5877ceb7011 SHA512 fe31242de52f8c231fdf6daa427f7a7050872860af1d81cd0c23437e93821659b436f042e9d924c7c0d70a3706511bee68633df6c4f09daa7d36db6ff6e6edf4
+DIST firefox-58.0-hsb.xpi 483711 BLAKE2B ea25f151c8362cbbbd991268c50a73640e3bb1ef850d363167d25b4c87d54a620961f209bb59285e3b9b64c92bcf5ebe001881ce6f7f934d8449086a87c8442c SHA512 f490ee615d47d74bb1bdd8fa5a88784e1a42c0dd613d4b5095cfab24d5c8eacffab8f2406722547669b6377c9c75474155e5a01d4f4579ea2c8237ec7d753293
+DIST firefox-58.0-hu.xpi 482700 BLAKE2B e4cf7eeb37b4e36a17b6219b5d480709d01fefc95d031c14fe911dfc8d0d403ccf71c5f538d1c5d3edc662229fe81476f6076d8f3941c6c4492359d80fd46896 SHA512 3bf6b7452f5552aba4ca8ab751f3dff4c90a0e764dbd2fd8cb6e89d46de157e6734ddb9001b6795c8f5b464b668b6369f95ab48fc906598c92376a7ca6e1037d
+DIST firefox-58.0-hy-AM.xpi 515593 BLAKE2B c07e23e8dd9a5411c598e6e306ae63d3c50ee7a3b2c58531909e57c76a5dab6ddfd981d19b1fe3741f8da233e07ddb78ea303d74b161942d2d75fad3bfa198d5 SHA512 e4b33a2e680af97e8e9560a8b622f090da441d9c5652800b3e5c4bcd01df49c7e2e423619673c989f349fb01af6ff0e322b55c8d629a0535c8d47e841f13b644
+DIST firefox-58.0-id.xpi 449309 BLAKE2B 35502d8415264ccf13660a0e723ac5b8d749f062f1035f825106506b0ecfccbee40ec4b1545de8ef48c0a045315f5d66d931ad3f9d447a34e3814e162d50478f SHA512 964bd7e5a34c4d16ca69360ef1b3fdb9d7dfc77a21e6f66c72b0394f2791a613ee8d6825cd4fc60ac460e1b3a6ee405f8439868b7fe291ee5607aaa4d7b5f5f3
+DIST firefox-58.0-is.xpi 460731 BLAKE2B 56c2b9dcc39da640927f696dcdbd346a6ee3c2ee82b3e501f72b96fa1d746af42b2f08b8811e39f23e9717c99c7c93ed892d42c09e1c3e114216a7bf031cc4db SHA512 dd6a8fbaf38f55511877001836a8f3ede896417f2ee8377a6038c94886707a597b28c07a85e36d26dacb06c29fdaa39796befbd57e102b144a01f6400ba2a908
+DIST firefox-58.0-it.xpi 350639 BLAKE2B d48783e4eaad3ed23d7642d2d457a5c507bef8bdc2be7d1e71b6e8802fb3438da12ea263ff5ef616e4a95a0859db8f1044380c2ffdd3449210d13181b989e4bb SHA512 43380c45d32323bcbba5794ef89ca88c95659318ae00dc5046931ecb08be4b7cefe3c0d87998735107d2dcbe4af123b250031638a8bdbb4ae232ef00640f9d79
+DIST firefox-58.0-ja.xpi 514623 BLAKE2B d981dc4dfc349f1ca6361a9ad572637dee9dfb63195f0c85dacdee9daa1ac093ac2bbb896da1db8eb6d88b601d921d28bc1677c05e3dc3bff0efad171598984f SHA512 7f28229be8eb2d573e018c4833920a8a5b04cd470b2310567d518d14fec1830616dfa714b1a95ba0bce1f0884ec91b59a51e19265b6d08ef7fb71c9b5d66d7cb
+DIST firefox-58.0-kk.xpi 527150 BLAKE2B ca6a3a5ae5e8d6afafd2c68a40fd8926c7679613d27516f883692885cf376f05feb382bbf2291ba77b9774864733652e3e7bb8c9e61d38d237db949278db1e48 SHA512 9eb16d5dc677b80d6282fc160fe6998c613e9c684c64ddf540ace152471d09660a924bc4b0c27cbf0b9e51f842186d5ca4fa39b90fa3e6d4594a5ed1454f032c
+DIST firefox-58.0-km.xpi 535391 BLAKE2B db6753b6f5b763ffc7c6933e6b2ae77ef4a8b583e659a9bbd51d3097d897e30c8a2cac81bcef125056bdd4da64d9f4fe05b0e1571fe6f88954043e70ad10c9e7 SHA512 f76b253c16b65fd61b628fb3dcd54a1cee33f2fb3950b7d07eb474027cb674ef28e284c820fddcc78b96774b46823752a0bf4fe75bf628d9af2c3ade8c90484b
+DIST firefox-58.0-kn.xpi 537159 BLAKE2B 58d6302c0f41022c26fe5d38792e7e2643e5031c8d901fc006fb6e4c82e2eb5299bf3a210b9f9e6942d3bfd310a1f63a0c906051291180f10dbfcdf2729a5d0d SHA512 e47cc551ae3811fcd1ebabb79efea45c8d1e161bb024cdb49fd757087d664a48f3b4d61d42551c633fa06b74e553e8320e831bebb1badc082423702148bd24c9
+DIST firefox-58.0-ko.xpi 494834 BLAKE2B c08846e2da2e6bf29c3eee10002928a3e478c328b41d157bd56786226734cf89c3b7b7280943c91d6cef9b183f003c0460adea4b5d5c2147000ce3dbf21adfbe SHA512 664ae37b42a633f2b7753391c4f157e68f863166ee08a70b4ada301b83cc655fc06a5529e9a979779587c99d7c46e507f7010cd81db9563245f5bac9b35f2fa2
+DIST firefox-58.0-lt.xpi 482157 BLAKE2B fdbb5cdd6061550537722e4a296a07f17eff57a4a6d520bf5e3de469d3e043d499b8cdd06b857709b7eda5653c6ed7555488478d56e9d75f891315ecbcc62441 SHA512 0e7193be693bf8e99df9cd05f8b011f7665021174a9f3aa5e2e414309af226786a94976e6a206b768b6593497e12374c77d81a7d9d710d070c529cec9e1fb020
+DIST firefox-58.0-lv.xpi 471211 BLAKE2B d1a478b798e7e869f9869891ee369f9e4b1a4af1c26edeb31531e64545abfa6f466e628380203e770a264101232852c38b4cdd5fe317ff021e12a45713d805c2 SHA512 74486961955ec63dd8f196230768465754381a3f208b6532e6649dbf8b1c8209ebd02474e6e61f7e94a513632ca1323c355f5397fbb84f6ffbb4d5650bb03bb2
+DIST firefox-58.0-mai.xpi 509069 BLAKE2B ffb30fe4c6feaaea86f396a764bb2004c9131506f9ca72cf1890df39475a6024a645586a7440136f947af3395e275516e947247c7652a8c9bb0f9dc9e80e0754 SHA512 10ca7fb8aebc9b4211e90eff0169ad353bfceedcf1afb21ef656c3af5c1012c0128da470795180efd902d52b3463e1ae7b46d40ac6e0fdd39010e9d2f21c398c
+DIST firefox-58.0-mk.xpi 492513 BLAKE2B b6ff9b7d5ab73341e025dee62d298f83b9341be582edccb087be39736a54eed1bfef0344a9d4b2125edbd000357e402fbc3c137b0ae962c1e3d459a119e8a7e7 SHA512 a6f72155df3164141175efa5118c3b8fab7db04130afd049ff2a7ec94af4de837546255180d8fba65fc65ddb4a8ae706ab715e9d957bdfc0633cd99663a4460c
+DIST firefox-58.0-ml.xpi 547684 BLAKE2B f47f26701b4badd796d8a19fccda5c57e4d2640e8543d72b80fbb426305da7d67e00052c1dca977ed178354f20491154ecfdde3e4e9c6a3fd73a5adc171f7c64 SHA512 8e8212f063acdc0568008f945bafdd0991c2055fe3d92db5c248ceb8e39a3641b0b6bb8ed76fa99a71c8659ea076a05139d51e12d9b835e23a17bb4682799c3e
+DIST firefox-58.0-mr.xpi 525038 BLAKE2B 8ce63addc126084714e7d43ad7913b1b91e45fdfe973bdc68b986bde50282ae42bc012613553de9083cd3a2859b7719e278c6e811232857fbdcffbe435cb246c SHA512 69ebdeca0b826cdb65004b51f39afe8c4dd6d36d5ebb1e21230f2c537dc49aa8574b44854e2c35988302bd9fb88815a5c0f6b941463f2dc3d3d6ebd151a040fc
+DIST firefox-58.0-ms.xpi 458425 BLAKE2B 248b044155703d3c5d6eb00e04466f84c35010e1de6c849121a9336d991bd1b4aa109beace4cb1d96459bc65907df52404c4f113466742b712e026b008ec5161 SHA512 c31ae547e1548bf9137119d0aed5567c326edb148811667a6753768dac457b13c8de2d94bbf0555e36d1ff924ca23f04d72fffcda3b8aa82ab950fc22bc999fe
+DIST firefox-58.0-nb-NO.xpi 457989 BLAKE2B 1d8e19e4d5191e0bdb2eb4dcb0e24ea66c30479e13c352a11d2d9b841e9a3f7995480c3cb40b8831a8ce5ea8ce32aabae8a61f9eba73faeed87ddba650c30547 SHA512 97d483b6ca38b3bc562d3686259dd371e197afb65b4da9e4ac75f76fa064f39fc7e6dbb4365b7794514b98dddffc78789ad0e8d6fbf4274fcb38a7736a16be1b
+DIST firefox-58.0-nl.xpi 465557 BLAKE2B 32849eb114767284b9ab9a92c4be3cc6ec8b4affd1aaa90570c0b60405bd2b50a7d83afb08658838df1549575e880011e5917d80d0a6fe2b256450a1751ffc72 SHA512 f460a7eeb6ee12e0b2295124743e5e2b6d640fd45f2059611d7bc0c6f4b2a2aa9b0f834fe779c6ad48e6adeb8b9e202c5f044e916aa9c47aa740572001ce4ccb
+DIST firefox-58.0-nn-NO.xpi 458437 BLAKE2B 2b2116e0f10932bef85b938df6cc64d60b50d20393f3846cfde6184ced4a8552741ffe42bf3285a9250c85a51a1bea4297f79a49b64452803cfaf28927239d3e SHA512 7280bbeea871060beff687f1aaef0cdecd580aee31e20cd940ba31b7435703e5bd7cc5dc5c388b9c24b8524d23fb1111d8e8f605ec5fe7b76aa6ebeecde25765
+DIST firefox-58.0-or.xpi 502794 BLAKE2B d21f129dc24988d8217b0fd099e092e4dcf9e9d6d3f9f2bd8137bbf41e73e2b2752360198b987d3ce4a7f426f3187b65029ab0e974f2ff2fc19f043f6972e0c5 SHA512 ce655189eb82c3d069198f62ae27c2d069ffd744f86176e0a277e6f4f436f2b56bfe1c616bfd4f583947fc0c286cfcbca57f7c91537df2e5f2444cbb68777560
+DIST firefox-58.0-pa-IN.xpi 500540 BLAKE2B fffcb3065a620293c9c07353eda1cd2e8d141e0b78c2651f69b16d0586d8007c6f87c3042d27f9e718ac5ff7adeb428fa9f917b28e11b64ccaa8e05b59365c9e SHA512 44a2afa33b1d6f8ce31d60fc7ccf05db5d82da6106fb3c6c378a15841801b86d81ba89cde7bfc84312865cc1933529b4116363cc1e967b82d7c30a9985314391
+DIST firefox-58.0-pl.xpi 365868 BLAKE2B 98e2e6d75ff30735108e1b5f0d6e44dc03cb58ac0138917a24787faefaaf126690de3d254d7ee86f9c40981ff4cefcbd42bd631c29756792d16a6ae0a7df0b68 SHA512 e60235d342bf8abf09d7c22608668db5f4987dfa3ecac84443204f0cedbe80b82870f6d32a623cabde2dae194366519ae1f56a327e54ccd328d2c5add9106d64
+DIST firefox-58.0-pt-BR.xpi 463581 BLAKE2B 5ef60803268b78e0bea69a7c5799c7f480d0ce4288a81862e6a5cfdf75a8026941f1d710cb174293ae727918310949175c99f512f2e07bd6a1623469d6cc31a2 SHA512 df64cd8f7c18757cd8df9ba2ff86408e17ab1afa72d73b0a757d936b5738461f268dbb90afe1a2e02af2c81a0225f71ff709d8ee0823668e8866538ce0663ea8
+DIST firefox-58.0-pt-PT.xpi 466900 BLAKE2B 37b69120b941512631d59c411f2ad820db686d955a8b9ba18d40436bea86e78aae2a8dc73b6a25bba09772be057c1d263f9dd02d2beaf0a56ea2261c49265afb SHA512 4149884abd4f852b14f3d3271ed1e2330f53c17b7c697da7cdd18f3aaeefe3ba3d36a7ec44188cfa515c4e08f692b66c977bcc6e4c38fb096154947b13d342be
+DIST firefox-58.0-rm.xpi 458781 BLAKE2B 832111e68fb17bf0cdc2ba8fc4f4aa9820bdf12cb8acabbb4719f9637bd53a94b9673dd8b89fd9a982c7d6d634e5792fc36258df64813c46ec620f0b7d920bbb SHA512 0a471978dc37a066789b21c29386647cb24770f0aa1b33f007dc6818a0c1013b70c321ca893bb3424bda04041f4d281127a961aaa718993f8ec8c50e706ef6a5
+DIST firefox-58.0-ro.xpi 462429 BLAKE2B 8578d212bf1e88661d91564dd1ffa429b1c381c7bad6df9cf669be3efd2abc0c9e144a415fb3ed2b7269ab26a20b81fc28e262fd8fc7228c51377a047fc4ec26 SHA512 01e8f87dc91954189de917209ee3525d4334d1ed0d2d1b16c8cb70f984b581986033fde73bcb937cb62026a64c81ddee60366e2eaead0da1e1cd2d0a7be6f943
+DIST firefox-58.0-ru.xpi 535052 BLAKE2B 6314f1fdbd8d9ac75d84feeaa637aab87bcb4be18bca33ca7af809b585d0b7c6f3ac7e159f6e439fdb9de4aa411bad84c6a7f02a557c822c753886f5ec2bf929 SHA512 54c71b73216f99287340a76c618aa0e97d6776d9aa092c32dd496d1ea450dbf349c3b2642bb75afdd12c76f6e6e7e021b3b69cd0aa520ffc3bff4cdff6bd87a3
+DIST firefox-58.0-si.xpi 500876 BLAKE2B fedc1c41826dd881f3c5c8f5fb65eeebecb1e38b7c2d2f64275ce5ce48700ec3f248c40976ff58a5ae9c2d6b83d4edee5dc5192bda39458b07749308c41843ae SHA512 37cfea06f576e6640e0fa0bb3ae5147e95327e8d2039dea648fd557e1282f545eabf084c3c7c3efc7e16b06025b6a5babfd988f389bf5b3f416a301b530ac83a
+DIST firefox-58.0-sk.xpi 487581 BLAKE2B 96ec85cf67992a6c25718ac183ace61674af1a6bb8be9b9157c1d86ca00f92ed32df0a533b18a489b2dd8a1dc606679f41c58e115d2253413f81152d76a4f6c8 SHA512 6e1f0a75823a7be754873a998af4c0bf4228e2ba22961b6c79a65e77f7f459b0945329322d37013fd878aee159c4fc8c34f7de35e307337e0979833523fd8898
+DIST firefox-58.0-sl.xpi 463913 BLAKE2B 59566bd6d8ca5da920343a804497758de4b159a4c327979d3ab2242ad6341380c22d4af5a95f42deead4eded21c9c3c12e7d6e7ab13799641b97a7692e1f0a83 SHA512 e3fbdc72e2569a8b0dab5a46d2e2b25a74a13fc73cd319b374712eb36e7507b09f8568d3fa55236d7f9ef4d3376ec83a5351f584bcd16b833cd0435901cf2e85
+DIST firefox-58.0-son.xpi 453958 BLAKE2B c21d2d6dd63bd99fcbffb1a4ea9726fb7317efaf713a5aa38c6cb14290f5a4024ba2726821d89549a8d3ccc754d0f729003710c2738585627e9281454d55e681 SHA512 c1c40918d99a154871d29fe03330dbd1e4c5abce6f137adf2ef23081aeeae86c34e709b79f26e46d2fdc08594b016db17fd2da0f4265d8837b2006d3161ee7aa
+DIST firefox-58.0-sq.xpi 472462 BLAKE2B 3ef23bbcbd0301a6ed0f9da8ac8ad4dd1d89e9462472cebb00d3f8bd72a90d2e610218b7b5917d0c60e86e5187caf41ae3eb36c2bd965aa5c72551d1110d4867 SHA512 145ad0789a21684d00ab6536bdfa11b80683c6be9faa895c5f00ae0984ff11c7ecc9161c8672ecbc8ee7d0a514371dfc665104a1a29e8cc10072f96565cb506a
+DIST firefox-58.0-sr.xpi 493459 BLAKE2B ab9e2d0e00e16a2bbb04fd9e0897bc2a491c44f4798763fdfc80e945a961d351080810019554831364108715666b17160e1231f4e9e2762f45b5c3b5fb6fad8c SHA512 323cbbd4257457eb83950fa9d9e4f7ae0330f0f000ba72985456ce753ab55ab5a69167c84c42e373b05f36f2f2f8e28f87801bd4d8911f556a0bdcb5e08a77b3
+DIST firefox-58.0-sv-SE.xpi 466361 BLAKE2B 1b7addf6b43148c3c4ecc8a5da68bbf59ffe72f4712be53a4510c45ee8c009c08ef561e4f3536dba33b67e5b99e82cc737b493083f98fe2921c6a4106e849315 SHA512 fe5f8e9a4a249fe8b4e5db200a4faf8155484b96fb915b7e16ab6faba2d23f887b86cb47fd33a013933832d584479d4a0404d32632ae9d7a667cf11b61130e7c
+DIST firefox-58.0-ta.xpi 519413 BLAKE2B 9d91a6a58a14d303bbfecded3818ce50043060f995f47ec9966b9a9f71a0f41f1df38d73c8111d070b6791bbad16b411c4d395bff8349691ac6b010681ae1ec8 SHA512 1efebf83673388e7bec1a8bb226476c0875cbc72bbe1b0959a5097648c848e3a2efc7fb2d941579cb56528af404da07d2b156aa031146b3ba636e848f25db851
+DIST firefox-58.0-te.xpi 535339 BLAKE2B 29d1075f434a24b8fd8cc0897e560d9cf4eb8aca8263f7f3f4a5e32c3491ab1938ad075e775770b8bbd831ddea99f85e7a567eaa390989eef2165ac376c00f8a SHA512 d139842dcd9eb89d199958a3ba208d58db53871b17830b3179d1184fda173e23978bf98588f34adcb2224a9af36cb6e8fc992015b46e33bdb22bd5bfe2d9a4b2
+DIST firefox-58.0-th.xpi 506269 BLAKE2B 04016ab94f477fbac91eba8739a3c5a405008dc9f1e21dc1da4b277bbb0e3e34ac86d02092b8fa24b68f3df0094c876c3ae4b450cabbf6829c7a7f88d4a61369 SHA512 35ade817893f372b3099a1c1dfc6045e9787e8de37357f92756f36182bdf355b8cf47074adf2ff75c8d95a1655b618379c27dbb8af36a5e366f53233e77ecb57
+DIST firefox-58.0-tr.xpi 471864 BLAKE2B b327d3323f5cb8fccfc8cd00e3ec4b990bd5614821c8289487568e0d527957b9f3eb5ef095b8a186fdb06a64276f01cdcf65816f8bde72ecf2fbb69591943474 SHA512 d0ed836526e46c47714d2ef9882b737c0ce9e5aac8a49943341b85a1d565690f292e6dd87e35f7c6de30b75b27fe742297dda29d6ef10511a4af08754c11d53a
+DIST firefox-58.0-uk.xpi 525888 BLAKE2B ba15241b882651af8dada987e9e1a023472769c53e7bf93371f78174525eb97c40092f0693fd7e177d855e6e288f3fad858ee3de9457eb285f5a8146e60a3cc4 SHA512 0533d7f680d6e4c332407254cc3d9c40b624e333f804c699eb54b4f2bcae91e919748d85e7bbce40e9c276cc1563424a146682c87ecb46fb7c14e949472d421d
+DIST firefox-58.0-uz.xpi 464526 BLAKE2B ee32c235e22a2f1bf54d48fa1daf68527a0138d974a7f389438625e3d741c2af1ec2c442dd5e335c7788aa7afd4d3eddd7dd9d8860def314ae7d210fe7e5026e SHA512 e2db7e26fb59052b95b9175bdd117b1f29cca189a0c40e2b270a629fec93858a912ef12171d48a68019b693d1a2a9cd0a2b85f4f1318852b89d8c6436e8fed17
+DIST firefox-58.0-vi.xpi 476700 BLAKE2B 1bf643b5c9d9687971d9569cde258e8a85295e5ddf04d9a64f67ee8e2a183919d37728e8a9d365ec5df19198ca70057f67344cc825347e9371ce8b567409b0e7 SHA512 69f4d740e8a14ee5dc86b7dee980cf3cc19b15ab7c55b1234b6b7a5aa1db5570e34407cb5feb7e81b8870b9ad3e75c3ce738c435e428a90d20863b07b183e58f
+DIST firefox-58.0-xh.xpi 467878 BLAKE2B 32673d3d7c15dc006d6a18ae3cc8adb4324c31aa3192a17e50be177c6d696c296ca897d367beb2a57a65ba5e902703f1f210e31010e354ef5e6cdf3b35833bc0 SHA512 3d16bf97a6ed50f0b37367ef8490c8103a97d70d2e0bc92912ae4810da8bafd7882e6c62c2a7a9a37b3b513e09e124fb50672a8555af5dc1fdd3702fdc20a492
+DIST firefox-58.0-zh-CN.xpi 490104 BLAKE2B 7719b6a49afc11b441bf6146ddeb0d6ddc396d0b70cd1a0c9b4422f877c72920a9ddae7b752630253265065605a204dd1b6c74194f6675eee6177b602599556f SHA512 3f4cbf5963c3ccd9657ed6fcb9208f67538e85547f9ae5746b55bfce52ab21c16f5671093a0fa56e31c0e214750e3f85d9c106407af31441acb000f25f69f08a
+DIST firefox-58.0-zh-TW.xpi 488337 BLAKE2B 31d475bbb1b8290d2ef620028c4afbe67f272b4ab7b89949013965823c5c973e7eeef338f0c41ed19acb01070c4de4d51587cee16e06086d780f7dbdd3ba1b94 SHA512 167fae9efededee9cc1a94c77f74a6f91a831d1664dc2e0c5d7d0ee119281ca6793ce697a8db0b708e4b9086eeb78eb5766cddc59a140c7d00899820b3497db2
+DIST firefox-bin_i686-52.6.0.tar.bz2 58553286 BLAKE2B db96273b33488253bb6d8b99a76c47bf6bf368e0d0137a5ce418f7a4aea0e7f19845e9455a8e60dff56cf748f0338b5f98c7198c5015ae65f9c3fdde343d725a SHA512 10faf01156edad031579fbce29bcdc1b9a54761fdff9d828aa6396b0d24be8c4b2ddc2d009a5fa8be0b4f867848b113a1a36707738b8a4117a5dc8c66ba4a38b
 DIST firefox-bin_i686-57.0.4.tar.bz2 56148134 BLAKE2B 6614feccc0dee2c6eeb8798572a1351e05b8b4efed644828df9d7230e42fcad4db957690ba6492338197210f950ef73b6a58f5173b1ff8ed19f7ec4c8ac96dbc SHA512 b641a671d7390c505577fa956bc1452f58f6cc8418b3ccaf25eb8b5bb08799a3a2e1e7113525ad720f710d7022b18901c5234be1a1c372881e4908d2ae419743
-DIST firefox-bin_x86_64-52.5.3.tar.bz2 57692607 BLAKE2B 46e0d6d4a5afe7a0f722b3b620bc28295d51ea074b8410d0d1cef72e22955c9d45b0819350e3f4a6cb1343be9a798a62f0b7a709c2be27fd88c53ee9ac62211f SHA512 00d5c8cb8e937991ca46e5cd5119baed9e5ded451870bbbad54639a61d0ae501fc7c3c6c1fc73d3e6ec657045a0094fc766b852f4184f031d7a8e617b1615667
+DIST firefox-bin_i686-58.0.tar.bz2 56147230 BLAKE2B ec188b319797a6f4027c1aadcbf3d18344abe08e2af4c4d98846ba3b8167b46d9849c6f4b96daf3611aea0119fea29aaafd6a031e5dfd455e4d9aaa926562197 SHA512 c291f87696212c59624a87530a02b881243b5c7645b3a75aabea574161c488ffe71392d00d18827ab9e4533f272eb44e57d062cfa88a5d14e0eaaad4011b344f
+DIST firefox-bin_x86_64-52.6.0.tar.bz2 57694140 BLAKE2B 395461fe4b609a16919f9bd2392690932aa8bd026a64c08f3af7247cc517075f4b4e941b3cb8f96087489ff3fb8dd79e3f0bb9257f4bf8c3a125d5a46adbf493 SHA512 b521611ace3731aea3e1cc7abb74f01a4885f5325da359a25a6a295316541c4e1e4cb7cf1be104cbb199acc15d57eeb8a37e2e8adf4e53f7ddf284f9d81a047f
 DIST firefox-bin_x86_64-57.0.4.tar.bz2 53631485 BLAKE2B 9f712bf9f12c9becd44d085529282251b4faee594e3d1a50871d29e7231702d5ed9e95db595dab7e5423e0a1c365f45e2f5af7e92e5b1ee78d2aa86597febc5a SHA512 c6e9841fa901f78593d5bd60c3c4616e9a8dff696a5b812bcc4fed52287fe7db6c7bfef85a7433f08b3b940de6418aaf1c7c90dde6cff1cc6c7e0efe439e0ddd
-EBUILD firefox-bin-52.5.3-r1.ebuild 5456 BLAKE2B 371f2196fee516a329793967a61fdba45e33e7a8dea2d05228ea0af1c494e214295ce89d3a6eb10e2fc96c94a69868bacb13622b05b625ca6db3d04e1fd6a2b5 SHA512 c8e1d4e26a86784cbde5d12ea4a1c7f52eda797e54cc3b1be2d77b4dc7dc44f111702dc2a1be997b119b587d4f1d93d1d7957ace2d9d375270e0de0fa1b9e08c
+DIST firefox-bin_x86_64-58.0.tar.bz2 54189435 BLAKE2B 2f9d5aeda50f690acbb7ab022f107048e3b23cc0c83ec67a5a558855055e8194037d7c1eeb3c24b9171800fc960733191070924d567da8d72f481a0a00ff45af SHA512 df0f86d1169256f73e68594177388afba5aba4d57260ac6b0b1cc1b61a15725ad7ea5a6210c3a60dbd290f8ad3333792353dcc4d3d23ada6bff8c366f75735f8
+EBUILD firefox-bin-52.6.0.ebuild 5456 BLAKE2B 371f2196fee516a329793967a61fdba45e33e7a8dea2d05228ea0af1c494e214295ce89d3a6eb10e2fc96c94a69868bacb13622b05b625ca6db3d04e1fd6a2b5 SHA512 c8e1d4e26a86784cbde5d12ea4a1c7f52eda797e54cc3b1be2d77b4dc7dc44f111702dc2a1be997b119b587d4f1d93d1d7957ace2d9d375270e0de0fa1b9e08c
 EBUILD firefox-bin-57.0.4-r1.ebuild 5470 BLAKE2B 8fb38b37aaf80ec3dc7c40365c7469ae968842f0e1280d7549baa9b576944871a9870667104342043054cf1f8ce30991e0634a69c9b9886f1000ca7d64e1f9b7 SHA512 12c9df8408ce66dba5d95df76ec73fe813d8f4f9697f6b36c1aa969a39bb710aa027909cacb40a224c1da0573636579e2bed2199bbd5cd0e1021ac375f114680
+EBUILD firefox-bin-58.0.ebuild 5470 BLAKE2B 8fb38b37aaf80ec3dc7c40365c7469ae968842f0e1280d7549baa9b576944871a9870667104342043054cf1f8ce30991e0634a69c9b9886f1000ca7d64e1f9b7 SHA512 12c9df8408ce66dba5d95df76ec73fe813d8f4f9697f6b36c1aa969a39bb710aa027909cacb40a224c1da0573636579e2bed2199bbd5cd0e1021ac375f114680
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild b/www-client/firefox-bin/firefox-bin-52.6.0.ebuild
index fe974f2962aa..fe974f2962aa 100644
--- a/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-52.6.0.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-58.0.ebuild b/www-client/firefox-bin/firefox-bin-58.0.ebuild
new file mode 100644
index 000000000000..e3d638ecc9df
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-58.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto /usr/share/icons/hicolor/128x128/apps
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 70636ff50b97..7cc360274064 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -281,6 +281,98 @@ DIST firefox-52.5.2esr-xh.xpi 441172 BLAKE2B 53ab56a77a2754337866d344aeca0fb7af1
 DIST firefox-52.5.2esr-zh-CN.xpi 461694 BLAKE2B 63c39764c2ad138dba0849bc9a0183090d3821c7b322df270e1c09f1697457cba492cb65df1d128b496b43aeea87c9d416ee46c9487a5af251066bed980a9310 SHA512 3954d6f11292bace3a45657dbe41ded286ca942697cbaf631c4e858a90912d664ae047276c4209d6d7caa386234667d2f6a826e74ae8d0ff42eed52a7e02c6b0
 DIST firefox-52.5.2esr-zh-TW.xpi 472534 BLAKE2B 5ef9625facf35d4e220c0b2272c25786a21b0ee36ec2fb62f260168401979df50a90e41fb2e85ad963b426f08b27d52540f0eae4484a67b94a59d0a966ff76b8 SHA512 c64c65b31aa2e4f3534d394183e0dfa96672721f0d8e070daa142263fccdf71236b6a2ab7e45b88cc49b96bb46165cf6c36aaa981ee23385c19be54f2537fdfb
 DIST firefox-52.5.2esr.source.tar.xz 214094820 BLAKE2B f9eb9b5aa333d16639a59e6b36a4adef276d84b807868c671a464cb16060e275bdf7b0b45e1c72bc71930c71455fcfbff590df0f97ca3a97dfb651c3fefa0722 SHA512 bbc7dcc4cb392f06fe2e963a3b6372efcfbbcc1ca7218a3ef05885285fe00c9e87e0f8d307bd9363668327eb43542c0600443bd9e6744de64494b96dd00efa5a
+DIST firefox-52.6.0esr-ach.xpi 427641 BLAKE2B ffa9599ec6019da8c8abf85a8b649e8e6f848827eca4d49923f1224d4c8c06716f51b9e06fa55e46d610528dda657e4bcf756d92b6bbcdf1c755ebe47b7e6cc6 SHA512 82686b3f39fa4969058b317917a02051088e08ec49ff87a607e339f699d6e5362a303ff2ba306edcf033e0325dda08748dd1938d26dce248722f1fa1cddf5e87
+DIST firefox-52.6.0esr-af.xpi 436824 BLAKE2B 916ce2424f2edd130beabcae3c25286c416bdeee33ddee6a58ed33b79954cde64155d3b9d8975738aff01b47cafe452e867daabe5760acd3335278b253a05def SHA512 834bc8deb874dcd67d5ee91d265d465d6cfa4e0db50a98b944220a8c060b3d4e09e7d61b98c03f6011b7d2cc4c7a08b7aea252c406cc416d25f4c4bf05822554
+DIST firefox-52.6.0esr-an.xpi 445142 BLAKE2B 770c04cb61bc060ee4414acbab8b86416668980ed91368922b9faf828067eb3704c5ba7ed57b5622171d8c4c565bf5398811cbeb7feecb00b54ebbad1e2ba8d4 SHA512 e4e314e73df570534e615eeeeea8d07162ddceca71b212ecbd96fde1eeeca8ffae106065a57a1ab4b36b5738b726f619c71d3d7cf6d37a0d8d579d558106d952
+DIST firefox-52.6.0esr-ar.xpi 473382 BLAKE2B 3f460e3bb0f377a58068534fb4a66c8555777d689c12203ff567e678a872ee1332d22d12b1bddaa325c7d3beb510a0df6e2f966b925b79bd744666b21af95da7 SHA512 247afab58bda0e2c5991d353ca2ec3864533dadbf854d339939e448efc8d6be8c24e1e9b6eb37a9d95f27d19c06750d529ccb86c202f75c5bd09696503f27a27
+DIST firefox-52.6.0esr-as.xpi 486889 BLAKE2B e38602d1f044ca324b58ef01725c3228df4abee485a7e0055d79cd82712bbb1e1649b2ee9e3ca6324602fdd8205163a1280f2d7d5eca5bde2a84501024ac9940 SHA512 a2122a1e8f23c56ce08ce150b162806a953c99a866b02903b388717e4dd4d242da6da2091e6d9860fba73524b75803d165152afd18866d1cbdcbba682950a8a3
+DIST firefox-52.6.0esr-ast.xpi 440034 BLAKE2B 6543493184b77fd4bde8ade9ef5b471b7e299eb5b9a4a20e3a737fcdd19b1c5edc6d088234439c69ef47011dc99a092057fa5fc8adef52e7b9ad562b332b9b88 SHA512 fdf83931e59bbc11dbec11de83bc8ac96bd6108bdd8b709eb27e1b108659b577ca72a5e97ed1254f4cb33025b1d4794bf30571acb1ae680ed5973c8e1f6415aa
+DIST firefox-52.6.0esr-az.xpi 454923 BLAKE2B 556b0de26b3805582ef6bcdede4fcd972d543620f3183af13f13be98c4832af92e7565c97f2a0f20190f994f4a067409269fb1ec2926552ffb3dff0ca44229c8 SHA512 cf13abae631203793ac4eaf0fb045ddd03b407f3cf7261ba032abe38bb03460d1747cd090e9f7c9db844b6d9e551415037265070cd1eda993aa14c729bcddc30
+DIST firefox-52.6.0esr-bg.xpi 487892 BLAKE2B 9418123e01fa98552195466c23043ee2e46038c64275357975017e60e04c1cbbef220bd5ff0c1828cf9678b911fbb2c94e6abb1552ed86f34f866290a3b37d62 SHA512 3cd3a24dce51b18588aeda0e36fd87000c287a2408c07a31a39830115cc672fc27fcd3d88c994ad85ab0f6cc3dbd7f47e4060a97b0fb44d9d6e48c27c3f80d9a
+DIST firefox-52.6.0esr-bn-BD.xpi 511995 BLAKE2B 8d04003c9290d06a9cfd36cde63c934f3d234776b65fa21127a3c44c1737250a9ce7f70d7ec468608f0115b5d20e7db3b9f405c7b0ec30ba806b840eae6f3c29 SHA512 9f46f47ad47b710f74372bed06aa892fca5eb3cc9dd30423c95a99ea3c033f274276cf7fd3c21193985c12a58a2f02d3f4046bcbb56af41283fa83d6ecc0ccd2
+DIST firefox-52.6.0esr-bn-IN.xpi 509376 BLAKE2B 239b3a74fbc44cc914175f347afb43fc0acea07b2d2bd818c222a53ff94937d3eca5ecafae13777d797a2db77146e1eb801a851c95c68b8b34e8fe9a6d5bda32 SHA512 720c17d3f66f025dec948ea047e8b6ee928ae602b1e9845ba6d46d611fd67929d63dce111545bd52a8381a197996cd7cf900360cd8b13ebcba330dde4c9d14ae
+DIST firefox-52.6.0esr-br.xpi 435483 BLAKE2B 6160786b6acfc8102c71f9f067cd9425554523d522ab511ae8db5fc71299f0e0a376b5f57413b4033f8419e2891440ba303abf6255bea2898c36dbc61d817d91 SHA512 42957248d394e00a0f32f84378f2afe1f82134e67e4758d16d42b325ccfe0811c8e609ea932d840b6831e3bfb781b6412414b62fcb557f74e113653c7e208781
+DIST firefox-52.6.0esr-bs.xpi 441782 BLAKE2B d25bc9b9f539cd41a6fcb439eb10d86f9a4703cf489f8aac6bd1d571c4dd8e2bd12c31f9df3d0e30c01b13be4bc3490277577bc6ae61618c7ee5168876b309d5 SHA512 53c9ab12995d15ea03c9a53c8ed911c503676161eab59aa9afbc2b83e5653e2db7cb66c79a1f61130ac58ca8b66c7a583a3ccb2e55a1660c4dd62723b1eb5e0b
+DIST firefox-52.6.0esr-ca.xpi 443304 BLAKE2B 46bcd1113b2d614b8b406d9e03cd0426ab01e429944dc0f9b7fe6ce67722a034fd00943c856df2ff0976ae37fb5f6e5e370838b2ac9024b0b107fddb076a46b5 SHA512 a53975e6f6fa3ab72ba757505b0073eea5263dbd47e5b02b8fdd919c86bf8cc2cc27e692c12ff27e959501e56558676447c7493ca5202dbb979be5c023a53b03
+DIST firefox-52.6.0esr-cak.xpi 459184 BLAKE2B 2458db6af61858c407c528d7a7bea7589703dd44b1dcee0c84b879268a45b3f65e6f944c984b2087d0f161f444d9af5ef1bf621df10afbf40450fd21e55127f8 SHA512 fdce97cc4a5762e6b5bf57db199cd84e0361ee69d364431bfe3e88229fefa7f563f583bb1f48622ea2176d9b62b72c750b4c4ff5e9ae8255563068167f4e254d
+DIST firefox-52.6.0esr-cs.xpi 444075 BLAKE2B 123563df18527779002ccd5a78ce744792a1a24b5797e167d653920d3b07a378b0f9273559b2b8096a23a7a6c5d0842f8b933140372465cafc6d8843820d8ed3 SHA512 51159330488174bdfd86fbec58001834508107a34279c70552abf4c8b4d10001fb93a8ec982829b304135a4a6992804b4e2bf4928d00f616711bd7a79d7d3a15
+DIST firefox-52.6.0esr-cy.xpi 436583 BLAKE2B f81acd29f07ce8422fcf703643731a569a05cf4d89db9b801959eff3c6937c99820ec55731bdad0730ba01e04849ccde90624c3dd920b73ba31adecf7167ec75 SHA512 73d3de2e601d2e340dac44bb63274b35df889cdea0dc28f808a2cccc4c545516d2f77fb94beda69b9090e9c0d7da9ef91e6198114bb1fd14e2a1fe9984b2d160
+DIST firefox-52.6.0esr-da.xpi 424394 BLAKE2B cb3385ecef4834bdbe764390df5cfbb915451904fe663b378980791978ca9fdcb718f5cb62951e8c94f117686f2dcb67245b6dc10eb67880ff169507fd16adfd SHA512 81bf8d491a601f8714eecff4d99cdbc292f5b1bd1466b124bf0248e2d4041dcc2ff139326364971f932df631c1b6041d93d952a08f78f0ed9ce2925186f7ffca
+DIST firefox-52.6.0esr-de.xpi 442479 BLAKE2B 5fdc755b537410fc9cf320d317e9f025282a275f5f10efa53c247b942e3bf57ae6d476ab926654e90cda236ef997be17ee1a7b8cd5149846d391c589a908bc0b SHA512 5516b95498091c14323f2b2011e7a772a29afb9382d2738dbadf599fe473677b38b23489e5105de7d8ce068ab0bfc80e7572c53c6264f42e3d8cd15956a6d4a5
+DIST firefox-52.6.0esr-dsb.xpi 459425 BLAKE2B 0e857d39d06ed8614abfb98cf979384431c4e5cb259014ad2ee900f31be49fc966b1c913de27f13af7400207720a59d300845a8e91fa08be011023d1405463af SHA512 5b0312b9ad769ea578cb7d2de8dc7246195447c7f99308eb1945026a510b98637c144592b11c41801d0c99a478f508485b8d30f451a125f67b74ae7b3a617561
+DIST firefox-52.6.0esr-el.xpi 516593 BLAKE2B 49130b1dba0a87740ec6d165368e5f5290033b081f04c5a5ce71a91b3e85a41a39f4b265eec55184eef2b37d1d75af3b43ade5972cd583b8ebe8c314f632ce98 SHA512 b1af201b65b35f733583b942d72cdc116192e94f269fea4076ce964d047e3a77a486dfe6567ce667931f358e7fcb017902ed40c859f07da4b2986d6119ee6ff3
+DIST firefox-52.6.0esr-en-GB.xpi 419324 BLAKE2B 7c102a0579891bb05752dfcde78eeee475d4ca815d4fa82142832b22c96a0989b50f97e90d93659e280ac3a8fd8c0017853c0aa967a77751fea63118428ea4f2 SHA512 5ac7a905e2071712e8a9cfcf19f5bb8ce67e3042ffb430c8cd60bb28880a91195cb4982f0faeacdf90ce610eeff12ecf9e1004b5c3aa063f95d29f2a2af085e3
+DIST firefox-52.6.0esr-en-ZA.xpi 412212 BLAKE2B 33829ad6623cab6865a091d5fed6b863c1ae5843f3d4aa1b678bea6cbffac65d05148aa3c28fad84293ffe9bec70ba6560a4341dc7f53162fe6d4c68171f15af SHA512 9692f10c0ff47dc197b327d9469077352e0fadfe4149b715a35fdef8f96b58d7e3943d0912336498227ab11a0190cfe773e25309a2235eddd20d7fb6e11a4b86
+DIST firefox-52.6.0esr-eo.xpi 437474 BLAKE2B e586958cd8af52a5d9ae6eb0f54da8b842ddf459d3920ec60506ac4eb2d1560861d9880fcee3130156658fc69f52232e4dd535d5baa4cff38e271d1acbc18c3e SHA512 57f1de291714df7746220e14c8f770f67d01ce518dade38bbc746fcc97467880ee5e003e24a78e553b4e597c12e5b17f2137a9ce655cccb140ca8a9e46171418
+DIST firefox-52.6.0esr-es-AR.xpi 445926 BLAKE2B 7869c2df9f7ffaa037196589676033a96d2372d506530c2da0674cfe139b7323119dbf37c6e7f4451bef70f1bb5cb14b8d63a8b106ddb1fd528bd2e9ba735f0a SHA512 994532528f171e0a8c76f1ce1a16b534d3e3c2ab55c834ffc5cf20cf592c0f2dee43bddd127f9f5cbb729ab9f6a373b724dc4377123137186bd090522cbbd421
+DIST firefox-52.6.0esr-es-CL.xpi 445676 BLAKE2B 9a6be5cd1781d8e38ebf97003d074071daec06ba57e30ab481dfa9be71ce01b7ad5527cfaf0993927259e362e05cc450d21edfaa645e0578984f491ddd501450 SHA512 f5fa920f2d4dd90bff34be44df78f23291820231506a0e947a7fdc7020fb6cb99e938800fc6c805d57e3937a5d1ccb1abf29f37cd2ad42352cd57e2a9d27ec50
+DIST firefox-52.6.0esr-es-ES.xpi 344876 BLAKE2B 5e868bcca8711717cb740cc920bedd5c41e5285d87d8ff7ec326bf58eeb73ee7eac4562251707b42b0283bca115a28fe713ee4243d0bc1ac2704da0cd8cf1a2f SHA512 09edb992d6874887d7ac602ec468c4a083348dd1be83d4ac2aa8c70fa96d51b9d0408adf567ba1c435f2ae2e113ce37fe58ae6416739b545a9fa5e92589b1cb4
+DIST firefox-52.6.0esr-es-MX.xpi 448385 BLAKE2B ac8fbe46dfb11e8d069a6c12c12a2e899558d58f9c0647d4a36f0bc163d12a052b177c46ba053ebec154f869b8917c2c5abb4b9795a8b978350e6a1ec44a6bd1 SHA512 2e692a386fd2aa999b7f93c35ed050d350f90773dd9cc0cd7d4b3e4b6939b191772a2a784d823420638957843cca5e88235d9bb3889a273f44878c343fe458dc
+DIST firefox-52.6.0esr-et.xpi 425113 BLAKE2B 4f79a770084790696a3d8df78775a258151eba9d1530d4d37a88d9ea7b1b49a82517a533cd1bbde760f4599d2a86c8ec9c17f3e0993baaa075b853b9c9195850 SHA512 9e3be03563c7d37f6d119ce15f6d1f646b62a39d3b4a296d89c38382549a209f1a2fb00d4e889ebb182e7354f928882ddc0e3c600d6e713b4b46e8bc19c4a25e
+DIST firefox-52.6.0esr-eu.xpi 438479 BLAKE2B 552dd08dfd2d87f0b24e0d08a9d4957b4c0c8f81b529772400cc7276e3baa1db4e1f15191aaeb63abcd55b6f732f9d381699be9be5c18db21e8fd3a662338479 SHA512 8ebc2213cd5df551cbff78f7556e247ef241234137881677105562e487457e1fb7178121c00f928a738ef461817ff7beebfaf0331caa349a976a6ab352c8b529
+DIST firefox-52.6.0esr-fa.xpi 491344 BLAKE2B 029e2537186977db8547b5df7db36aeb44aec32c62f30166305f738f5d91f04555e7fe0f588a1d63e06361d2d2f0f2b0939f18979fd44114a592732d25e87199 SHA512 8fcd0a5a3a28325109ed091f6774f0dc544d4dba84d38dd2adcca5a244f91d58fdba81ab2c27d26311a3e21d7a7d302b72baef6e2eaa9a13588ebd3e3a798aed
+DIST firefox-52.6.0esr-ff.xpi 440928 BLAKE2B 69df0e5a5d78d770152d89f5e85df9a970d8518e83ce8d59d4783e7017edb20010cd86b5e5d81b6c465c2a7985ca6b25e5cf30f1cde9d0dec8faecb4867df668 SHA512 d016786c5f335e82c6e8d49f7fda3680136c96a69ae0c8b1e49a99badb7b0de2a802477d3f0746f76de1ef007024ceaf906912db503d338f5c7e19cab0b26c66
+DIST firefox-52.6.0esr-fi.xpi 430061 BLAKE2B 4fc30f36fdb424afc8fff4e5c18d032c5f9922545e866f5a628ca42e722bf450a17c540580cfd31a61dfe2159187b76428276f632d769429ee86cb625b5819f1 SHA512 0bbb46abd343959f75ef3c41ec42fa8652d41fcbea46b336ed790d83b4ea788bfafcac9681b2542599de44215f6fdfac348f2ae9b629c050479f88e6b4c28291
+DIST firefox-52.6.0esr-fr.xpi 450211 BLAKE2B 7a9fdc85aba49d697d13d686272cf9e62769939fcb572bd66a8a8e595f858a77a448d57ff38e9d81f5db50338543dc37a7fa246de027b0be60c5fdfa517ddaa0 SHA512 cee4a09ea9684dd13e2e9bf54dace3a1a5f2ea94997bbdd1ad35a9717fff370ace200d57b078f7af9b2b62f107bcc161bcaaac27b387187631ceac12d398a929
+DIST firefox-52.6.0esr-fy-NL.xpi 444971 BLAKE2B 177c6364a9e5d45c13460905373023b6c5b477e07579b223a9da6262239b8c8d17fc415aa5f0f65e98433a7e50cd402725f1444492e44b8806200f6766c87507 SHA512 a7aae0dd77cf568c8e05b64cf689b0893e0e465f37711925845a58766e969369137fd9489df5acb504cb1ef26e3aeec0ccaae2b542665e9f8c5f31d285efa6dd
+DIST firefox-52.6.0esr-ga-IE.xpi 458165 BLAKE2B 55857c4780fe82c2de82754deb2115764a914344eb44c041eef3b9c13e28fd944c7ee08eb0619e070a342bffb32623576bd92f74530e5fd29ff7f6d985ccaf35 SHA512 094ed54635b19f57928dcdde7a54e7d60d24391ec906fed497e83451f6e38a7fbb70d5a850ed3267960ad1d158c356a6f13881d7966dee8d7052c3787a3849ab
+DIST firefox-52.6.0esr-gd.xpi 447268 BLAKE2B c920d98d755f9ea5c56fafea332cab36b28a3ef2371cc2de8db38d2d55c2d9d0cedaa2363832a2049a5ba0dd8f3c22f11a2cc0dcaaa7c8188e8ae2e6a1384f67 SHA512 6dc4b2fd3bfe4411709d94138dd1c274f4418a8fd3d9acf34188fd4d49a192dc3d0b641dff6af0a90e35c42b165189dc23f0d1ce19db1e25e802d1e10159f50a
+DIST firefox-52.6.0esr-gl.xpi 447295 BLAKE2B 30409485e8e8505157c643bdd48781baa7e00c1acc38cae2e1a913aff54b36a7f5748c587ddb088d37e029716f5689d402f632e7af9c3495b9443f3b31e6bcd0 SHA512 1152515d529233cab5d1daeaff0990ed079ac558a04267b00e6796896b083f07bf4744a83df5d4fe4f8ed64437c05c7d6f5b1165c1f1b1ee00780cb1f4ef8617
+DIST firefox-52.6.0esr-gn.xpi 456214 BLAKE2B 9e4ece5c62c979e015b7f3a7acb2ac70da37626cf3b0e4bd48799dbef0fb0ccdb0a80931db93e14799724cd26fef41501e533e3d8a712bfc3d67ab6cb36c206c SHA512 d1e34b5128085365fd04d8413d2ad5e1bbfbb0b220145b58258f8b805db33ba83d08f769b22de33e61786d1e1b1e07b1a05987033c030bdf274df620af770177
+DIST firefox-52.6.0esr-gu-IN.xpi 489366 BLAKE2B 70df24561543493ab90b1047b5cd04e36aff23ed1d6522b530b73baf744bc686019a5c2ccdc80941081e810635f4ab546991500fceffd5ccc1cfcf2b974eed10 SHA512 39ee56f9c8e4bb98acb7ca84f820120bfdfb0668bccbb643b00981284fac63118a2be292e4c36dc2a9ef0bc409e8f4ec96f5d2b5499da7c3fc6c7a6a2c491ac3
+DIST firefox-52.6.0esr-he.xpi 455282 BLAKE2B e01ec8850e11a74e55247c1a2987ebf0d66df6922df95f46d64906907152987ac8d4bfe07e3f022c66c245d2fe4459f406d052bcd6eaf363ab17f62c5858d512 SHA512 d8cc9aa1eb81934c388c035e8ce0b9c86c75f6a2d647b46ebb2f3c158253d341748eddd08533cb4e3b7782bf60d9a49552d346de28f758e3413c67e793120e86
+DIST firefox-52.6.0esr-hi-IN.xpi 506519 BLAKE2B 620caa21ec4fbad2fcb1b4843e114a7b0af47c201d0d330722f0700251ef0ca9a04a7781e873760420b5c9fd0b11adaf4f85a20dbb5f0942b1d2f64dc89c9f49 SHA512 ecad6c85a0159ef62c4e9364b741b8549f2ffe1b850264df9df0fdd5fa6294fb243c29144442f30311515fc0a5a45770f218eaea4796e50857a25ce8d8ee53e5
+DIST firefox-52.6.0esr-hr.xpi 447503 BLAKE2B 6e01baf942c10233496bafd1f268272d1ddd1eb341595e994b10ecf1fabe8ebaaf7273f2b1a66363f28c2dcd9a5ec9f01190ad7fc30094b84c3f6813cf405aad SHA512 10c7963b53d507cce28ab81fe29dda4db691fe65e830b136e84642d59074950c4ca9a0aab55b6656e48feea8764cfd224134f2eb5d2815f4daf5b103a16c1f5e
+DIST firefox-52.6.0esr-hsb.xpi 457259 BLAKE2B 59ece05eb88a67462567bb1aab4aca0b14fff112ddce786dc645d8bde78cbcd070ee7518ab13c929a929d886844084b27a603240724a0fd58ebc246e9dcd3a18 SHA512 a71a1ecee1ebc7532e9dc33fcae48796e461f4b553ba1534f07e2afe3868f21632e2557d827af003478c160f97b9afdcf49e3b057af8ec904a96195ac08ff104
+DIST firefox-52.6.0esr-hu.xpi 451497 BLAKE2B abea166dd39c162641d58e4d40529991e0b4071fa54b1f8a8f9b755ce3d380b2f461713a82cd74ee0332913a4af79362097362f21051baf3a592d1b3ef8e1d5c SHA512 d5dd8374c864e569aa9006a34d180142c453922378b5309bc99e17946f67a3644fec74ff0c41c9569897e592974f832cdd349e5e2e91881e032cec3bc0582c85
+DIST firefox-52.6.0esr-hy-AM.xpi 495774 BLAKE2B ce74029af00c98aa00debb04c627a6e800c9e67126b2bdf32653569d6e507060aa73c00d980c7df3d427f509c0708f6812548b622dcd13240689fe792a14a5ae SHA512 5001f4d451d3928efce180e6c2f9b0aca682d4823025eb6eb48e48a3d64a927131bf432b0d5628ef528c5dd684fd65b02e3a67cb4633d893914d941684c7dad4
+DIST firefox-52.6.0esr-id.xpi 426023 BLAKE2B f75842b5b255fd33f88db79f8378dc853abb4fd0abc2e6e4d11a13ca4a822b8d0e4490829a8a4b93aabb8d2aa6a80437ebd7d17d3ca2718d1c287da28584ea1e SHA512 9ad3bfa5502aebcf633f7592a41139a691e53ee518af0b2fd20b478d36c0c8cce55c51418356366e329696d8fd73f5262d4b559fd251791e3329c06dcf3db1cb
+DIST firefox-52.6.0esr-is.xpi 442694 BLAKE2B 220f9ad847fc81f68ed10ddcfba1158319b191c540b8ca31de5af495578fc548065de00caccf57bd28899b1593adddfd2f01840cf656e89a5668eb9ff8a189e6 SHA512 ea249a4e5c43e3f247e26e7cfbb0c6ebf859310015161537001c9b4d4c9084f4beec6670ead2c37d5f8ed26f3556dd3a714369423deaa9f8459de821a8f483ba
+DIST firefox-52.6.0esr-it.xpi 339221 BLAKE2B da9a9db4d35e3fff3342009b7d8b85ed8609d1151ea50010835e80329c47bb3aacb6f02b63814d9c987ae35a7d8213904a7ae714ece374cb1468459f6daaf730 SHA512 7b302cc938ab48978307c8cd6cb79401472410de8567f6154a9098af9923072898aa72440d11a99d3b1d869fea98af0585c755bfd0628ed5946f97ab76e6a287
+DIST firefox-52.6.0esr-ja.xpi 488343 BLAKE2B 3032f0cfe45e236577a13db6c36d4f801489121b0a75334e772d357e995dcf306bba38d9e9eee417715b6a4a6c97af94f9fdf3f9e9f4bbd6efc65a740c8b8f94 SHA512 e628518f75745049fb4f3e61002f6fc881bed861e69a938f7f9df71faaccac9c3424335cc4557e95a3ceef75d7401d782956b622e8ce8ae7d634c4c8ac9bb889
+DIST firefox-52.6.0esr-ka.xpi 475375 BLAKE2B ea20841fd296ee9fe6ab1211b53ce4dd540a0505f06bdacfb19101cf4f04c7c6f0329a82e946be56e6bf41e69774065e6d857ec8d3d9c275edf7207f983e0b08 SHA512 02e039c73ddfa0728a43e0645ba5ee72c34aa6c4c2ddabb7f86b5403fef06f09230cdb510acdebaea6f284d6fea3d62e39455d116a5305927733f4f11dca389e
+DIST firefox-52.6.0esr-kab.xpi 444520 BLAKE2B 969e6843d3157ae6e9dff578a380806355d38b13dd97e94df84c72371fa80b3efed8855d743edc8327059230cc54a49a84c4205fcf637e09699e25c08fcb53a5 SHA512 4e230f69a9d2596c45f924917325e1f0ce173436f894a3a20687c7d8e51edd66035d36122814e679cebb3d231225b58e8a5b95d504b457dac4a2835eace21e12
+DIST firefox-52.6.0esr-kk.xpi 496940 BLAKE2B f24951422b735cc0ba9c14d38312d1d3dc7f7fc9a71b140b8c7a5ff90fff8ef23827d722eed41adc8d010f7d60cbeeb9e0d125652acb3e24677c693d0afe9a7f SHA512 1eff53098cc4136c5927e9d5e1ff7e095794330b74de3f152e644c598c6e04c88f3180764a35353e33ee3524c22e33dc861a035c3ab058c3a2840380cb19aeed
+DIST firefox-52.6.0esr-km.xpi 520344 BLAKE2B 063f8c9d25b2041785878dd27923264f6972cfebda31d79998820da8991147a7c3e73cd494b20026a30413b2d587bfb59c38148544cf6b5efa68b322457f2db3 SHA512 1d2fc6f4084f69f48b15b631f0a98c43fa5c91fea2954c7fea4124e0943c9b6187e2f51c3c0b49d79f796283bfa81bd57c089088280f5574ddce281d4cb68c5d
+DIST firefox-52.6.0esr-kn.xpi 519456 BLAKE2B 884acfe3b65d3073d9a6edd2dad676bfb0e5f9a163a29092eba85a12125d6eb953e5dda1891692524124b0eebbf9ca4dbe558ee64fbde451b4c3b328f8148505 SHA512 c4b2abce72e1f511aa37e4623165512fafe1238787f75f4dfda5ca4f0be447868ab7608e996df78d84a3959e2ddddc2266edc9e157a06da5261f90d57eab9fc3
+DIST firefox-52.6.0esr-ko.xpi 463630 BLAKE2B 94ae991e13552671b79f6644cf84f4e1aea5b148137dd31aa40f924387b055b7bc69561952a80dad90cec63862ffc6b80336ef7470cbe6dec6a1d9450dd8da74 SHA512 388ddbef8fdb210c1560be8ec5aaba3dc96d531dc02101c541c1e5dd9f7c5ab3f9d249f3021d632f9840ba8ba730a65db361e2ae40e6c0f7b0c736daef466818
+DIST firefox-52.6.0esr-lij.xpi 421071 BLAKE2B d7f140eb4d90e7be2c6fed894bbc1508055f7f0c79ad8ce6b7e6f25a911e31caecb0866c290af0d9b8bbe4758b40e26d885432a152397daffaed6f178fde143a SHA512 b22edf67a6c6a53db0d14bbace7dde8ced59cf607c8388a5b9669cc915e3e28e52ecf2a447a7b9032bd3fea5275c9a4d2a61015365cc907be8088bf038415ee0
+DIST firefox-52.6.0esr-lt.xpi 452236 BLAKE2B 8bd3f415486f4d61f71be6d7b96833563f1585dd2e27fb739ba0999ce8a2e487033118d2c46ab5614665d2dca0c35dd87738e03d0b343e3d72b69303632ebd3f SHA512 00fdc87df3187ec1b118266bbee6132b1c8c50ef88a19e3c6d9016d5a49940537d5088dfce915a5d98e6bc02616bafe8fa7114fab167c9cc4efb0b263bb2399d
+DIST firefox-52.6.0esr-lv.xpi 448451 BLAKE2B 7d0d8064e8e88b2365b5b9e22744a6952be718f9165cd6ae31ed0f9b19c7228b5219a903163311c35839724f21e0b75c86599e4deff551b1e25233574dc82a58 SHA512 5c0fa4d2b2c0f75b25e8ed577b70b98fbdc7e21d31904ad3402de421bc924fcc5d65b0f560f3820bf2986a674fb5303d4081eddeea746c062675d393c25f38a1
+DIST firefox-52.6.0esr-mai.xpi 499841 BLAKE2B 21feb64e5667175ca626a7b5fb2d97c23821ac7c1d5b352f6077a4014e95e31a9034700047f8784d454bf54268f5bf13a7fcf04ad0fb7a9aae87f43c7d356e0e SHA512 64181879df16ddba4cdbcc5e806de0c18466b8fe6fc77f0abdb5a39b23eadbb85f91ad3e56ca48cf85ebffacffcbe28091ab846987ea9188acb01d29fdfda0c0
+DIST firefox-52.6.0esr-mk.xpi 496200 BLAKE2B 536ec0617ac509c7a61ce307739ad3a5a4a05f97c45b9197d067c848a6e24a91bcc86a6b87d0fca85d5f4a5ec63e26b0a45f6c7a2a7ae28320fd4dc059570207 SHA512 f0d7a2542db3d875ee29408fcadf2fa677cd19b523d7d8e24364b85faf03511d0c44f87bd00c82845c4e789ca75349b7b63673c8a296c4afcf273b1a53be2d6b
+DIST firefox-52.6.0esr-ml.xpi 516487 BLAKE2B 173783a4250225fd93647c3410ca5d56331a4f74099ad9d089cf0ab384ed7c4c05e704fa4bcfb182321d514d2005ea0eb56d9f841463b5ea4d5a1d426ae6eb7b SHA512 f57cc14eee4c197dbe71b8bf48d77e48f5785c1cb91cd82781b5c841b94c4e25b6357719fbaad3019f91118da255acb8b840453d127cfb36028564acbac263d1
+DIST firefox-52.6.0esr-mr.xpi 502431 BLAKE2B addecb8e3f6835eeaf91b18bb9e441fb207f0ddf5133fa98216bdc178dcc2f566d6c2b72c93af867037598ce18d5c6eebfa176218d55a7626f7d12bd346287cc SHA512 21beb02322054510e7398c0dc7aeca4deff96fe50b47429582d9c649df695a220d9b13bf158640db575a3b58b6bf7ecb4034f299b7af4e17e42cac8663a9d6e9
+DIST firefox-52.6.0esr-ms.xpi 435991 BLAKE2B f990e1d9458ddcd414c7ece8b78b39c5a0692e72dacee9705b64ff4bb409baffaaa1dffe195b1bfc307faa5fb9872c6a8063c01562b6ca51e11f3d00e312853c SHA512 c2515f1d20086f3f14422a95c86da98adfed6565115bab1bae8b5be485db59494101dc229e65f3f9e60cd3766ba6184e832442da20ad221159f2332db7ed7627
+DIST firefox-52.6.0esr-nb-NO.xpi 434412 BLAKE2B 8a5b1b05f97b017427cb9465ec9c3c3c0994f9f5a1fcd65b00264e6f4c28e1fac23d36cfff51dd88f8991344deb3c7cd7be72fac8b7936664eb059c709406875 SHA512 edb7d0464ce197eb4e7e042378ad51a89191c42c3a83738a9fa15523ee906328be08f986b213203961b7605112d98b1c220b12ef89bf0aa5007991bde974e972
+DIST firefox-52.6.0esr-nl.xpi 432008 BLAKE2B 8ae0537679c76c9cde7e49b3b89d69a3cbc65241327668f946bce0e92f718b7bdc7371c6c32ddd6805e7892cf95c9e1168f1b4666612c7788db5168fad6d80f4 SHA512 50489762dd8b120bf000d7e91310d1c453f66f60c21bf090fa6f28586e32cca7238cddd9f3d52e025ae4a101550a2648ce793153492a1c5ed2dd682566be95e4
+DIST firefox-52.6.0esr-nn-NO.xpi 428645 BLAKE2B 2ec44fc883163c572e07ac8427d3a57517b78939fbea1617e789c4102154048d07b73c5d8197abfb4ed282db9acb8b0c31210379bb532f688b386a7e66bc3c83 SHA512 9a1c40ad2ce9b0f2ae55eb0be9daa187b8fd1538e8262d99a493501f185ff3cd410d85b870b11c99e3b547e22caf547d202b115b418bf718f95f1fd99532ff25
+DIST firefox-52.6.0esr-or.xpi 496918 BLAKE2B 960f7a64ebe6ba0f428139350b865652d4f0956846608283375d32903c7a307e33d5a905eabf476bcc7a0bd1f4e8e8256141888b2f989f76dee8585025d2773f SHA512 a5c3aa33fc25e42381e603c66b04a44cab6537d00dcea22e3d482ebfd4b3abefdaf022acc7175513751697b9d323760ea530fdd094d18c563281761c16025fd3
+DIST firefox-52.6.0esr-pa-IN.xpi 476588 BLAKE2B a82f343841a5ba3826da9889e73804a863bb828f73ad117e341143da4d6cafa70f455dbd54b04cc13482b1dba188034ffd41bb66743ca5b22755c31b46e82760 SHA512 cd04eabec8c1cccaf68a6094e04ef48c8197beb13f0dba521f460abf2269b1e1e87f176cc98cfb2e9b15a1d86751c7552327fb0d3f7492bd060b82cdead13c37
+DIST firefox-52.6.0esr-pl.xpi 352852 BLAKE2B 218e2fd4a46d01c97e9d3239766c2de75e4f91fc930b4c56e79b073e06e1b5f4975c0c94f0b3b04384f9116e79ecf084ba78bfbaaa4ebd3658f76a283a0f4c15 SHA512 b779ce4234215a60d765a5a28008296f7b04a439727e4377b33eb595ccf5832d61cf1f5097355a844ac2f5b271627772d1ef2fc9a63b60cfac3abd7e85d67c30
+DIST firefox-52.6.0esr-pt-BR.xpi 438170 BLAKE2B f2d47aeedebb57603990376a45c8fdc3ae395fc73a1af6132dcb6f4cba1050bd32f2b32615e5cd56252cacef42df59291fe83a796bb2a592410f0f654b8b7ab4 SHA512 c4c00c37bc1e403e81acc60b9bacc8cb49c62fd860b396e23d7fae15646d58b79e1a4ef64a7d33ed696dc97c7baa5d915d97d92f637441918e10477e588aa495
+DIST firefox-52.6.0esr-pt-PT.xpi 436727 BLAKE2B 45453849c222f7b818b726ac4de8ad53c6a873199003c2c1b5dde63cb9c39381701a358f72f3ffb5af0fcd93996f532dc57928ea3be7c0b6b88e517339bfb79b SHA512 2362766575c02a0d56109d099fe2b7e324d37fd3f9b7ac05b8f0c843b7046aa9927eb127e1ca67833d75045c195b506d86706e2ffad366d5111f013b6044343b
+DIST firefox-52.6.0esr-rm.xpi 434608 BLAKE2B e74c3a4bf2fd6e1e4f54f1e3c5fb8a56859955ebcd938ffa18df2ea007f1f2f563a89b7b93224222d4c3e9c348ea2125b71c02c2a161a73e8015b88551f68ef2 SHA512 a0841377d40310b88ca349774ac96c0f5810be941ecd81634d9fc0800f493ac80c38fc2252c7c7924c7b049877481ad90646ac179dc842fa5ed8e81effd43934
+DIST firefox-52.6.0esr-ro.xpi 449938 BLAKE2B 6ab865f3cc4439f3689c47facf09c6fb938342db0cdfc7105573224d2e6469691e67d4ce08b75a6c5d2f94bc6978ce5e5e68f197a41de61d69fc8b928c97eaab SHA512 870cb64bed40ee1acdb75cd018040f32d22dc148a2e04fab14017b519dd19b2b5124ba044b29098f815b122aa6d6bd1d31aed63c71fc78163367994ff3b15cd5
+DIST firefox-52.6.0esr-ru.xpi 395364 BLAKE2B 080011c36d02c0bd4509da966bcc460afb510a4ae7a5194fee1d03d80e54af1ea947803c7f96ec8021e30603dc9a0479626ab8973f5ab83ff6df5d2b78abdd70 SHA512 44c08bc658c5caf7ebe49c3adc6d55846e9a0848dffc41ae5d02a4b5e07ba095d2a135f87ccb912a887c413ba2b74d308d6b736edc2bd8432011f02721cdf6bf
+DIST firefox-52.6.0esr-si.xpi 491959 BLAKE2B 8bfe69b6e20d50591873c285538dc58a603cd926eb8eb1365fdc802148dc1c415c4292cff7a705f6b1781ac374dd23af6210175ee778f8030250d74ed78c5af5 SHA512 0993e89d137ca7ab06395caa67e97fec462cdbaae4a05ca89f43d6f3d80561cf507ee3704d080f5e5607c6310c7587e853ad5db8d5b4a554bbb0a8e58aa3aca6
+DIST firefox-52.6.0esr-sk.xpi 455820 BLAKE2B 68f045d5290ce18acf81e8d70b6ded2fbc83cbb80dd4906a8bab31c89e4a97ea0b8360b51ca47c49c5a418363246bc6f3fd94ddad6e5c9b287db237cb942f75c SHA512 604bd1bdf31194f675ec3437279a026936588c938b6edf73014060ff3d0dc051ef967f73f2cc58369d0445ea18ea6e03aac8f6bdcd0bea68f9abe5dce57a842d
+DIST firefox-52.6.0esr-sl.xpi 433483 BLAKE2B 15dc5d51360ddfa0eaef7ee7bce1f1ca441d0170f3e74cd88709eedffe746c71115f2b733a45ce295a5db130af3ba90d69356968e9263c3e44c3379e9d1a8ed7 SHA512 9687f31c4831c250b7b099efab215d59c47354a13fae0527af961331766443b401e0d00d87fb7f82143db1f8dd6ccf9515db228360ac572f672ff5f159ef7248
+DIST firefox-52.6.0esr-son.xpi 435128 BLAKE2B 58cc65627e3d8591f3e049e885a8b257ac1a976d56002c4692ab297c741cf47f65b7fb66b8695dc6d84d197b3b2927a4ce6b03965c4e9a06846d087d6fc94371 SHA512 01fb6a1c425475d67444bb2fa0353d457f73cdf7d76bd175dba896fcc7b77bda79a7f393f11f4d4d12b4f492c519842844a5b5087b745df642c672de3cc904c6
+DIST firefox-52.6.0esr-sq.xpi 448156 BLAKE2B 1f9c1b4b03768d4a868f00056072bb71c5b47790b954f624b17793504f3b8b951a5478a0e236d26a582f2f08f286d87e6c9fea443f1295ee3876122370b5db6a SHA512 a373f9c56c9bdfac8594bfa479aed123431bdf2d576b3240a4dd896d8983b3ccf46ac3a9a3304a1396662af9f8065fc5dfdb00f5454abb066adc18eaa7221a39
+DIST firefox-52.6.0esr-sr.xpi 463395 BLAKE2B d613b6b5ad626b03bc6f9a66df06be4cd1974ceec5e1f825a25e610adfdf6d68d3e8cd65ba432949ff4301c30dfbf180ae36717c63f1c4afd4a780363580aeee SHA512 fb29e41f8629fc33988b878d2780e1862807b07d939d8653a698adc15978a47bd54b4439ae75effcf7ff2aa4a9fe2939ceb08bf15f97ca53c3a4108dc2f0fd62
+DIST firefox-52.6.0esr-sv-SE.xpi 441178 BLAKE2B 3ddc887266c39dbd7c6f5576de6b7c2d25d105120d664ac6425916340564aa9ea1765e620490b0f1b45e52ec8de98191a2b09c3a2ca66b2310a923f8c5575816 SHA512 06b21536f74f8cfa95b84d2abc53e19894ed95300d1c0064807ec15fcc7a06ccd9aea5fc7b31d1ce63ba3b462a84c377c30d2ce4566e50fcb1002e3ebc10b592
+DIST firefox-52.6.0esr-ta.xpi 494799 BLAKE2B f19064c103fe868a046a11c8297a896d367e3db9f58a77531a9e85e8d6494388933c4038622faecb341030fbad3eb30bf7893d7746c60800d532f1b191c62954 SHA512 8e9da6fbf4f27f659c11c50d875525517a677748c7e8826bfc008a6c58c87e09be8639420337734c1aa22ce52ce38d2b7a6ace1191fd7ef89006060a386c36e6
+DIST firefox-52.6.0esr-te.xpi 515241 BLAKE2B 57e5f566a4d16638a80e0232c18d6542652659c95a8a184ec2f982bbc692ef0f89fb2bcc7fbbdba0be32636efeeb4e42d873a4fb9edb29953eb7823cbf012bf4 SHA512 cb8f4a552acedd71d48728e0058a6c6583c5371c226e10884268588f7453b61eaaa896fddd569cc5f9fd5d1bbd3f3e6ac90cacfa979ca4f6389435944ba61810
+DIST firefox-52.6.0esr-th.xpi 489379 BLAKE2B 9a4796cd7d2ec2143b23c42fd4dbc900fd4d02108534cd6df22dfcfa41385d9cdbbec04225ccc3d272ca36a275754aeba08b9d30eb88b8e75bc56e3be01929e9 SHA512 e15190ccf4bb9dda177f6a60bfe3e28116aaa60c19ab11b8d37ecba8e52b5efd6ee9165fc2472167bc834a249d668f0f418a5e00be4fa76aece2554f01412f76
+DIST firefox-52.6.0esr-tr.xpi 443674 BLAKE2B f6909ccf40863f1af8270d4dcd44d23539c1ef7eff6bde74bcc3f2b962d097fcdd50920f0a64e90d397802831779f621d92c53687c161b4e2735ba861592a1cf SHA512 74c9e01ebc45f1b7f73d96de6057823017fc828204674c05f87dda5e69545e04f29b26612575f0a10ae97d3976ae3e2b41a4175f99d096d6cac20ce3d420019a
+DIST firefox-52.6.0esr-uk.xpi 495096 BLAKE2B 478164867e46401c39bfe981b25162af0c7304f92b8cb13b6a4bf1707e5de3d9c000c0b096d81820aa277b0b1adada6c892c08e8cc800566c1b3e851d7be4e1e SHA512 4c0af07963689bc685539305ae3417e923c55673e8e540c04f7c988722edf2d35b42c3ce16e5ac2caf4d6f8a70c524526752cfe81b4fd26a0dc73f43445240e8
+DIST firefox-52.6.0esr-uz.xpi 447917 BLAKE2B c0d3da701894ecd92f1409cd9b740421d047419dec7601f5f17b016506485f3f71cd6c981457fd4b3793c939a3ddbd1e8e9fc82b1a22b2889675dbacd9cec35d SHA512 42577eeb175a1dacf1b926267c98ae2d0f71bf500c36d0c2ffef85fef4ea813bb9935c43cd22cdd590591096f0401e84ca7afe11273e93f47c4d13c8a223acf7
+DIST firefox-52.6.0esr-vi.xpi 450805 BLAKE2B 23ec47e0c7fb0e025343afea6af688da2959089471fd388fae3acd5a0a6e6cbaa4d2ea117695917fd71f1c9e779fdb763fdbad437216783b88f6302265c65a1b SHA512 d31fcb15f2f9f86f3254029c19fc80fb7dd52bdf65cb4f499ea169fd1f3cc83cbf396d1cc1066548819fbb76eb4ce405ebbde5738aa8310f7638ab6253f2daa1
+DIST firefox-52.6.0esr-xh.xpi 441173 BLAKE2B 46e1aca430d16508af759a7ca87c66a3f065e881e7bd421934b6b29dffaf0b72b1c76ec947ed3601e5362124b35f26558355d2b991c9c8672a6efc08739c505f SHA512 d6b590fd66cf8317de729a060d98f0ea31ea6fad25eb4374974257a6357c74257384bd23dc17358d86366f2d051f344511c4d00ab872a73dd71a0ce5613e4878
+DIST firefox-52.6.0esr-zh-CN.xpi 461679 BLAKE2B 743cebbd66a6fa81b98acab5f24bb19706c2c483aa66de6b95769d84d0a069d6751a6b0cc0da9211e32f197a5b4fc29dd96ba75f057aa7d51c8059041c87928f SHA512 70c112a99b048dc77d843a39f85b45f0f47822f4eb860f9baf2d61022ab211cc95b76d692e96f768920665c7480400589d6e0b0143abbed8415817bfb9113c1e
+DIST firefox-52.6.0esr-zh-TW.xpi 470063 BLAKE2B baa35635f306bb01b2ca3d149aafa37540a48436dd170e5432ffaf0828b95740e3ca8c38485e1e0b1265d334dbc694d0928d4ecb4000f86d7c6410b7c226d8d1 SHA512 eb29346f308268a4f9010697233fc54d627d102441a854d766b0544552935013be86610b948fce454aff311734e66a848df233f99c51c71f51a83f6ba75e3862
+DIST firefox-52.6.0esr.source.tar.xz 211735240 BLAKE2B 47ee767732f7b546eacd29c4db039e74dde6dc2d777ed9f54dae038c93aa21c731f37c53ea72945fbf6be02481b4f6a0a36f31aa3cf09242615da97a849d3104 SHA512 cf583df34272b7ff8841c3b093ca0819118f9c36d23c6f9b3135db298e84ca022934bcd189add6473922b199b47330c0ecf14c303ab4177c03dbf26e64476fa4
 DIST firefox-57.0-patches-01.tar.xz 10964 BLAKE2B 207ad3ddbf924224efabc880e94a051076386102224dcc54e6f2b99466d87e9e5da29ba29d14d3f2024c9d50e3def1a39fceac5b3aac5f789a781c2ac3ab5039 SHA512 5f4c668eb1ae9b4067997973e7f5fcfa4d3de7b60520f7cc2a96b97b0814e921f777862e45fa0ffad231040d99e98f259e2482d4a5d7be096abc5d5860bfc593
 DIST firefox-57.0.4-ach.xpi 441113 BLAKE2B 10940542eb83a3692ca2b9915192f9b0db28f78de7501688890ca3ca84ba8f26a6cd184f590eb5b796ea5c822d09ffc09b740938982874b63596889f3d4520a0 SHA512 1c269b5a8c98855f025e3d0d1df79803f633c79619b01b37b487888ce1ba96335c3117ed3fa11fe63a90f65e8c56eff142e9a1af1b76d1277ade42cb29d85b73
 DIST firefox-57.0.4-af.xpi 442206 BLAKE2B b05aee23bb88c225d72ebf3d1c4aecbc48216e17ae9a500d11870d04469c63a81a35be579db359d4daf872ce821883719432eb752e884084b14badba73eb70c4 SHA512 a62975f1cec946cb355cb35105cae68af104b70c6848e43bd1f6cd4f69ebe14d40ce349dbbfc3390d9181d0bb3eba12ac0b789cffa80939914f50bc4e72b6111
@@ -377,5 +469,6 @@ DIST firefox-57.0.4.source.tar.xz 250217612 BLAKE2B 59ccf9c52d3af0888e13996dba74
 EBUILD firefox-52.2.0.ebuild 12768 BLAKE2B 09516c567cbc290729345b2f5eddd341d20243d3c83e30b01e05ef380e66f9fcd009a0814a62694ae7934cc52ce98211cb0a56fcd5bfa8df4ef35e956fc983f7 SHA512 1b51a9a28d17d920c3b27e0056c9d5cc1ced4cd8e29d25e212ea78015803e472d645b9757de263f1ea78740819db07708560d7c5f95f3dbc7a482192c4c11bc0
 EBUILD firefox-52.4.0.ebuild 12873 BLAKE2B ccf9e89c9fa6f28c7e3876c1919fc6765ed0a808d08b2806705ba3c1b31e996b7b500f9fab42a45cd6fdc45717292d5709949f92434fa78b388fe46241a09e53 SHA512 e983781f1cc85441f3875399eee7677d73319ae343d815cd343b8928ed1f886844227c4f93acea8aac18316e652d91488b7fd1ef46da1e2115f9037827f5a8a2
 EBUILD firefox-52.5.2.ebuild 12875 BLAKE2B 8947bc6d96ddff5a44aceada7dc1c0b186d067819ab0b32fd712811481a4a7cd8b5d9413feeac3feac0106443e0c3aa1715285aa2d2e09c255bf436929ec53ab SHA512 acc937612676a42cefdeb1b6ad999e7d25ee65fe8fbbc93d1d60784962618264e7b45997598a886787ab7019616b125581db46b20b8840588c832a11439dace4
+EBUILD firefox-52.6.0.ebuild 12934 BLAKE2B 206b8b6f02a0249219a256c127ff73e60b9e6d16f5c2ea50aadc19579ab32eeafb8f0439c99413ebbd138eed94dd3f5046f80f5dcda71f09528478d1f1a5f7b1 SHA512 54f2eebe3a68e583b588e7cfdaf4bc30441e312ad07e9ba44b6c0d428947add372017b1f23f6ae32f6e8bb1cfcd72e20998145f0c0847e643c6fed30dbf787d0
 EBUILD firefox-57.0.4.ebuild 13024 BLAKE2B cd7bb56e2e9ba87a2a4f077780ac12ed488d237f55d0cb516f49997231b37fb0c05bbdd0c11b26a9c6e649e037c31864c629c3c058aa4a9cad0f170e00edf24f SHA512 953f5ad3b2b16a87b1245eb7680c3b7c173a4ef90ba658682e5d15e4bc59f0be0fe649358f538b637083cda617ba7ada94c429be23eae411bac31bdf6a775734
 MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2
diff --git a/www-client/firefox/firefox-52.6.0.ebuild b/www-client/firefox/firefox-52.6.0.ebuild
new file mode 100644
index 000000000000..0d16477bdb08
--- /dev/null
+++ b/www-client/firefox/firefox-52.6.0.ebuild
@@ -0,0 +1,407 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=1
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-52.5-patches-02"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.52 pax-utils xdg-utils autotools virtualx mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	jack? ( virtual/jack )
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? ( >=sys-devel/gcc-4.5 )
+	rust? ( virtual/rust )
+	amd64? ( ${ASM_DEPEND} virtual/opengl )
+	x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+S="${WORKDIR}/firefox-${MOZ_PV}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+
+	if use rust; then
+		einfo
+		ewarn "This is very experimental, should only be used by those developing firefox."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	rm -f "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch
+	eapply "${WORKDIR}/firefox"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	# Only available on mozilla-overlay for experimentation -- Removed in Gentoo repo per bug 571180
+	#use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	mozconfig_use_enable rust
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 \$(MAKE) -C \$(MOZ_OBJDIR) pgo-profile-run'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		[[ -n "${cards}" ]] && addpredict "${cards}"
+
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		virtx emake -f client.mk profiledbuild || die "virtx emake failed"
+	else
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if ! [ -L ${lib##*/} ]; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 22f63a390243..59059b9be9ce 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_64.0.3282.85-1_amd64.deb 52867444 BLAKE2B 987842fb8b525ae3996ef9136bc4feb75b459ae959f21e6fe0fc8ad9267a7b479bac2a78621b9f76c445afa7f442debc35fb03142615efa9f970a48cd7687ec0 SHA512 39527aaf1f36df32bf461d2ddd3a3025ab5627aa7eb950be70eb3c73b60a2cf57b733b14b014ac10ab47c8514045c6d8b1c36b5c59e6425c4f54c65d5adaa0d5
-EBUILD google-chrome-beta-64.0.3282.85.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
+DIST google-chrome-beta_64.0.3282.99-1_amd64.deb 52711654 BLAKE2B b06f9e4379988de37fe357d933e84dac0866e81cdcfe0270ba16a48cc79aa192fc65f2576c809b4ed41f4e54c59d5ad58b51fd12d8bf91cf1b85e0d240e2ccac SHA512 4d52c6de2e6bfe1a82cb8bccabf32d0cf15fba481da8a888da36ac7b00f721b5d8ba985ddb4041abb4a58f310d23cff2363cdadcf521027218698c4a6cd93d3c
+EBUILD google-chrome-beta-64.0.3282.99.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.85.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.99.ebuild
index de7c15f9a485..de7c15f9a485 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.85.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.99.ebuild
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index b47640854f66..73acc373c413 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -2,6 +2,6 @@ AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745a
 AUX lynx-2.8.8_p1-parallel.patch 2112 BLAKE2B 8bba1efae94cf7e55eccdb00692c0a7e3a812480448c58497aec7720301753b988b8c9e1a21e1c50c2e671104fbff7a6c8484f79c0cea16c716e7392d7e28aee SHA512 8578baeb5b8aa1f675b198538b0f111906e202f25bd18bf217c4740d25d59e8a7af9c0fe8570b113c56a6f613f7607a67baa16ea4fc23aa7c846184af2eb696c
 DIST lynx2.8.9dev.11.tar.bz2 2665470 BLAKE2B 3fa28252ff619bc7d82d4e1460b7407b6f2f40bb111b8b54ce478327a023748c51e45dbd8e0ae74daff24d59fc3b6a5776a78057c846b8f3bbb153b4c4b92f17 SHA512 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50
 DIST lynx2.8.9dev.16.tar.bz2 2674662 BLAKE2B 3771199e4d74dcc38c15b8b75207810d3a4f3afabb76d5d8dc7dcd33c5dd0119f0f28a1a719f54df7ed0ecdfb972942c6439536486f99a685febbc252127cc3f SHA512 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518
-EBUILD lynx-2.8.9_pre11.ebuild 2486 BLAKE2B 5c2e86089ab360390415b03b6b2eda49267e752f07f13ec2400b37b3f6f43e31bec6d62c912a913046f89d3445df1fe9a3c25c09efb91c19b6159f5dd593fee9 SHA512 9ada5181f2f960a56c55d70049b86c79242864a97cc9487f017147a2a9fd57d69dddbcc8aa7b9da4ab360c9e43869c80836064bdadd727495d3b5b536513007b
-EBUILD lynx-2.8.9_pre16.ebuild 2613 BLAKE2B eee5ba4b06d37ee909985b7f9156e9c6a15b5e336a67ec865f444c3e892065da4e23c9d491a90afb7f28d333d24493898e568da30a3f52a8017652285961281a SHA512 4f38bcf0bd916bc007bfe3de2d8f07ca47d1c33e4b91166d787b65656146e885e04a93ac65e644c73a04141ef526a1506a7b3c2345fdc865f5685a28600b6fb5
+EBUILD lynx-2.8.9_pre11.ebuild 2474 BLAKE2B 55f353231ff7bc0551a6fec2c77e14f448db280842ad2e255479323422d3386c854067807c6df9b4bdb78511ab82637d65e1f250a6c1aaf6d9812abd884b7263 SHA512 9a343cbe5f5bc0350eaaf347e92415b9227877302bda4267f5e9ccb3e0cc4f694e043b6b5d2615b383c1aa474125b75e4d6e91483b4fbf4429fc9db72aa28db8
+EBUILD lynx-2.8.9_pre16.ebuild 2601 BLAKE2B 906625f086c7dab83dfc882c7d9d3f51860100f3fea6b16aee913fc2d96f991a8a9ce7b82afc323cc23f0e54509ec5f51c976ac306c3ea9aa45e4d5d902349b4 SHA512 643bd588dbae32677ea78645b965474ffe140a1e1bb8ad6f11b4d320916182d345703e41b0ab26c7196c9c6ffcdf4c22e96f1f07b03842f6cd7dcc7a04c49f0a
 MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac
diff --git a/www-client/lynx/lynx-2.8.9_pre11.ebuild b/www-client/lynx/lynx-2.8.9_pre11.ebuild
index 11e9acedd7e4..bb66030dcc34 100644
--- a/www-client/lynx/lynx-2.8.9_pre11.ebuild
+++ b/www-client/lynx/lynx-2.8.9_pre11.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 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/lynx/lynx-2.8.9_pre16.ebuild b/www-client/lynx/lynx-2.8.9_pre16.ebuild
index 584d4b229991..f68388bb2dbe 100644
--- a/www-client/lynx/lynx-2.8.9_pre16.ebuild
+++ b/www-client/lynx/lynx-2.8.9_pre16.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 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index d25b464ab05d..b961faa84812 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_51.0.2830.2_amd64.deb 52241246 BLAKE2B 5d3430c78a31d1ea24a4ba6a0340ccdbe795f7100c34a261bf771720d0e72a402370b844757dd87fcce95b5816640936b33b9bf3c9fb6a14e098806fd6d4ae1e SHA512 9a1db683ddd72c8f0d8d7b4fad09b1dda2efe3a9734f440109e5701b3cbc0f8f64de62eb86e2f793ffb49928f269cba82093236a771590921db9eaa3ece4d587
+DIST opera-beta_51.0.2830.16_amd64.deb 52419724 BLAKE2B 69e7e607492f3bfde8a1f3a97adc6ede37b40ea9acaef7e2aeec3c5897a3265ce51556c9349bacce86c1dc432522460a226cab99f7c94b8d87f42a5f4bf4be4a SHA512 d7e485f9024be77d084ce01008a1c914a68343c5994e5de83f20db9f89120ea3da6182bd82592b152e531095a742592bc19d3e4153cbd75ce28f5e3e0b48bc90
 DIST opera-beta_51.0.2830.8_amd64.deb 52408910 BLAKE2B 9c810d5fff5e6a1c4d570d7e1986357295b4e26d776c1a1e173881a1a325c14ecbcee7a3253e1dd5e45a7d7f8c1cf3c85444d7806afefd39b2ed2d97c07cc016 SHA512 7e6956af64cf8d02dd3eb14be83b6484f2070b92882024c239b7ced7d134965ca91331f4279a69cadfd79af07478708ab736a1bf58d77d04b35066b2ec939b6c
-EBUILD opera-beta-51.0.2830.2.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+EBUILD opera-beta-51.0.2830.16.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 EBUILD opera-beta-51.0.2830.8.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-51.0.2830.2.ebuild b/www-client/opera-beta/opera-beta-51.0.2830.16.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-51.0.2830.2.ebuild
+++ b/www-client/opera-beta/opera-beta-51.0.2830.16.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index cc252d3a31cf..9090d031fcda 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,5 @@
 DIST opera-developer_52.0.2838.0_amd64.deb 53030918 BLAKE2B 31e26e1babed3cf06168f9485a4d24e981e0e6a6805fc227655e9d63e043e61a8c65340dbc517936aa2f9161e938941ba9e27e0e9b2c9c12880cd58a2708dcc8 SHA512 ef854dc59fe38ab40299f5d2e071340784c0c51e3044b6c640e3e62219ff909889ce021bbdf1a9bad95d81e04d7684163130784ba1366f641bb691dfaef37a33
+DIST opera-developer_52.0.2845.0_amd64.deb 53013254 BLAKE2B 98c719dfd99f0b956d68eaa31b213bdf3b1e0c62b6e2535aba08ff9211a75a34dc6349868af5a649f4215aab900a7f898079e7819fe819933bd5c62c0ba74074 SHA512 c104193de7386717f84d9284cb792992db118c5652118e201c27b2acaa3a99d12e51a5326c61de2a875ed87a38dfc3e3eb888fd2f9d0bb58b61f5719f92aa0cc
 EBUILD opera-developer-52.0.2838.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-52.0.2845.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-52.0.2845.0.ebuild b/www-client/opera-developer/opera-developer-52.0.2845.0.ebuild
new file mode 100644
index 000000000000..12a41bce61c8
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-52.0.2845.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 5f3196161f74..c69baa225693 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_50.0.2762.45_amd64.deb 52047204 BLAKE2B 61bf2a04621a0cf27f9f73c61e7546544de57939ef29aa4e3b35f2f87cddeeb0ad3a9bcb3e1f2abe549cb5cd39618995c3a6a510a5cca84c70b92df9aa3c669b SHA512 33e2cc771e56c6cba40b7c9d8565f1fdfadc3b87bdccabc29015a879b89e64c5e6dc4c1232831c49be39c974a9f9bc367aaea9ef075320254a2cc141fd3bd5b0
 DIST opera-stable_50.0.2762.58_amd64.deb 52204642 BLAKE2B e06e3118b4e4b5b810aa9c62795dfcd4564edcd50fea95239c92a0d74fd7034f187d0c4ed0e31d7eab106786b50b8989fd77f3701372e7906dd76dea42a6f601 SHA512 14892a66bbd688bef8ed7b36f5bc7a6e2a9fe6d07356a093981f000bb81eb853ae18efd10c019bff9b52005542f7e15946fe7b54295bb6fbf513352899170081
+DIST opera-stable_50.0.2762.67_amd64.deb 51961360 BLAKE2B 3f5eba38b5a6b1f65cdb00c71188c217ad850ec851423120fdfafead4fc9a58f0e4ac65a3e00526ceb507a75b204bc95acf6c6c9a31742a09710e04887721c4a SHA512 e0c9dc26b65d35988380d1e387be931cb82b917aec69da104529bdf17cc9950e6ec0d7557d3ae8acd6b4701c95af63ae25cedfff8876700d85b388519bd6198b
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-50.0.2762.45.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 EBUILD opera-50.0.2762.58.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-50.0.2762.67.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-50.0.2762.45.ebuild b/www-client/opera/opera-50.0.2762.67.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-50.0.2762.45.ebuild
+++ b/www-client/opera/opera-50.0.2762.67.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 844e41a89972..7fe2df192fc7 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
 DIST qutebrowser-1.0.4.tar.gz 3354132 BLAKE2B 272372eee5e59f4f53ab53b535bdc504176e9ae91181ea96063bac3be827bf681539bab52af0be5bc55da4663c4f5b83edc7aa99d54dccd848c3c7bd38b48759 SHA512 197188e1145dcd59089efe4162e471c4d947e84aff2b0dd30582e19d0045a442e81d388e154335e5cce62dd132d379353db932825dbd2cd041372cca795f3e77
-DIST qutebrowser-1.1.0.tar.gz 3468120 BLAKE2B fbde2b6ae685c8d9f2ac9e15a6454f6015351d96bd0886dddfa3e58a1d54a6cedead58cea8dc0a7e95cc504771ad62c74145f547a0a778a4194c2d6b1650862b SHA512 6f14869c787c6140716c0686f9e3abfb44303dd3b04d9d0443c672065c1585c108d87f088ca7254926c077a916e891242ae53c36a2bb6028921462955d083571
+DIST qutebrowser-1.1.1.tar.gz 3472250 BLAKE2B 148450e694f220468916aa45cd7528b393ab1b06ceb516af8a560a160317af584282860652e4ce84ea660c9936075d51755f170cb20e61c0c5e3fb79c6ef0e52 SHA512 30c3aa9883a1d291dba1298c29ff1a47bb90b2db8bda440f1d24983f7b93e7b77b0061e3fdca59f1e725ae639bb47b9f34fc5884b2afd506d2acafb6a6ee271d
 EBUILD qutebrowser-1.0.4.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
-EBUILD qutebrowser-1.1.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
+EBUILD qutebrowser-1.1.1.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
 EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.1.0.ebuild b/www-client/qutebrowser/qutebrowser-1.1.1.ebuild
index e7535337c44e..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.1.1.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 32567af67b6f..2019533ed0ea 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -40,8 +40,28 @@ DIST seamonkey-2.49.5.2-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805f
 DIST seamonkey-2.49.5.2-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
 DIST seamonkey-2.49.5.2-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.5.2-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
+DIST seamonkey-2.49.6.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
+DIST seamonkey-2.49.6.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
+DIST seamonkey-2.49.6.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
+DIST seamonkey-2.49.6.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
+DIST seamonkey-2.49.6.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
+DIST seamonkey-2.49.6.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
+DIST seamonkey-2.49.6.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
+DIST seamonkey-2.49.6.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
+DIST seamonkey-2.49.6.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
+DIST seamonkey-2.49.6.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
+DIST seamonkey-2.49.6.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
+DIST seamonkey-2.49.6.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
+DIST seamonkey-2.49.6.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
+DIST seamonkey-2.49.6.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
+DIST seamonkey-2.49.6.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
+DIST seamonkey-2.49.6.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
+DIST seamonkey-2.49.6.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
+DIST seamonkey-2.49.6.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.5.0.source.tar.xz 230282080 BLAKE2B d55dc086c23813cc116277d532e3f3f99711d7f00be1e09c22d76f021b074d63b1abc8f3814906d73060481857328f0391140484eb1b4c413e8c91fb70003063 SHA512 b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319
 DIST thunderbird-52.5.2.source.tar.xz 230369636 BLAKE2B b1fe2dab986298de590cf7beab9845459ac7582119179599842a4577de7e402d7cdc569dd6b36db017690245df576f96066bf3dfa77be24a35b700559ce56942 SHA512 d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff
+DIST thunderbird-52.6.0.source.tar.xz 230376180 BLAKE2B cbf1b39f504beb2a862e79ed8e612770cd2f2ca97abb790b8e379be856f9d41fa3a28d15adda69deeb9a3559ef1132dff1f9959c8110374a854f59eff0a9645c SHA512 80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0
 EBUILD seamonkey-2.49.5.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
 EBUILD seamonkey-2.49.5.2_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
+EBUILD seamonkey-2.49.6.0_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
 MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild
new file mode 100644
index 000000000000..fdac7c1d5486
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.49.6.0_p0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+# the following are for upstream build candidates
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
+	S="${WORKDIR}/${MY_MOZ_P}"
+	# And the langpack stuff stays at eclass defaults
+# the following is for self-rolled releases
+	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
+	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
+	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	#SRC_URI="${SRC_URI}
+	#${MOZ_HTTP_URI}/${P}.source.tar.xz
+	#"
+elif [[ ${PV} == *_p[0-9] ]]; then
+	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
+	TB_MAJOR=52
+	SMPV="${PV%.[0-9].*}"
+	MOZ_P="${PN}-${MOZ_PV}"
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	#MOZ_GENERATE_LANGPACKS=1
+	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
+	MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/"
+	MOZ_LANGPACK_SUFFIX=".xpi"
+	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	CHATZILLA_VER="SEA2_48_RELBRANCH"
+	INSPECTOR_VER="DOMI_2_0_17"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
+	https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
+	https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
+	"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	"
+fi
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCHFF="firefox-52.4-patches-02"
+PATCH="${PN}-2.46-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	jack? ( virtual/jack )
+	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
+"
+
+DEPEND="
+	${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )
+"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	if [[ -n $TB_MAJOR ]]; then
+		# move the irc and inspector code into the correct locations
+		# when we are building from a thunderbird tarball
+		mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
+			"${S}"/mozilla/extensions/irc || die
+		mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
+			"${S}"/mozilla/extensions/inspector || die
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/seamonkey
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
+	eapply "${WORKDIR}"/firefox
+	popd &>/dev/null || die
+
+	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+		sed '/^sdkdir/s@-devel@@' \
+			-i mozilla/config/baseconfig.mk || die
+	else
+		einfo "baseconfig.mk hackery no longer needed."
+	fi
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# force a version update that matches the minor and patch version of thunderbird
+	if [[ -n ${TB_MAJOR} ]]; then
+		echo ${MOZ_PV} >"${S}"/suite/config/version.txt
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
+		-i "${S}"/suite/locales/Makefile.in || die
+
+	eautoreconf old-configure.in
+	cd "${S}"/mozilla || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/js/src || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_use_enable calendar
+
+	mozlinguas_mozconfig
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	#gnome2_icon_cache_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 82d9a19895bd..c6dea194ad1b 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,12 +1,11 @@
-AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 BLAKE2B f62ac321731ae3237cd5cd67b17cb2027afc751f8d54b46b58f9f060ee5af67cd37501278a279424463d2d6e2b42c728e90f7d94f3cab39b41342decc7778bab SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb
 AUX vivaldi-snapshot-1.14.1072.3_p1-desktop.patch 347 BLAKE2B f54dcdac06c3011d0fd73d0b8c6576a94c77121c488aa103f856afa0cde4a0cf7c5f6249936fd189469179e14c05e192bce9f426e2c7f6f2978b5f8e2171b47a SHA512 946d7bb5875280a98fba1caf48174b3eb3891cc079879a5f76bc74d6f301064437faf6cbe65acbaa9c6528925e4741205bc8f64fb41ace379be9a8f1d39690a4
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 1271 BLAKE2B 51c020903f801608f2515df7f9efb125353d42b61e2126c8858d22237eccf21dcc1571b46be74dc65546544cb985b0d4f2e023ea23dd18ef336f5b3ea0f03eea SHA512 1fb9e60240ec5bdf8d422290c9676b3fd3c7dacd88a26b0bd5f19cd160e3ef63d46fd5697ed0798ed3fab9db79da76d9068d36f2760681b53dad89775e12aad4
-DIST vivaldi-snapshot-1.14.1064.3_p1-amd64.deb 50482824 BLAKE2B 08a25b11a9ba63ff731a27acaaaa83411342e94a249d3ef6b74ff8e69e877b3c6d2ccd2724469beafb81d462c5fc927ba049a42971fa854833676e2086259b62 SHA512 6930048690a6baa081a243558eea7fa70cc583b809b7d36b5f5331a5d17f62cd7f672c3c36100fb865e2fd536ab146480f28bdb75c08c3e8563c7e6b10028bfc
-DIST vivaldi-snapshot-1.14.1064.3_p1-armhf.deb 46248122 BLAKE2B e3cdaca603c1c6a9ca34fa50b12fc225d8e7fbac5966c2aeb8b36c4224af12c882d84f40a6213ccd966ad16b4eae93eee8dcf53ec8324d5c564ff42b90f5b0ac SHA512 46e4724c727f78d355e32e7d8dc482ec240dff2f42b10a16ea3549d83fa24149093dc4e5f85626b0059b71bdbc83323a1cdbc064e3ed63c4b29f24bbf3661960
-DIST vivaldi-snapshot-1.14.1064.3_p1-i386.deb 51362530 BLAKE2B 7ce16ba32329d5428ea4c4ccc84ff9bc7a450ef3765c1c6c8929884fdce41cc1a842b3ce70881c02f4f30e5a49f90df99e40fe6e6256a0aba7aa7803f75d6e1c SHA512 c3ecb7b61a036d9e99fbe5a0bf46a87d06c73cb9be3fc1429c89bf173044c53db9c5a1d367dc38b26aeceb83ad802c70a7ada7e91cefaac80fd083c7731e52e6
-DIST vivaldi-snapshot-1.14.1072.3_p1-amd64.deb 53508988 BLAKE2B 5c9f61f6b29e507c8a2f3368f8d6154dbf1a302075af7af8a8f5ec253c44ecdf7b57d6e6c4d26818ccb41d9ec25986389487506258aaa8e26cfe2cc0077f4412 SHA512 067bb347c2064b1709bb8af2995182f659fb4dbc4199bc942e2005025aac6672ec0af9944f0692a5cfbc96b78ea42b3e268c96a72b189ffea5cc0bebc1038115
-DIST vivaldi-snapshot-1.14.1072.3_p1-armhf.deb 47312872 BLAKE2B 3581fb6a727bb6e26e92b3509d5a96536a2a16ab8d4972f84146daae945f28ac1f80962e0b0023a03053d177c8b56ee7f8ebf162db79d13344802aa3f56eb7ee SHA512 3b61f07cc7258634028f27b1a00aa44b95c3618b8b36803ecdf8e17af9ca0f432456fd758efe1ba8bacffe247e2dfa08b5092776c8f4c9a2aac963553d115293
-DIST vivaldi-snapshot-1.14.1072.3_p1-i386.deb 53069774 BLAKE2B 4f3f60cd1c3019d1c947146e90a9a1325a2c14777cf43cb3394078483d47cc8eb417c3bcd2e37db457f11eede3dd7e131b08923a6a2b79f3bb85a809c513aed2 SHA512 6983060e0db5313dee69297e50b5df256d7856440fa44f1e8074dfb3d28e43bac2f04391d6698bd1334d9d407326ffa7e8b1c550bcd0ef8ee151ff48367df794
-EBUILD vivaldi-snapshot-1.14.1064.3_p1.ebuild 2630 BLAKE2B 13500ad0e1f7b1c6318fd71d5cc34f31fedd1d50721e813c6fef1084a1816bc561f8f357a39c119abf0dee5131815e2c1c686c580e8f4ad79379eb7ce53c2332 SHA512 64178f4cd30ab2ac966baef01a4259863438bd7d5b913fbe322c0ef5477df5de78e721926c071e6b0b13afedeca8f7de6f99cef2ba518fd039a346ec547a9dc2
-EBUILD vivaldi-snapshot-1.14.1072.3_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
+DIST vivaldi-snapshot-1.14.1077.25_p1-amd64.deb 53368116 BLAKE2B fabdfbd05333a60aab0bbf718955c68e75be5d4f95a901bd849661a301c1cd9f9a5948d137d63d08f980f00d2cea263713b5c8a1ee28dc0c593bbb6f9bf40ea8 SHA512 cbcf50adf3abbd4e45ab954833aff4f02e0dc995388ba48aee9925220c18e25506ee1aca79367647c52b4c8a2d4f5ab2666389ad9e27dd79abe6ecb77ba001f9
+DIST vivaldi-snapshot-1.14.1077.25_p1-armhf.deb 47210996 BLAKE2B 7436078249d4d54effca2181066508dbeeaaa361dce2a3163a228ec074493a43cd4bebba866252cbadc1c404dfe85fc6b28dfac6cd7e75f087b538ffca8c61b9 SHA512 bf32501b1b2d47dbab872a7fd7f8152abcdd328f72167772a4aa197666d16d65ad47f4a883e027add168d131dda82fc4badbd357c592614e6ee3b2956b163a61
+DIST vivaldi-snapshot-1.14.1077.25_p1-i386.deb 52951982 BLAKE2B 27463fd7c558bf15777dc483c66ce0427f70c4ab02c6b0e83ff587dca4d8ab1fa467b6b6b7f362b0ba996a67e6781c9217fca8e513324392a1df47e742bc2ef0 SHA512 097f9136be58facc911ad9b88d8486e89320d57b140ab8ed6cf9d0a2bd2750aff5829eb4b66b682b7bb9b1877cb8e8077daac869d261412be79b57c0304359c7
+DIST vivaldi-snapshot-1.14.1077.3_p1-amd64.deb 53411180 BLAKE2B e04cfee2c6ab7fd4d81942a3232c878be37c5d768f95e1588e007d305e6a050241daa3297a0c069cfeeee4190611594f282a1a233d64e49deb429b6d8adca558 SHA512 cab5853cad74f111d47f9611d7a18a8deee99608aa241eff85988bfb42792b1e642a35ad5847fa09d374b7baeadb7f5afc64655418e5dfbdbf2ff8eee141857e
+DIST vivaldi-snapshot-1.14.1077.3_p1-armhf.deb 47215650 BLAKE2B 3e148d2d05236929a958c6a782f921b9cf82e861a4760db6615daac3d07595bd1393ffdee639cf513cf4d1073f0a350a2277af5a44a0eaec9ef9602698b51a29 SHA512 d782191a9f0d7287a65146df552e18a3cdb32a6bc9972bab6a9e7377cfd88685d0c0e8763c39a870b0031c1f7b10777a98bc3691b6a5c1781cafe7da11c22c6e
+DIST vivaldi-snapshot-1.14.1077.3_p1-i386.deb 52959064 BLAKE2B 4bd5df973212ec0d0e2009e96472deb7c831b2455907c7bd9e7e40ac6a5d6e5aa7d02b6a10e954106ec206404f4055ae0977e1829d58713de7594109aa6514f7 SHA512 8f070e0e00bf9acf2d6b3f1bbb79768b1d460f2a2860bb45122551883ae38aa6efb1e283bdc853c4135e9936f399f0b8656f247102d406e8b861a924f0b2977d
+EBUILD vivaldi-snapshot-1.14.1077.25_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
+EBUILD vivaldi-snapshot-1.14.1077.3_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
deleted file mode 100644
index 807164299ac4..000000000000
--- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/opt/vivaldi-snapshot/vivaldi-snapshot
-+++ b/opt/vivaldi-snapshot/vivaldi-snapshot
-@@ -32,14 +32,14 @@
-       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
-       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
-       if [ -r "$1" ]; then
--        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-+#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-           if [[ -n "$LD_PRELOAD" ]]; then
-             export LD_PRELOAD="$LD_PRELOAD:$1"
-           else
-             export LD_PRELOAD="$1"
-           fi
-           export VIVALDI_FFMPEG_FOUND=YES
--        fi
-+#        fi
-       fi
-     fi
-   fi
-@@ -54,6 +54,7 @@
- # Check for libs in preferred order.
- # Where possible, use other files/directories to confirm it's the correct variant.
- VIVALDI_FFMPEG_FOUND=NO
-+checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- 
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1064.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1064.3_p1.ebuild
deleted file mode 100644
index a3680124874c..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1064.3_p1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	>=dev-libs/openssl-1.0.1:0
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1072.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.25_p1.ebuild
index 7998894a831b..7998894a831b 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1072.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.25_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.3_p1.ebuild
new file mode 100644
index 000000000000..7998894a831b
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.3_p1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 4f1341d4ff7d..00b819c3a046 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-AUX vivaldi-1.13.1008.32_p1-libffmpeg.patch 1128 BLAKE2B c6e8dccf5625128ddc6d671835b6b4288a5b67a501a83f8794f98d42f92e1d681a76534c7d175e4b3fa3e70a732decbbd7656e0045754a0c4d8f017c5e6ad92e SHA512 8af68ec79839922ceedd3bcc32dc2e600337cfbede48bc1a254841fd2cf3f0eaaf0d84bc59f292c3b383af72cfbd24aa0b525b34f35d142938e29bddf2ec190b
 AUX vivaldi-1.13.1008.44_p1-libffmpeg.patch 1106 BLAKE2B 4e15ad477669e534c78ab8973e3b0057597e97cd0b37a110be2acece86a49ecddb5c0a03c958bf42c4d1b2ad54d4b400e9e1319385ccb4bb1fc0448512d8aa09 SHA512 93c6454c3107c665c3c5799561544294c140a8dd187bed79b489f7794648941cb91a51eab8f96f8f304e5453d03e4b35b55b647c3d6f7425825dae9cafa3c3d9
-DIST vivaldi-1.13.1008.40_p1-amd64.deb 49253000 BLAKE2B 611ae67831400a6eed575d886fc36b324450b1d2efa65b0f504ad8067b224a6a38a3e8146a4ba9a188fc122584e70fcb65f34c084f501ac8e6e27a524f3fadc9 SHA512 8f6dc0adf328a53eef2b23b061dbbab93baa5f0dfbb12c386446a27791fda1ce95d31810e43167a9225e66eb5ae2db923363e7b4d51422a162c3b8dc84c26d50
-DIST vivaldi-1.13.1008.40_p1-armhf.deb 45155072 BLAKE2B 76e851b23cc48e87257782cc9ccc73ff974161732784acf27031d3d3b2b1b7430ffbac7b75b71042f775c9e3596470653414c43505d09dae3465c75d0fa578f7 SHA512 815f33250705d9bebc3bd0e033250a7eca773e4acf2ca7745ea57d44b61ff489e102283bec97dfd0d1126fd5ab67d14b7f6be6f5b3a1c9a55d8b6895e067b23d
-DIST vivaldi-1.13.1008.40_p1-i386.deb 50136764 BLAKE2B 302456967c62b113c04458bc72a900d8c4d3ec17879d50e81ff326e0dda8255ca59f2995fb984bb5acbf2fdc2d15b02e93b80fc8263b10289256cf393745906b SHA512 a8aab123ecf0bacd16ffd2a239eddfd7125511d366a8bfb6b9bb2eaca3993dc3d90179d3012cc09cfe46cacae4097c0a36e74cad977c80eaebfc6fd5d85e0ab2
 DIST vivaldi-1.13.1008.44_p1-amd64.deb 49265816 BLAKE2B 4d49e00cb0bb7fbf72303eb32da01751b22f9ec252766205893ead6c65e95695457065d2d9dcd5c4d42621a1382b012b2718e67b7f514df2ee7b1ea959eeaeca SHA512 3bb7f5ac0e01b1b3d36b4faae8a0a7874ab8acad5398663c9e51b6f9f26a6f00f01c3a183ff964e18eda2358009c99b270e65a3d35d99cea1de72554a7f6255a
 DIST vivaldi-1.13.1008.44_p1-armhf.deb 45147556 BLAKE2B 90d8c056c129273e2c759247d452d4a825cb0ad41052716674fac790bb488d3f0743fa692f302f1c7af3f22adb91b1a115e1bd5c2745560577c14e0645fe0afd SHA512 f390ef2a6afa98212458a803b2411e53849bc2be3ebf54f3fdedc15bd38462239f7590dd31870c312319a38bb0e293948e1bbd1f1a0cdf243747780925c9762c
 DIST vivaldi-1.13.1008.44_p1-i386.deb 50145626 BLAKE2B 44c913c2e8242d2b4b5b24fb63bc21dd8636283ebbcc5b72178b7dd4a34e2fc0e5d45fe41fef9ce7c918809e0bfffa1cf3ddbe436626afaa6237b4c85d27c09e SHA512 2f34facdc0ee2662d0ce03347346f8e510c288259aa92306f22c1eced6fc8626275f766401f6468b7a3037c2e7d5e65f692de39753553c7c8537b6c7f7a57a7a
-EBUILD vivaldi-1.13.1008.40_p1.ebuild 2982 BLAKE2B 79b9bd6a7a03c6e7afb92418712e79e1de6205afee64125148898c2a1156ba5f8573c1aee6b11356a7820767cfd61aebe6c47d0f67cc338e183e3f9235afb3eb SHA512 311853be92be4e47ee916f2c30884243f8a19d28bbe615b75b567902b311d8c2e01c22fc7488257744f96aa87bf85227efd083f136aeb72d2b28ae8ff60d4535
-EBUILD vivaldi-1.13.1008.44_p1.ebuild 2984 BLAKE2B a6cc2808e1a8c96ebebfb5d5a9606ff03eb0d75e4c3551c4747800bd3026dcfd5e05187bcebe736357c237e6cb09b2396ca496dbeb4ed3720e61622ecc49c4f9 SHA512 dca382b464b8e4b64a40e383979252c94e02982010b9017d9a62898b92987b752ab5192173582a0ffe23ba446a32101f4e317386fcee1a781646082100b767de
+EBUILD vivaldi-1.13.1008.44_p1.ebuild 2982 BLAKE2B cfb6f088c8ea68f7821aff956a6706b517e2cd8c7f1aafc59267d3e4779d4eccccfe558621d69e8b784ca5e36368293d522d0faa1cc2a8fdf2599bec5e53c77f SHA512 651c20386b716ac98b1a32a46d480de06584a07372ad073edd9865c55ac88f4a3c5cccb0e97e42828cd20dc63766ccd9e7f86797fc610739cbeafa54d7424db7
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch
deleted file mode 100644
index a0da6934742c..000000000000
--- a/www-client/vivaldi/files/vivaldi-1.13.1008.32_p1-libffmpeg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/opt/vivaldi/vivaldi
-+++ b/opt/vivaldi/vivaldi
-@@ -32,14 +32,14 @@
-       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
-       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
-       if [ -r "$1" ]; then
--        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-+#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-           if [[ -n "$LD_PRELOAD" ]]; then
-             export LD_PRELOAD="$LD_PRELOAD:$1"
-           else
-             export LD_PRELOAD="$1"
-           fi
-           export VIVALDI_FFMPEG_FOUND=YES
--        fi
-+#        fi
-       fi
-     fi
-   fi
-@@ -54,6 +54,7 @@
- # Check for libs in preferred order.
- # Where possible, use other files/directories to confirm it's the correct variant.
- VIVALDI_FFMPEG_FOUND=NO
-+checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- 
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.40_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.40_p1.ebuild
deleted file mode 100644
index 9963ab905637..000000000000
--- a/www-client/vivaldi/vivaldi-1.13.1008.40_p1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	>=dev-libs/openssl-1.0.1:0
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch "${FILESDIR}"/${PN}-1.13.1008.32_p1-libffmpeg.patch
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild
index 64b2fd9f7d26..78c70beff4f9 100644
--- a/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 12eec197f31c..e7b208cf88c2 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 e082f1f27da0..cbc0db432be8 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_64.0.3282.85-1_amd64.deb 52867444 BLAKE2B 987842fb8b525ae3996ef9136bc4feb75b459ae959f21e6fe0fc8ad9267a7b479bac2a78621b9f76c445afa7f442debc35fb03142615efa9f970a48cd7687ec0 SHA512 39527aaf1f36df32bf461d2ddd3a3025ab5627aa7eb950be70eb3c73b60a2cf57b733b14b014ac10ab47c8514045c6d8b1c36b5c59e6425c4f54c65d5adaa0d5
+DIST google-chrome-beta_64.0.3282.99-1_amd64.deb 52711654 BLAKE2B b06f9e4379988de37fe357d933e84dac0866e81cdcfe0270ba16a48cc79aa192fc65f2576c809b4ed41f4e54c59d5ad58b51fd12d8bf91cf1b85e0d240e2ccac SHA512 4d52c6de2e6bfe1a82cb8bccabf32d0cf15fba481da8a888da36ac7b00f721b5d8ba985ddb4041abb4a58f310d23cff2363cdadcf521027218698c4a6cd93d3c
 DIST google-chrome-stable_63.0.3239.132-1_amd64.deb 49565326 BLAKE2B 827949d0de954f3be5717674b4d1ed7d81147e23634144625c20c23274f468a8e2be7567efae0a52ddefa9bb130e2d5c00f46924104ed04c8ea1258680a2a368 SHA512 d3be097e7cc7f40038f3318eed6fac2feef890157ebc50b9b4936b941ceb4cce13ae46e76d78c82788e360b6abbe3ba69b11925bbfc4211c68665fc82659fada
 DIST google-chrome-unstable_65.0.3322.3-1_amd64.deb 53388158 BLAKE2B 460db1e4c0a82565e626c57c0bb2f94a3689e2fc8e884fb5a2884ba57fdbde06120817ba210416b90635258ee44f849b294d2e522b44e9987088c62362303634 SHA512 c91aef303086e1d7a188c4f7ca06a62d324b9d3055fb97074369e85698ce7c35dfc58745622231a296edaf9ecc9501e7e6858e05104a2fa8661e462eb2e529d8
 EBUILD chrome-binary-plugins-63.0.3239.132.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-64.0.3282.85_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-64.0.3282.99_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 EBUILD chrome-binary-plugins-65.0.3322.3_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.85_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.99_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.85_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.99_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index c6020dbc73d4..f152a05b989d 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9a30df85b5bd..660e2317b2dd 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,9 +9,9 @@ DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b93
 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
 DIST httpd-2.4.28.tar.bz2 6553163 BLAKE2B 27ccb0bda7fae6977a7e44ec220fc6ad8c027bbe14449bb5b7a560a4707c71da7cfd09923b66da9ead1d424c5062cc4a168cb53c6088ac4ff378d1b3617b3186 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a
 DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
-EBUILD apache-2.2.34.ebuild 2988 BLAKE2B af8830f0f443945d961ec0e14099e927e5b1f73d6fe7c70eeff13001e703767505fa0b58915f6dae42132d025c70d6a14e82f5b6dd1c97915b6f0973c6ddd95b SHA512 913dde770b5efd1e283d96403232aad75cb5ef6cbc9dbdefe90d307d2479dcb6245e2faffb47291118f48f576b1a0fae849e3ea481ff7208a755ef5b62033022
-EBUILD apache-2.4.27-r1.ebuild 7749 BLAKE2B da77f3a4ee8db2d576a075abdc056345bc594aad65a4b2cc431545368d05c42ea3fc8c96105a7c3aef0ca86552ec28dbb7e0f5f9d85ef6adb8903ef71a909ad9 SHA512 770580bb91e50ff071482638eb3d7361c0f782eaf9fbf2cfc3d803b1eb8785e7ba9fd67382caf75f87f8803e2379351fb4d43d733572965a9bc84f22974161b4
-EBUILD apache-2.4.28.ebuild 7776 BLAKE2B 292973370e0977f98d25f57a80a41e29b7887bdfcfc5b3bd0b42908aa10edd2f21563d87ac943c58362ba19fed4bd119829f0314a1e0a13a2826a59f30796d1a SHA512 48a4dcf833fb4896dee8ae571939e9f2066655e8e23cd8512ebabe202d8d9bb95ffd007881fc69930deb03c95988119645d1b169d8939fbdfed15cfea3ea150d
-EBUILD apache-2.4.29-r1.ebuild 7897 BLAKE2B eb3ee2a2d6b272efac5b7ee3c25b584f230eeb9d277258c264cfeae0c35bb8c08bfd05496ca4cea398b8d290bc068276ad51ac4dbce0a19219dcc7d4721d6711 SHA512 e90d330003c9fe411aa8751b06ef29a117c7ffa5cab939ec81e0cd937dd32a88b47329260629d30037ff4020ecc5840d8c0131de8afa6030c59fb44eb9628e90
-EBUILD apache-2.4.29.ebuild 7823 BLAKE2B 41b13054544e46707a3d224c21f3abe74e1d37e7d93552bd7a854d420e96ac2644f4af371cf57b2391055312c3c3960d0b21f7f4721f7b2e5cff37f9813b4020 SHA512 613465fd87dd2aa50b982030a6b3b732196a977ea3ab5755d0854944cfe276e21d623a2c7f21c17f38453233fa8ccf227f25dfc92219cb166cd5a35027ead294
+EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
+EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
+EBUILD apache-2.4.28.ebuild 7764 BLAKE2B afc47228dfce6b4fcbf97ef45a46241d0660600873ba0931a5467ed57831146503fe180cf27b97354a57f473662ca4f629cdfc9ceccb33e708aace41b4d63866 SHA512 f7e0c6b1ae0fa522aaebcca2beaa3fc167cc3d29c4e2358f5008dd175ebd5559e20966ed28c0f989193be914616d2315828b46fbd3c658ec0a5277fded6c3e55
+EBUILD apache-2.4.29-r1.ebuild 7885 BLAKE2B 45318cc120a6957f67f4d99d06c0f00873f6a12f62543c21d5668113d07b06ded664930aa56b28e9b8d852067fb3503c7525d94311d854a168acddfdf3387539 SHA512 3cb671c024dc0caca725c0e34f8cc5fcb1d9e4b2aba2b4e0bf2074b488b0b7aa6df1a13aa8545d20ad1ba2e3c3eb935e897aa3e3ee096be219a30ae2d845f196
+EBUILD apache-2.4.29.ebuild 7811 BLAKE2B 925ebfd606a503ab3c6338287f0d2714d47ed9a9a1ed2824228361d4706eead3f5674a1a014198ee00a3f4e4401138d53891e9a12d935d045e7ffbaf1b4e05de SHA512 f58dcac1f4cad7e60b2bc9066723025cc52b2f20a7ec6850cac8c6a342fbc001b785b38e570e4113a00c6ee23e0f8d36983ab60dc3609cfb085eb41c27248b17
 MISC metadata.xml 3554 BLAKE2B d415eb42fbe1614b63620c8d4f60390ca585d56b10cc7d7ab057b299f3a7046bedb2cf0d0490e36d00e497afa3ebd9a46d61e6afa8716ab55c3c4bf59389b4e2 SHA512 3165c25c9f23548ce0c5efdf5ca6fe563eaf51671c1df0cef8fafeb33c128b224fba921e7edd3ce7c194a980dbd4774889dfd57bf7e21559c659e3163532b902
diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild
index f04b7862026c..e17bfb660c57 100644
--- a/www-servers/apache/apache-2.2.34.ebuild
+++ b/www-servers/apache/apache-2.2.34.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
@@ -88,7 +88,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_configure() {
diff --git a/www-servers/apache/apache-2.4.27-r1.ebuild b/www-servers/apache/apache-2.4.27-r1.ebuild
index 7cb1be61aafd..9475b01045a6 100644
--- a/www-servers/apache/apache-2.4.27-r1.ebuild
+++ b/www-servers/apache/apache-2.4.27-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
@@ -127,7 +127,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
 
diff --git a/www-servers/apache/apache-2.4.28.ebuild b/www-servers/apache/apache-2.4.28.ebuild
index b4dc41e3f33b..4b7e114398d3 100644
--- a/www-servers/apache/apache-2.4.28.ebuild
+++ b/www-servers/apache/apache-2.4.28.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
@@ -127,7 +127,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
 
diff --git a/www-servers/apache/apache-2.4.29-r1.ebuild b/www-servers/apache/apache-2.4.29-r1.ebuild
index 0072111cb730..70c346ba852d 100644
--- a/www-servers/apache/apache-2.4.29-r1.ebuild
+++ b/www-servers/apache/apache-2.4.29-r1.ebuild
@@ -128,7 +128,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
 	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
diff --git a/www-servers/apache/apache-2.4.29.ebuild b/www-servers/apache/apache-2.4.29.ebuild
index 21c415055fd1..7f4905d82214 100644
--- a/www-servers/apache/apache-2.4.29.ebuild
+++ b/www-servers/apache/apache-2.4.29.ebuild
@@ -127,7 +127,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 CDEPEND+="
 	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 369ef4f9a473..215d65a75820 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -14,10 +14,10 @@ DIST lighttpd-1.4.43.tar.xz 656248 BLAKE2B 7c1e91c615c380a64784c1b9e33979e5bc339
 DIST lighttpd-1.4.44.tar.xz 660304 BLAKE2B b8bf21fc84c525a24c3b2ca66324ed75e3ec63a28455ed6166831a6e729f6f669363d9fe72289cf1f5532b231e23298d120fa57bbcc98cdd5ba37f9b84eb89ee SHA512 b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
 DIST lighttpd-1.4.47.tar.xz 703012 BLAKE2B 47d8e537c08076b66cd80b35d8d368e7eef55dc0c9edb004e86c033899c13be09ba5f456395647d6c63d461183cfb0be87d36d5e8f26086e0c3ad9bd75791ef4 SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99
-EBUILD lighttpd-1.4.42.ebuild 6071 BLAKE2B da6f36fe2d2af9405e32b342b063b5769591073ea6e106320d96ecfc90312ba4a27d3238644a4e3ec7a1854bd222db0c9ba4e51db233313c00b606417a628228 SHA512 10e645c61a008469af635b4449e1f26cc3425671f12b65dcc4d4f64501225185d9fd74d59a167980ca6a513effd9c3634ecbdc0b609b9a81b93b7e155d4f9257
-EBUILD lighttpd-1.4.43.ebuild 6080 BLAKE2B 799760b1c2dc547bcf7f6f56b6f8d425df181b40bc30d6837f255031943a881fe202105f96f82f05844105c3ede6acdb887176c8a56a13eb2b06e4a4dbffd3c8 SHA512 b17ab4887776c304a1584d4ed79776ec14d7f9fac0bdafc9ddf32b4f427bc71ef2a9d12c5f36849c3c2de7eae4f59d46402a63f4826569ec224e0d64919ed1ec
-EBUILD lighttpd-1.4.44.ebuild 6080 BLAKE2B 70ec0b649890482b4c563b2fa7fa27f81f56c45588d041976da30f9f6e09f0a0d9300f7c3304c9784f19ac39ecf2f4696f890c05499e1dc595e5f65ada5b07b3 SHA512 e6d29f7d6617733f9c7260ffd4549b63b3630314fbdf9c2ee2a264febabbe498c289c8693f0118c3fb4f5e2054a00d0d6209fb853e114e6ddc883c70dd4c8f02
-EBUILD lighttpd-1.4.45.ebuild 6079 BLAKE2B 5654e965ef6ff0ec1dadd0bbbfe0425d7fc59f2d206dc363dad2d70ce1bd9662b35fe94e4bc1ddc63ecb159cfff26ef68c8acb28e4a3cfa0d3f6601f5ad89a97 SHA512 3f22286876882bbb2eaef844e00466b8d290ce1afd7c000bf4e7387d0e96f25c274fdc53f6ac1cde4433c66dc0a9e352a7e48ea8a016de48e1d2dd2f79156208
-EBUILD lighttpd-1.4.47.ebuild 6153 BLAKE2B 315fb7590b6be71dc7a51491de955d799ee41222d1a436145502b5dfac7c355c57b8e3ad56de50ca85216db498b687f0e50a6cbaefcddb85e3fd3f060d33e158 SHA512 68567e4d5f6a177b6c36d9a2d2893379ff21bbafc610584034b2db35d90bf717cc1336e44e4d9ef7d3f37dd1b4b49bb0c1aa7c2277e98af2acbfa8f60e68ea83
+EBUILD lighttpd-1.4.42.ebuild 6059 BLAKE2B 0c5a8c90324389dfa00daa7e6a3b3c066ce36096caa079c6f4db5c1050fe083d88c325ad84a8ee288864c583058645f3e6bf41a5e571db6f1aee591fe872728f SHA512 0842d1106bbbeae2f6aa16c40c502271e39fc32c7224e09a1b7185565c4dd676daa17cf8cf30e22fc57bb711207a6b8172641a89ef11145ad3a01a595de90409
+EBUILD lighttpd-1.4.43.ebuild 6068 BLAKE2B 85fbf7ddbef1f2b01c760b8b8c993f756104daec0304eb429aec3513e4f4509cfa2427e3f98746982f5a8ab7bafef0264da1668e6116e75b9f4bcca9392aa857 SHA512 719877b38a77fbf9d69b0098b8c7888859cc0c618ec4fdfba02bbe1387a793086777ea8b3a98ac3c90e2581f9a52bec0cbed7bd814204db99f91798fa0648b89
+EBUILD lighttpd-1.4.44.ebuild 6068 BLAKE2B 85fbf7ddbef1f2b01c760b8b8c993f756104daec0304eb429aec3513e4f4509cfa2427e3f98746982f5a8ab7bafef0264da1668e6116e75b9f4bcca9392aa857 SHA512 719877b38a77fbf9d69b0098b8c7888859cc0c618ec4fdfba02bbe1387a793086777ea8b3a98ac3c90e2581f9a52bec0cbed7bd814204db99f91798fa0648b89
+EBUILD lighttpd-1.4.45.ebuild 6067 BLAKE2B 963de7a8aa7325e85dfee31e4bd951aa9e742b1c0a1c5f54904951a18a960eca982e3d59a0eb8778eb03d0a220b2a649ed29b995a747669d6d9f2bb33a713831 SHA512 9f0e88e79b7e3af64145a5894b50167156fce1449002b830b3587a050a0d32cb764ce1520c11ab5686c3ebcda3f89463b7d1c42feee2928cc09ec4ec558d877b
+EBUILD lighttpd-1.4.47.ebuild 6141 BLAKE2B 9655a4c707553a3d5ea28501e5f2f5916431c9c32395ca4712abd1955230190bfa9926cdceb4ebbc76cb07bbd5d097c3286c148499a9c4d9c62d55de4099a68f SHA512 5941720b6bce49cc70a0493134340b4a9697da6864c4928a1d57cae94761e099bcc61aeae3ddf52dc3b5c59d636af13d39952b03ae8932863fcd9c88f2e7f35b
 EBUILD lighttpd-9999.ebuild 6097 BLAKE2B 909ce4816861ff7fce4e9cd1fdd69005148a718d0d2c034096384ead8ab4c54be90e7cd97db5031d4deb52ce102cf2dbe2c8f38d6b26c2748254ad1002c7b68e SHA512 f1898fb6b9b9331d206119bd3ca0cec00d8cce4836dda65829d7d82c79ba4a38b8a55cd5e08dedd1780a29f78e0deb7ecbb546826a182202fa1c009a3a794bc9
 MISC metadata.xml 1054 BLAKE2B f019b0e6d0122f004a4b7e44450ad1807c7a9ded2919b443e5e90d61e73337b295bf382f3dee2c9c544b1dab79d356f8088d8f764de43fc91686f0f05fcaee93 SHA512 ce8dc3c1c8afbf6526d82737274ec75d0ab7fe189dc3413ac65ad1aed61e5f94bf45cd8bd564ba6f390357b9dffa4d8685fc3b7c867148ba553f446e5f02eff5
diff --git a/www-servers/lighttpd/lighttpd-1.4.42.ebuild b/www-servers/lighttpd/lighttpd-1.4.42.ebuild
index 95e83a5b1e5b..f438237b621a 100644
--- a/www-servers/lighttpd/lighttpd-1.4.42.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.42.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="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.43.ebuild b/www-servers/lighttpd/lighttpd-1.4.43.ebuild
index a4141e3de4b2..8a691625e6cd 100644
--- a/www-servers/lighttpd/lighttpd-1.4.43.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.43.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 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.44.ebuild b/www-servers/lighttpd/lighttpd-1.4.44.ebuild
index 3bd94fc68eba..8a691625e6cd 100644
--- a/www-servers/lighttpd/lighttpd-1.4.44.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.44.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="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
index 1ffdc768f837..67737436c2b1 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45.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="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
index 7267b9187d2d..87c89b4727a5 100644
--- a/www-servers/lighttpd/lighttpd-1.4.47.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.47.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="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 8227acba7e8d..fb84eb27de2a 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,5 +1,7 @@
 DIST puma-3.10.0.tar.gz 158843 BLAKE2B 94f206c2b1334b2b63da3962b0a9077cd2e9671c705c4db23acc44098c02902ac3ca1b8cb0b39a0e68282d39103b61adc0334814095e313d9de02d819ab8af92 SHA512 a0a97c75408c8e9ab108b0d2edaa955bf0052d0d0ba7641be52f645ffaf61d9c647f863910e084319a705de7b27a763209f5aeda50e29db94442d9ac59866813
 DIST puma-3.11.0.tar.gz 207387 BLAKE2B b95af60358a9e6877eec34b4cab80c00512e6f9c518f302d6373eee3042b4f439d655aafc719461f7d286fea565e82e6f7ad541a7b0a17d3c2f49067f3e11dd1 SHA512 55e7be6a6c8abc7c8bba4c793b9515150d989358259bbd6546cd8a52d9e6cfb0b7e20c3f813790359ae141865f991d0daadf043e884e2cbc1a1bdfabadca8a16
+DIST puma-3.11.2.tar.gz 207895 BLAKE2B f7a36112f70e63467569354f5ee5e81e1a62ab457099228f7c43c25bd51a8f8aa6de7e02c71222d23c3dc6b5e726c3210e46052d03ae376d533332942b1daa2f SHA512 a10fc17585f38ea31c213cfde109fb21415257d2a6ab8863091baee49e94916b20ffc47f8aa961ab2b2d5d0672a0ad4a279bc9b2549062842accb6cd39cf922c
 EBUILD puma-3.10.0.ebuild 1984 BLAKE2B 679d465e8f473d20e1b103a797013fad2e64f5888e840af4bb4cd7bbdca8fd684253824eb59e81d81d3cbf8d36db7dd971c200a29b41eab0a7c3a1579ecde8dc SHA512 71dba8b8bfdcb5ec415d903e8bf90617cd40ae027fe0459036818b3af239225f3989031fd3bf51e417f18c4b411d54355c2d4c1df0e27f335f7881e3c061b4ba
 EBUILD puma-3.11.0.ebuild 1976 BLAKE2B bbfa885fbc2070cfad87d4bbc68f48500066f235b644204fc4e73eb1681da23fcd3710ff64ea0add865df0eff0966092651febf7c623b3fb6b3dc0dd6fa02dc1 SHA512 ab5c53b27ec80f7e1228c4c6c525e1a47651cb57e8027f31f86a23b2e5ac45a7b8dcbfa0dd75d1adc9e34eeecb485f2449b6dce05b7e41cd63cfe5ca88372b8c
+EBUILD puma-3.11.2.ebuild 1977 BLAKE2B 2d736f65e0aeff4cbdd80e791b0af0e6538fa322875857ceb7fb6b91df9596ec005790b895f0d9ebe26dc61e18d8a17e74a9d50a77e79e259f4fa5b107964249 SHA512 c5821fd5f0e3da4018eceb825beeabd00f4a02a9d9dcf48ee01d912501392115ff4f6e96c6ba62ff3bad5f4f40071351ad5c8ca19438cd2f6d1900924b2c05f2
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.11.2.ebuild b/www-servers/puma/puma-3.11.2.ebuild
new file mode 100644
index 000000000000..658c82f7e47c
--- /dev/null
+++ b/www-servers/puma/puma-3.11.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="http://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
+
+	# Avoid test failing inconsistently
+	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
+
+	# Avoid test we did not run previously that is failing
+	rm -f test/test_cli.rb || die
+
+	# Avoid test that trigger a bug in ruby very easily and lead to
+	# failure. This affects all current puma versions in combination
+	# with the latest ruby versions, so we add this new version anyway
+	# while allowing these tests to fail.
+	# https://github.com/puma/puma/pull/1345
+	rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+		-e 's/localhost/127.0.0.1/' test/shell/* || die
+	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+	einfo "Running integration tests"
+	pushd test/shell
+	#sh run.sh || die
+	popd
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d03b531f5805..b30464d012a8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,7 +3,7 @@ AUX tomcat-8.0.47-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7
 AUX tomcat-8.0.48-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001
 AUX tomcat-8.5.23-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
 AUX tomcat-8.5.24-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
-AUX tomcat-9.0.2_beta-build.xml.patch 10319 BLAKE2B 0b89d84c0cebef256009ac965bdd2c9608445de81ceb603d85a718f60f115977b35ab7ac3863a64615a796db4f20190d67b28f042a8eec01aece937ba157653d SHA512 cdfd3c04b1f4014d44be7d6af40bcc959120af78d4a1976ec17434da72fd514e4c4c18b9e21e1e67134db74c2465f51094cf5962da4807a6e8ac2086564fcbfb
+AUX tomcat-9.0.4-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
@@ -13,11 +13,11 @@ DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
+DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 EBUILD tomcat-7.0.82.ebuild 4279 BLAKE2B 21c8b0b0d3823ed1535276a03ed63b2afd840648036a1175f52babf19e3801f85d6bfb0822ef8a30aad1e731428511c2816d77d0afdd7587777775c33072fd86 SHA512 3f366efa7559235ef48b8dc297cafa6af9854f7ea6e4bce0e03e1be956590f3fa34fdbeeb5fd8ac7bd4e7ed43a4bda381a3c2b7f2b3e5a0e1ae50523ce5d5def
 EBUILD tomcat-8.0.47.ebuild 4471 BLAKE2B b9e4bf2549bc087f2ede1c2d21f8a28734b65155539ff9686d4d21937a3877a38cf8a8e60310a708f9122d1e4cdd7dbc52c6a8e2ab4483fbf2ec79b62b61a541 SHA512 e97bc0a73e8a1384c30915d42e1cfcfa4431ae63dccf85b997c30333a464b3042ec5aee48678c2dbcb045d30532d7aa17ec00ecff14f0d8d7caeaeff9cd3f5b2
 EBUILD tomcat-8.0.48.ebuild 4472 BLAKE2B 5b0b4c1df76282c0f266ac921275285423834f3c75e44b8e5779e74eb444af738e2dda68d8940f7fcfa9d10d6850d148b46dcf58b8ff2d25afcd51dca7b4c614 SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620
 EBUILD tomcat-8.5.23.ebuild 4519 BLAKE2B 89e25b96d1b794e910ce1c549bc20d1c788f8dfe034d961614c358ff08883177923a45e25f719f850196e7f6d9fedc144cd445f522e85cf78fd951d1040a1725 SHA512 c63e34cac14b2739588a81c5d7b667fe9431f43df0a14d3f596a24e9414a375fcf6466d066e35395532d01b681ba634b026c34691dd10d63590858b6bbeac5fa
 EBUILD tomcat-8.5.24.ebuild 4520 BLAKE2B 1d117a461e056afcd51d4311759a51f6a519e92fe059fbc6c7b497fb34afdf1c7702fa917b3531156c93eb27438a251a2a3766b910f44be410a01b910e63db97 SHA512 2c50bbd367df38f7214d3bb04606e5a5f10f68a2d305a939477f2686d26ff4b9596dd4703a9979179919ad9ee9f034db2dc7dff5d0fba0c0b75b00abe6c3c918
-EBUILD tomcat-9.0.2_beta.ebuild 4527 BLAKE2B 7fb7c2f07300e60206e4007cb94c498e22c72b993858fb1012adbf0ccfe25964059772d75e8afdf08e4a3a4ecd4a5a3d2fc1eb3c994be0e9f4bca17542af4f73 SHA512 26af1a935ed316f141d93f0b828e07b02040d62c32ae65ebba3076812741fb0639936ac33f0c90eebb917772b069b1deea991ddf303b8e2d51d2c72f3a8eee4d
+EBUILD tomcat-9.0.4.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
deleted file mode 100644
index 3f55c285e230..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/apache-tomcat-9.0.1-src/build.xml b/apache-tomcat-9.0.1-src/build.xml
-index aa29b28..a9ac6bd 100644
---- a/apache-tomcat-9.0.1-src/build.xml
-+++ b/apache-tomcat-9.0.1-src/build.xml
-@@ -715,24 +715,30 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1006,14 +1012,14 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1073,7 +1079,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1107,7 +1113,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1122,7 +1128,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1226,9 +1232,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1609,7 +1617,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1757,6 +1765,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1821,6 +1830,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1861,9 +1871,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2608,7 +2620,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2642,7 +2654,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2699,7 +2711,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2725,18 +2737,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2748,7 +2760,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2767,7 +2779,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2778,7 +2790,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2796,7 +2808,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2806,7 +2818,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2829,7 +2841,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2840,7 +2852,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2851,7 +2863,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
new file mode 100644
index 000000000000..87f869dd4c0c
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/build.xml b/build.xml
+index c1331c9..b664cc3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -719,24 +719,30 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1012,9 +1018,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1074,7 +1080,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1108,7 +1114,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1123,7 +1129,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1227,9 +1233,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1612,7 +1620,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1752,11 +1760,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-9.0.2_beta.ebuild b/www-servers/tomcat/tomcat-9.0.2_beta.ebuild
deleted file mode 100644
index 6151c2e699bb..000000000000
--- a/www-servers/tomcat/tomcat-9.0.2_beta.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_PV="${PV/_beta/}"
-MY_P="apache-${PN}-${MY_PV}-src"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.8"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=virtual/jdk-1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild
new file mode 100644
index 000000000000..bb86ba9675bc
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${PN}-${PV}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.8
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 664fd5ca6d1c..b6e8afce4d24 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 010c281e6c11..0ab47ded11cb 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -4,8 +4,6 @@ AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981
 AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7949af1d3bb8452e138a9d6f8d84ac6587a121e1a379f9e69a0b9896c83e63c7ebfec26abe2b46e957a25385d04cc8613aec407483906 SHA512 f84cdbb6b43444eda753f6a31b3fe2514152545a7d75569d88f3b2d22542e5d087dfbd735457155f1463449f4e2138382d6f730978bd8d80280ad609dc826718
 AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997
 AUX xf86-video-virtualbox-5.1.30-sysmacros.patch 679 BLAKE2B 6ff7b4973ae1bfdc1f66e5ed3c8e4f0b2c11e3e1bd6b12577703b1d0a8cf4e7c7de52fe5918049f009f8e868d93b5c62966a0a2be0421a08515e94d06f6267a1 SHA512 549073a60e2e56d2463c541d027e7c3c2c9ec22d06943ddd04f7b65ae5213eb67853806de16631da389e3f94c42b8f25c7717efb92aacfcc87062d7d7d3101ea
-DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
-EBUILD xf86-video-virtualbox-5.1.30.ebuild 5110 BLAKE2B 7d787fe676b53111226dbfca864ea72a9cef9db1a3800e2b920a6ddc5d9723eb335ce49c95e437ecd8cf242b9abe760e69555ab5d84f2eeb24a287b0b051ba92 SHA512 5d7778717eee143c0f3572e7d8d63698f289eac20186b1d257c359bf35ec95044a789100df9a810c779c430e0ca11fc641f345ab1028de1d67aeb1b83d883b90
-EBUILD xf86-video-virtualbox-5.1.32.ebuild 5049 BLAKE2B 260f2520a59bd2534c9d5f87ab760df3576c744f03346d76a33dc9f5ba412db6cda8eac6dc6f33f1ae891f49d2cb76d61701f2d4c52e3711b730343719ee1ff4 SHA512 e4acdfa9f609d416bab2cb7edec43dc1bd26bd314129b70373787febe390d2b210e2a7def2c32a7f1ea9031ec86ad22addba6a7397591ce1c419ed05cd30931c
+EBUILD xf86-video-virtualbox-5.1.32.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
deleted file mode 100644
index ec4f9e009267..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-S="${WORKDIR}/${MY_P}"
-MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
-
-PATCHES=(
-	# Ugly hack to build the opengl part of the video driver
-	"${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# xorg-1.19 patch from opensuse (bug #602784)
-	"${FILESDIR}/${PN}-5.1.10-xorg119.patch"
-
-	# fix bug #579946
-	"${FILESDIR}/${PN}-5.1.30-sysmacros.patch"
-)
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	if [ "${MERGE_TYPE}" != "binary" ]; then
-		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm Makefiles and build dir
-	eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	default
-
-	# link with lazy on hardened #394757
-	sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
-		-i Config.kmk || die
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	local each targets=(
-		Runtime
-		Additions/common/VBoxGuestLib
-		GuestHost/OpenGL
-		Additions/x11/x11stubs
-		Additions/common/crOpenGL
-		Additions/x11/vboxvideo
-	)
-
-	# need to use the upstream build system to create necessary objects properly
-	use dri && targets+=( Additions/linux/drm )
-
-	for each in ${targets[@]} ; do
-		pushd "${S}"/src/VBox/${each} &>/dev/null || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-		KBUILD_PATH="${S}/kBuild" \
-		KBUILD_VERBOSE=2
-		popd &>/dev/null || die
-	done
-
-	if use dri; then
-		local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
-		# We need a Makefile, so use Makefile.module.kms
-		ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
-		# All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
-		targets=(
-			include
-			src/VBox/Runtime/r0drv
-			src/VBox/Installer/linux/Makefile.include.{head,foot}er
-			out/linux.${ARCH}/release/{product,version,revision}-generated.h
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${each} \
-				"${MODULES_SRC_DIR}"/${each##*/} || die
-		done
-		# see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
-		# and replace '..' with 'dt'
-		targets=(
-			dt/dt/common/VBoxVideo/HGSMIBase.o
-			dt/dt/common/VBoxVideo/Modesetting.o
-			dt/dt/common/VBoxVideo/VBVABase.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
-			dt/dt/dt/Runtime/common/alloc/heapoffset.o
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${objdir}/${each} \
-				"${MODULES_SRC_DIR}" || die
-			ln -s "${S}"/${objdir}/${each}.dep \
-				"${MODULES_SRC_DIR}" || die
-		done
-	fi
-}
-
-src_install() {
-	cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
index be6e395ae7c5..451c6f821b90 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dri"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d2236ddec56b..d8a722cc9995 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 0d2ebfa19ae5..d3659d0a1713 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,3 +1,3 @@
 DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
-EBUILD libfm-qt-0.11.1.ebuild 898 BLAKE2B 8d8faf902c623a619c45e3ea774f9064694da5b0435218a894ff3609a3005d97622e6674d40e1cb6f694c396ceb0d58379d97d7e9cd85104c8b510e295222c62 SHA512 9f5e7093b164fb03eeb27f5d0358b238ad4b78125d167b6b53bc16c6dd57a0bc3bf080916a30984adbebcaa88c1f15fbb4b716247526f7488744d261a63adf68
+EBUILD libfm-qt-0.11.1.ebuild 903 BLAKE2B e7b5b628c4a6bb14c8f715a928b4d4416aba07cb680862390bd45df97a7fbc54097c8ae8b2404d46ca9c4bdad09cd96a6423c0349eace4b5dd9baea11c08222f SHA512 7c40e6808dee6262f283fc274c9ac34d12fa30b30aed7fd8fad7b8970aead41c601e50b8eff0fd76db6c8e915cba91f23a0fbf853a36eb274790123d20307aba
 MISC metadata.xml 314 BLAKE2B f5c69c0ceba5528bc4a23c6ca3d6822a63abe530f699498ff65febec651ef3e0a58acd69e45a0d8fea9741b48d019cadda863602cb55a37a0e1241fc3954a427 SHA512 02353c6506b0fd39ae1fa1d848894e4b07543d77e90fbdd873ef1f480ca21c06d7bd856765b411c7326945bc22ccd72aa3256d7f0d1856aa27ee6396397475d6
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
index ddf7d325f99a..d95c6f80deba 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.11.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
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
 else
 	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index a15c070b3ef7..3a48ba103701 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,8 +1,3 @@
-AUX libyui-3.0.13-fix-qt-libs-check.patch 1352 BLAKE2B 5091d201f8d65266ca912f182665aa4a1c6b454982277b3ecf3b1f7c9a2d4b1c02e890a169da45a2323866669b2b686bedabff5db4f33ae79497e527a1394d0c SHA512 8e37ec5692ca49e21ccafc187d6bd7b97ee213d940f382835e7ab5436eacf8893479160659556f719154f59f895fe8dea4aa7072d8d5fc1143107472ed3c2299
-DIST libyui-3.0.13.tar.gz 204028 BLAKE2B e5b958807e98c7bf3b89412dd8669967469e8eba8b37f3629fc081c1d92eb81083577267b2aa6e5570d58aefa8b270369da1cd5a83add8c7ead8ba0c5398f6d5 SHA512 b698c4d44d9fa1d888b52f8d5e2216ff4a490ef97c153fac52674a237527807140663d87ceac7b36b0c6092e9035eaec7bfe7a2e1e93922de106873130a69c66
-DIST libyui-3.2.5.tar.gz 218517 BLAKE2B c84808eab5e23d62ffe871f916c99f0a5b9913c98f212c9c581258bdb25ae273ada14ae408dffea7a6442e8e5fb96533c9cd93f512c446f4b192b4619a952927 SHA512 174ec6893f749bc81495c2ee620e8c7d85e9cdb61db08d4f7d800c13306eb76e0f40d20a1eafeb579344b35d99f9735b65e63525ddd804cbe30ab7f4c18bec43
 DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
-EBUILD libyui-3.0.13.ebuild 1265 BLAKE2B c43e2f9995564df1580ed367dc1b72f2b8c8ced34b2b9e58e5d976f5e6262358bf395caaeb5aae9e8b2b1b77a1deeed9de9b4e22a290b7766447d153ceade1d0 SHA512 b074e88ea19f88741b1f0190a5df79e2f62e72fdfdb2e42e042289e6364c5367480281f9db336d302f66e95e1620c587302b9e17de7f51dac7e630ca969d3a1a
-EBUILD libyui-3.2.5.ebuild 1273 BLAKE2B 1bd753d7fcf458f13403d6a244420e22773d9f39a019baa8016a9cbbd118abb0e156b7e11959ba59d1a97e3d981a39520b900f65ec4141e92e10833e6c61dd73 SHA512 2af655bf748f39c720dec6904123cde97c4ada91c3ba7b22fd8c36d12ab9d9ed1fa0639386bc716944218212a553d4c2d5245654426d92e19cc9d152da5a8510
 EBUILD libyui-3.3.3.ebuild 1148 BLAKE2B dc00809cc001e612561cdc62dbfd7e56592f4601efb0cae01162c448aeeb44ca6ebaf8a745202a471c2e9c2b79d8e55219080bc03f132029d37ba553e475be11 SHA512 0e64747ebd1d178c75044d7ba0d7029384aab450e2e748c04547d4aa681e93737fb03607a08666edd7c6f460563b830cf30ca420c4d29ebb55991e629eaaaf02
 MISC metadata.xml 588 BLAKE2B d4cab879ff9b6cbd3bb12cf88c521c2e7b3723cce4c289260b1b56d94c5ff7e7f907fe76e8e0fd710cef85800a669020d7bdc5ffa71960536719ae844b3f2b58 SHA512 529890c10bc0fd3830c07851a525ccf695a2392718445e7a28ca6a6ec974faa0ae413ba43fa85546eb310bef04af6125f1ba583afb0a8f726c20b95b79c09aa8
diff --git a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
deleted file mode 100644
index 63ac43ee1af9..000000000000
--- a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- buildtools/LibyuiCommon.cmake	2014-02-10 19:41:45.000000000 +0400
-+++ buildtools/LibyuiCommon.cmake	2014-09-10 23:16:10.317115440 +0400
-@@ -245,12 +245,17 @@
- 
- MACRO( FIND_LINKER_LIBS )	# try to find all libs to be linked against
-   FOREACH( p ${LIB_LINKER})
--    FIND_LIBRARY( ${p}_LOOKUP "${p}" )
--    IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
--    ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( STATUS "${p} found" )
--    ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    STRING(FIND "${p}" "Qt" ISQT)
-+    IF( ISQT GREATER -1 )
-+        FIND_PACKAGE(Qt4 4.8 REQUIRED ${p})
-+    ELSE( ISQT GREATER -1 )
-+        FIND_LIBRARY( ${p}_LOOKUP "${p}" )
-+        IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
-+        ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( STATUS "${p} found" )
-+        ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    ENDIF( ISQT GREATER -1 )
-   ENDFOREACH()
- 
- ENDMACRO( FIND_LINKER_LIBS )
-@@ -616,6 +616,7 @@
- 
-     QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} )
-     QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" )
-+    LINK_DIRECTORIES( ${QT_LIBRARY_DIR} )
- 
-   ENDIF( QT_FOUND )
-
diff --git a/x11-libs/libyui/libyui-3.0.13.ebuild b/x11-libs/libyui/libyui-3.0.13.ebuild
deleted file mode 100644
index 5ed10cadaf74..000000000000
--- a/x11-libs/libyui/libyui-3.0.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui/libyui-3.2.5.ebuild b/x11-libs/libyui/libyui-3.2.5.ebuild
deleted file mode 100644
index b5c8ddfa6166..000000000000
--- a/x11-libs/libyui/libyui-3.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.13-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index cd02928a868f..0498a43b0c0e 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,12 +1,10 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
-DIST motif-2.3.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
 DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
 DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
 EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
-EBUILD motif-2.3.6-r1.ebuild 3468 BLAKE2B 75be1e877dd39810cc656c62935512abe527cc5e602e125dd60586ebd16256b4b4948ec952a90c4e4ca8776d8b23a45e41bd589c8c0a291373b3333e54473fcc SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828
-EBUILD motif-2.3.7.ebuild 3476 BLAKE2B 04d82961f5e18636cf08ba3ae3549a6db6ee786b6bcbaac1950bf6a856efb2d4862b4c8a76ddde160ed2c59aa433e6bcfd650807e4444941fdb1574c4dbe99d6 SHA512 6c1341bbabcfbd7f27c700016e602592e5676b184b5db9391c8bb5357bb948e06419aa888ec066d70c767134e7a0e3c96e72b42be70d608dd85ef084247bdd00
+EBUILD motif-2.3.7.ebuild 3475 BLAKE2B e263486fea11744e213542d5b5ba2b38dc892dfc3464236a6c7f5f63e195beb5511e61ce79c825a173e691da0d000069b1833dde8e42a70cc90fd16f4f6fc4b8 SHA512 3df30f2bc144cce54876ad0e3dc4599a52faeefa095b3394332672c4b1d00cd3bcb46d1836f9cc71060a676214d2fdfb18afa5989e1897adadc931b61957e3d9
 EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.6-r1.ebuild b/x11-libs/motif/motif-2.3.6-r1.ebuild
deleted file mode 100644
index 7ffa37ea1482..000000000000
--- a/x11-libs/motif/motif-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-2.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	xft? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
-	x11-misc/xbitmaps"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
-	# remove header file which shouldn't be in the tarball #578168
-	rm lib/Xm/Xm.h || die
-
-	AT_M4DIR=. eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# for Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
-	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
-			&& use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	# remember the name of the C compiler for the native ABI
-	MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
-		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-multilib_src_compile() {
-	# The wmluiltok build tool is linked with libfl.a, so always
-	# compile it for the native ABI
-	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
-	emake
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use examples; then
-		emake -C demos DESTDIR="${D}" install-data
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	# cleanup
-	rm -rf "${ED}"/usr/share/Xm
-	find "${D}" -type f -name "*.la" -delete || die
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
index ae6c88aa397f..74bb1bc3b032 100644
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ b/x11-libs/motif/motif-2.3.7.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="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ee45894ea9c9..60df87c82235 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
index fbf4a7707386..0b6a4770064b 100644
--- a/x11-misc/kaqaz/Manifest
+++ b/x11-misc/kaqaz/Manifest
@@ -1,5 +1,5 @@
-AUX kaqaz-1.2.0-qt55.patch 235 BLAKE2B 70646382d76921edbfb294d58bf5f959557980a76432e41e92df7e595840aaf09e01d323d0225de73fa72131c1191f15428cf3402778722d4e0c61143c2f23e4 SHA512 4207b14df5e803670ff7688ad4970f0781e1322aefd65251ab1d47aec7bbf09b0c3520c77eab43452570c8b8b6aa609aa48dfdef0d0087a09b3b3e1de2bdfe3d
-AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1444 BLAKE2B e82a2a309e176b3b16f4740a6f4e37a06d0291d01401548405484882437d0599660c6347c97b70d17bfe63d17a58234fb036cf02c1d1572baeb84da453c69ba3 SHA512 feeed7837fa9890d245b30ec2004846ba0e51fe54f756465c141f90e9d48c647a85c9360194d24e4e315665227a7b9b996d79a363664a83bb08a2dc89d170f48
+AUX kaqaz-1.2.0-qt55.patch 239 BLAKE2B 78369f07e9acf49443a8e51cef13c144df605c8ec7087be525e3b41fd2c92dd534b080970066d55e47e5d7b34b6ec2d7fbeb229f7dd520988539ff59359dd698 SHA512 9f97f60532e89c41fd27be1db20471eba9465ed145fdd39f578918525801a385ba58a5a6a649ce47bff754dca7b46515337694e87c55a8198f8a236086867c50
+AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1452 BLAKE2B 7827185411a5531f0eeb320705261bc72b220456a97edc31133e038c64ca5eaa67e54f29ea66a0e44224018fab695def466a215ca9b92aed92f8c78d319ce4df SHA512 c35b4cda2f3895a20b01276b8ab80757182d6f825508a320480fdbb27bd58c9f8d2fa59a6b291f59c2eff0c4d948f3d960c88b144d34f8cba7605698a8b0d2c1
 DIST kaqaz-1.2.0.tar.gz 5824631 BLAKE2B 52e9f8ed5896ddf3415386364fa684927eccda2342d60971a64d4602fa4e83f387bbfd47c7898deb04a798fc0be0a8e905ac9cd2fa58bec12f43b0cd9e3f6f17 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4
-EBUILD kaqaz-1.2.0-r2.ebuild 1074 BLAKE2B 743c2b6a0060b6a1c14bf1b93f5710b8f0a5addf18458c7bee97f73c795fed69042907bd0abe3f44ce5393deeb008c25fcc8b14700601172c2d4834108c84b2f SHA512 4ad48dd324cfbef944ca187a891f81e1fad783e799552563dfaddfa0fa7fe86adcc61a9f89250fcb54b6c0e1c9389e87fc0701c0df24c0da0e0704dca3f4a545
+EBUILD kaqaz-1.2.0-r3.ebuild 1069 BLAKE2B daf47925c752d250fc73ed73b4e2700df72aefd6b530d398c5bd5c496a76ceadd2768def61d1a304f9cf03bbc60b10124b850312e5cd9e36981e486fe7e409f1 SHA512 17ac62eaa5f5370df98bde1e5a789a9b5d000fbd5de8b9ba6ec4b5b0fb1a3d15059372fc9500181af345eff80c969be2403905c48b906792c663895c6b056026
 MISC metadata.xml 329 BLAKE2B 5790839b9df9a5edabcf80fecd9d9e8f1c6aa82ebf37d21d989a4bc28466bcfea950c59619f07eea447b09235db66e1607775cb2b3d0299ede1565fe7e4064e3 SHA512 d5a2685890a52c9815b94c233108510f21c57cae6d3ab3a03f869a99eb5cea3724de3597c9b47e23b8526e41164a7a54b9ab14029cf17a7fc3a4679d5957f3db
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
index f7e13f6b5d40..8d9adc400225 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
@@ -2,8 +2,8 @@ Fix build with Qt 5.5.
 
 Gentoo-bug: 563678
 
---- databasedatatypes.h
-+++ databasedatatypes.h
+--- a/databasedatatypes.h
++++ b/databasedatatypes.h
 @@ -23,6 +23,7 @@
  #include <QColor>
  #include <QStringList>
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
index 01689167ecd8..31bcc61e11db 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
@@ -1,7 +1,7 @@
 Use system copy of qtsingleapplication.
 
---- sialantools/sialantools.pri
-+++ sialantools/sialantools.pri
+--- a/sialantools/sialantools.pri
++++ b/sialantools/sialantools.pri
 @@ -1,4 +1,5 @@
  QT += qml quick
 +CONFIG += qtsingleapplication
@@ -30,8 +30,8 @@ Use system copy of qtsingleapplication.
      }
  }
 
---- sialantools/sialanapplication.h
-+++ sialantools/sialanapplication.h
+--- a/sialantools/sialanapplication.h
++++ b/sialantools/sialanapplication.h
 @@ -22,7 +22,7 @@
  #include "sialan_macros.h"
  
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
deleted file mode 100644
index 97b38180dce6..000000000000
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="Modern note manager"
-HOMEPAGE="https://github.com/sialan-labs/kaqaz/"
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtsingleapplication[qt5,X]
-	dev-qt/qtsensors:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qt55.patch"
-	epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
-
-	rm -r sialantools/qtsingleapplication || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..83bec081ae59
--- /dev/null
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Modern note manager"
+HOMEPAGE="https://github.com/sialan-labs/kaqaz/"
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
+else
+	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[qml]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsensors:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt55.patch"
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+)
+
+src_prepare() {
+	default
+	rm -r sialantools/qtsingleapplication || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 2917cf20e1e7..4f1a8c4f71ba 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -6,5 +6,6 @@ DIST lightdm-gtk-greeter-2.0.2.tar.gz 487825 BLAKE2B e17b7528365154d9d5b80664c93
 DIST lightdm-gtk-greeter-2.0.3.tar.gz 490512 BLAKE2B 93aa086d520ed04bef5eda8f5c8afdf8f4d15f2b2b130fb889adc0a4270916d9a0151e20963f7dc8ec1f09c9f00a5966b49c3bd03ead048c63291a42486ede8e SHA512 bd5b18890cf0190faab0e6a2bffab67be359e99f45fda0be7eecded146d2518a4efc0fd4fd29970076246bb989f626dd750cb14b22ddf6188b2be5f113bff3b0
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1794 BLAKE2B b2d0c60a37398e03020c45919f8f0d759500226b048ef9d95832e61ec6623ed6dccec7a5debbe735ae36d60a7ede626b82d6db3c8890e59752d223457a9525c8 SHA512 00b4731815c52b6051ccdaf9246bd618747f33ba7c6f648596c0c53d61c5dfdabb84fdc4b0ad11782f7423965de9fa4a04ad543c45cf7c8e2c9d14faf35c7d01
 EBUILD lightdm-gtk-greeter-2.0.2-r1.ebuild 1734 BLAKE2B 98b9a8151f75a7c935a2167a0892f0de4319bf68e7033288facab9a62580e5f935df51257ea961bce0ebe0640a5ad545389228ae62e9dd702c1b337718c88705 SHA512 4230a5da75b6fa37e3334c78408aba7b8523a25db699f1e45984d2ba560f61c47a271a98ecc1f21453f539782e3bd98640c85c0b1df924ea09881640bde27499
+EBUILD lightdm-gtk-greeter-2.0.3-r1.ebuild 1879 BLAKE2B 12cd32f3d79a41ae0380bb34ac56a267861cef2784a78f5f54cd9b637993d5701ac812387a441e976b75df730ecc65050f9284c34219685046e59f995f51fd31 SHA512 30773b18eb0bdd788a9a6e4047f0d8c143a0b0143a9ae245c88b54b46908367bd7d6905439fb5b9568126981a843327b99a6debaabfe57774e26273c10cce884
 EBUILD lightdm-gtk-greeter-2.0.3.ebuild 1776 BLAKE2B 5344d2c7ac1339f09367f44eecd96b96146e88e04740d0bdd4a03effa4fe82d53fe4022511dac6c80f7511f9e080f451f209a06f47ef3dcee3b94a7ee09c9a22 SHA512 cb37c0f282e59e11cfc9adeaaf9c44b2be622f558341515de6b1b678c5b9960cc385968d636d92fbda0d7b3715362fcafd315077c5eb96b293c65e7852e38bce
 MISC metadata.xml 337 BLAKE2B 3c65fc50a54a761aacd4a8fa45fac5867cfc1831f596d6cacb9b84f649ef3b4827647c8f57590a16a5075ebfccad378b552fc2dbb07190ad8fb7c23ae8c84e34 SHA512 7819a26eb1d16acc0eaeb89c43ae27520ed527e4bc3166e3f5e582cb3c693cba07270e0864e2c57dfc005b4f27cae2b9bfad3f83be24990b6ecb1d0049c5efe6
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..bc0dac2f8c00
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator gnome2-utils
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana branding"
+
+COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	xfce-base/exo"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-themes-standard
+	>=x11-themes/adwaita-icon-theme-3.14.1"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-kill-on-sigterm
+		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
+		$(use_enable ayatana libindicator)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 50015015a5e8..b473c357ccc9 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.10.0.tar.xz 228540 BLAKE2B 08691b9a4851bea0490242bf76919bc3ea064b7ed85dcd3ddd3a0672acd28801ade245a85bc39361da62aaad2fb8c26df27d5e985165ebca9ee30c390f6e0ee3 SHA512 1b4ec2a746767e28a851f702a6a0897327cefe08b06cb25d63a1c9dddaed4aeefdbe25ee7d6431c94266e0071d5d25e3591c588c484ad097b10ce601e9a18201
 DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450
 EBUILD pcmanfm-qt-0.10.0.ebuild 1208 BLAKE2B e6731a8204350802617999856eb6c90b33855c16c93b9b6b86279a70b1b13adcd7f0a718b8a30ac5a2652d2edb3d6f67dc8cbd8c905fb46f919a1eb753528877 SHA512 48f4ae63e76eb8dfae42dcacd86a7d3c3a3f0092e087871278ebee01f43d3d95d31196fb416b967a51fa709fe9a83bea8b597f72297d1426693fae1747a0ce65
-EBUILD pcmanfm-qt-0.11.1.ebuild 971 BLAKE2B abf90ee3fc542f479584b1913f313d45367e0bad429fc9d74af656605a108db21f8857088f75402a7daeed29dc42b88f5ad66d26aa05b08a2d94af97a5c933b2 SHA512 5325a8d82694d47c020cbae995b45fd0d4380cf1e2be0a026381a1dbfea37b418627911b22392cf474c03a1700ae824f56c194b634dee2962121fd405d1214a7
+EBUILD pcmanfm-qt-0.11.1.ebuild 976 BLAKE2B 54a2e5395fc1ed8f0ee47b0110225dd996d773f4ea3b0ce6fae89b9a85b2d09cbef9273fb3ca8ea24a669a637cf327b87c4c7ccd7173da9f091061b238396288 SHA512 b9d6f0335b90d524eb8921a94891d715603f3a90f62874bac37fd052d1ba1ae1ea96054867d450503437e8f0e723625341598bcc1e6a30b45fda4315b710c121
 MISC metadata.xml 380 BLAKE2B a792f445534940d13fd5ee89806df73aaa1cc14898d842760ea14bf0c42b30937984232a5e3647971b639bc19f1da31247fef82db6953228448f3452a06b4810 SHA512 2e8cb06bf3dd84a80a12c072f3493b4cfd5a0f0d92a7809da89d059d71a012b536996e0a3ce6732e131f423fead8b93d413c090ce9cc439f812df5b3b32f77fd
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
index 8cea8b82021c..1abdd3e692e1 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.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
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
 else
 	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 48d2a9f99af6..0188bfb4a5b7 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,3 @@
-DIST screengrab-1.2.1.tar.gz 156692 BLAKE2B 481a989de626a8307544ba8dd55bde95019c646fa238657543b024c34ca9c0cb4ae502acf0dcaeb9a0db8af96e4cef068de20fb3919cfa2745f956a2444a7c2c SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805
 DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
-EBUILD screengrab-1.2.1-r1.ebuild 707 BLAKE2B f9f7ed2d34b20d75db942af7596007184b74c3bf06f0848cb1b6209035c4612768c5ff824369bef21bd9cea4e08da8f81fffecf5674554996066bf501853e935 SHA512 65cde44c9e4b59427eb1e612524ae6af87c666aac8e86cdc7ba7543e2f1e709a4563ffa60da2f08f91a67a4048fbadde5719d210ebef9271a9ebae84b0ac8b06
-EBUILD screengrab-1.97.ebuild 719 BLAKE2B 1efa0f65ecee9d139b1dfa1b77167aaadd70aafee59eeb3c8ae3127ad23072e7136f9f17494c375917433b98702af36c8b3dc581537efc30c0c76c293f3e2d17 SHA512 c2eb52cd647dc6e4da83c50be5fc51d77057cb39d5163b3d5e89cac43092d19d53548025f3a581307450e98a39e955aa050d71b656c61ae6b79470ea77e9b20f
+EBUILD screengrab-1.97.ebuild 718 BLAKE2B 9ea014854d796cc578a7ac45b172d01d3f0f2aba416ace4128f75b66e6c4a2c1fe3c00fa88242d3e4e27e0ab9a63e4f558a8e1399a38caabc8c0ddbebd2344aa SHA512 fe7adc46cd3f8b27ef1401b0f88018b484755a73332037191b2cf4c23752593eb76b52a4c25c08d6174e16718a931b3e30ddc7271091dc2a5496d372397eb137
 MISC metadata.xml 444 BLAKE2B 2fb0a84a26a3063f8bbd3b1ad9857b358935de8e262b5ad60be88e62f36568c4fc2e0f5f42728de6e414ee21ec14ea61b14515fee9711e10ea5ab9bb2b998e1a SHA512 7fd9195b7a9cf80ebcf7b845bb8a85adbf2ea5c83988ea389c10a7c56300fd0678ff901eecf907afa755500b3cf18b6a165fa2587ad9dcbd234f36a4c4254956
diff --git a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
deleted file mode 100644
index f74d9c2b1491..000000000000
--- a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="http://screengrab.doomer.org"
-SRC_URI="https://github.com/DOOMer/screengrab/archive/1.2.1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-libs/libqxt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/LICENSE.txt/d" CMakeLists.txt || die
-	rm -r src/3rdparty || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSG_DOCDIR=${PF}
-		-DSG_USE_SYSTEM_QXT=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
index e2d42076a371..6e9bf5da14d2 100644
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ b/x11-misc/screengrab/screengrab-1.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 463f260f62f6..2097c386556d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 4cbdce1440f2..e501cd52fd42 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,9 +3,10 @@ AUX 3.22.4-wayland-clipboard-fix.patch 1283 BLAKE2B 294a69b435ead3f25f454ee1f94a
 AUX 3.22.4-wayland-crash-fix.patch 1149 BLAKE2B 5269eeb85bf39b176d41cf4c62d87c447a19ad08e12810c3697defaa5bea1a8d25916d488e6d378c5886e5de76f7623a7374505d086fe94d2e965da2460bd821 SHA512 68b629b25be5e019581aba2883f2409b65279758d814ce8f854b9052357adf44e3f2a649ef4aa8ef398afa8e4a58117fe1a8ccc6040c3578acfefbcb721cdf4a
 AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af18e0ae991449c9e93b1a09fcd528492cc6d514827170346c911567256a2d6e5bbdcab155b6f00cf9e5760bca2ee535e6c1e00301daa2ee SHA512 e84319db9c0541b71dec03bd466b64f6e71637034bc91263d25fcf6546469435a4d77acaa32b24532e540fe62b079521f4d60c5cc2e1f0571b2f3cbc4917c964
 AUX 3.22.4-wayland-size-hints.patch 2281 BLAKE2B 022782665cfd36da1bb60ff7ee459041e10d41d59b99cf1a806bc76c207f6e168e96e0980e72b6bdf12307874343a9f27cd83961ce01ce88a331fd88671e0107 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a
+AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4fa59b401a99f60c7a8c06ba88fdef6a382149fa6ae0b0d05344b24640d730d56736dfe38b645578f3b01c41528 SHA512 e0ae9b9ed1dc74b4b2a641f03589408d078ac7a2250e75fb024dd765dc755a6dcd1917d62cb271f541db5cd97ca8417433f8cfe8e40250331adc5609bbf1ffc6
 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 EBUILD mutter-3.22.4-r1.ebuild 4117 BLAKE2B 4d526168d3a2f353d03a3b7ce40f6f4d7cb26bfa11127b7c4c776c62db73e2510ff7703ba2ea6fd82b31dbec51606098213b3fcaa70a590fd26f24aae2c66b60 SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7
-EBUILD mutter-3.24.4.ebuild 3635 BLAKE2B b620e35dfd2ffae3497ae561f01bc2f46de62a10f35010e00a12c72442bcb324c71568dad8f499335adbec3989da377972d695f1dc92f8f80dc0c9e29e5b42c1 SHA512 7c448c93505c1804cc6e28de3799b40ec2c9c3d3a4938b1eb76f6e145921f864d3f9b04c94417b8aa00e1d273502deb7d7de4ad3e00c3dc8d736730e7087f202
+EBUILD mutter-3.24.4.ebuild 3716 BLAKE2B d3dbc0238d89b4e85640c26e0edcb7989bcfe76048c67b826b80a6be32206992126e518a8f0b8f6bcc90f083932f9b9e07abea68ffeaa83b117b91b0cc8f6e79 SHA512 700111bb0ab9547013f42438de65aa025ea7c7c04058f08a7c2c39f42c8ad7d65a841fa0aed1e3708f834046ce07200e12cc366e27dca1b4d563f7d61ae5f95a
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/files/3.24.4-build-debug.patch b/x11-wm/mutter/files/3.24.4-build-debug.patch
new file mode 100644
index 000000000000..6cb7b48856f0
--- /dev/null
+++ b/x11-wm/mutter/files/3.24.4-build-debug.patch
@@ -0,0 +1,28 @@
+From c9937faf1e2c81005289e18974ed5d10b2dc37ab Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sat, 12 Aug 2017 11:52:28 +0200
+Subject: [PATCH] clutter: Fix build with --enable-debug
+
+Message was poking stage_x11, which doesn't exist in this context.
+Just print the Window that is receiving the event, the event will be
+emitted into the only existing stage anyway.
+---
+ clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c
+index 1ecec02..da3457a 100644
+--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
+@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent       *event,
+                 event->any.type == CLUTTER_PAD_RING
+                 ? "pad ring  "
+                 : "pad strip",
+-                (unsigned int) stage_x11->xwin,
++                (unsigned int) xev->event,
+                 device->id,
+                 device->device_name,
+                 event->any.time, value);
+--
+libgit2 0.26.0
+
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 4f727d079a17..f52fd7fb8eb0 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# Fix build with >=gudev-232, bug #630312
 	"${FILESDIR}"/3.24.4-gudev-232.patch
+	# Fix build with USE=debug, bug #645412
+	"${FILESDIR}"/3.24.4-build-debug.patch
 )
 
 src_prepare() {
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index e08c941a53e2..760f93edfd9c 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 6c7015dad6e4..dc420f8c06ab 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -6,5 +6,5 @@ DIST Thunar-1.7.0.tar.bz2 2235806 BLAKE2B dfe81012dd0c8e760497f5c919bc2e7d4dd5e3
 EBUILD thunar-1.6.10-r1.ebuild 1817 BLAKE2B 6005a4b1583bf2ae8f67156a82db6f7506652afb6c572ed9608727adddedb466e4aea40b60906eb262d3764b9b3510a4d7dec9486511fb70d89b800ac4db219c SHA512 d888e8e5e7d00291d085b4dd1cbdfe96b55b5d26c3b6252d450b0d31729b0a21e5a251de49507416d4592e9913c7861d568398fb946c9e3613844a7f3ea88cea
 EBUILD thunar-1.6.12-r1.ebuild 2030 BLAKE2B b7f132c61e3ba532caf540d59f9ec050efc8c183fbb04f1a9963e29994869a4731ebf2ecc451c268c551ccb9249b942b43f468f9db1bbbfaaed498f7294b829a SHA512 6b3f91e3c2acf44c6f1475e253d1a7911fe735ecf2a9a1617d80415eb7789f95703cda6a92319c759f218969170399cd8cddcbdf7cbde434745a52e982cb108e
 EBUILD thunar-1.6.13.ebuild 2025 BLAKE2B bb6449c71aa31a5785a1a6cbaadd344ea0fa32aa84af494137f511f3e2173368ba84fc4218bf5389c9963e8984dfad04218dfb4d06332edc483f42d624e90ad7 SHA512 d9898fb715df81d196d8c0fd109b479667e2f111d68079d55000e2b7aeac21d35d489271b7800e6143c444f5e6d305e2649e62a5f1a6fe16d2ffd2074edc02f3
-EBUILD thunar-1.7.0.ebuild 1988 BLAKE2B 4fc386292695b3ff30b1d674e64a10ec355ac0e6c5958559529fe09a88849c38c508d8e2c82913e6cd494de8c5f1549fa4740532b60790beac1e8bb540dc615a SHA512 39312349928a0803c8454d0185ddb65121f2b471da725dd39673cc032149cf3877197331339765db92986a054498a728c299e8b47771e91ee2ee2c911b82eba1
+EBUILD thunar-1.7.0.ebuild 2057 BLAKE2B 1ed9adb5ce299072ce29b504d727635e3a68f7bf846aed4c8e8373ba42f1ab7c817dd86cd49c02e3b393b15b9dd4bd8a46acb55fbb875d1799652e4f98d6d337 SHA512 e13b1ba0524f82c0bc1ecd1bb6f110b3fe003b03478a2a1ae47d3c239b1b7c920f2a7518b7cb693ebc2254184b9e0f383e426963d592566829cc613ae0ee3e42
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.7.0.ebuild b/xfce-base/thunar/thunar-1.7.0.ebuild
index e3bf41864d81..d76ea4e85dea 100644
--- a/xfce-base/thunar/thunar-1.7.0.ebuild
+++ b/xfce-base/thunar/thunar-1.7.0.ebuild
@@ -67,6 +67,11 @@ src_test() {
 	virtx emake check
 }
 
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index e17d85d77df0..fd68f6aaa0ca 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index 79101966a148..f543274dcabd 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-timer-plugin-1.6.0.tar.bz2 325662 BLAKE2B d6eae55ba20b3fdd59ea3e62ee96409927bce966453f24df76512ee3a1362caf7bc7813cc4baf90d43c90bca3628fb547a96eec2345b0c9160f0ae1626395c1d SHA512 aa2c6760945fe28fb1e8189b167dae176137164c017acb7057c93eb579147ef31134a840b23c78e3d1914c89865a0cc7b428e3561449f7ae01eb2d8a0fbd5815
+DIST xfce4-timer-plugin-1.7.0.tar.bz2 381222 BLAKE2B 3c273d818b7b04cf2ceeea3b72837ccf43ee0433ca458dbbb3aa68015ee28fb2e61ab3b5f36b341d087f00e9c4ca8e9be5453e735251bf9c9c1e910ce8c6d2f3 SHA512 b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e
 EBUILD xfce4-timer-plugin-1.6.0.ebuild 805 BLAKE2B 6e30619b335ecf22c7879dc1a13226b4117d1fd1f0120c18f4a3b7185d98c0629563c6cc8dd1c3dc02a87950d44d6b8c0e02ebf08821ba153849e5cd85ea17b7 SHA512 45453d6181723a8f9f934887b191b934cf5d75b236ff112d3056f52a9af8d0d8cfcda71377ef26e75e310db19dfd0e18c99e3c5637de30df19ff4a449ab400bc
+EBUILD xfce4-timer-plugin-1.7.0.ebuild 847 BLAKE2B df0e9d44debc57bdaaed5421dee03503809537c32801706ccb8bf484dde6993ea51339f291a2de0bd8ebb658641983e9e47f5ae2a72af7e64e386595ce045c6f SHA512 655c600c2328ea5d08a27011e5c2b2b5db0e577100bf339ec667fad02b3f72b76325ca3b22176bb875bc93afb6218c97ef747b0fac796200dc79e373d985577c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
new file mode 100644
index 000000000000..1c42fb81f8bf
--- /dev/null
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+#libx11?
+RDEPEND=">=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}